X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=01429fb4b4dc9cc63cd5b1575e0ff2e94549b674;hb=ea47dd8b3dcb8528e8fdfa7bd86bb890d2ca79d7;hp=7dde1e746f846279d026e6119f6a9d84dbfba224;hpb=5bed21be705bbfc578b623b9543344e4d8efb4a9;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 7dde1e74..01429fb4 100755 --- a/git-debrebase +++ b/git-debrebase @@ -730,7 +730,7 @@ sub merge_series_patchqueue_convert ($$$) { open C, ">", "../mcommit" or confess "$!"; print C $commit or confess "$!"; close C or confess "$!"; - $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit); + $build = hash_commit '../mcommit'; } $result = $build; mwrecknote($wrecknotes, 'merged-result', $result); @@ -2662,7 +2662,7 @@ sub cmd_convert_from_dgit_view () { my $spec = shift @ARGV; my $commit = git_rev_parse "$spec^{commit}"; push @upstreams, { Commit => $commit, - Source => (f_ "%s, from command line", $ARGV[0]), + Source => (f_ "%s, from command line", $spec), Only => 1, }; }