diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-23 20:18:54 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 19:50:47 +0000 |
commit | 4ab980fde0d1f51ebf67f0353605e30e923b0975 (patch) | |
tree | cabdb142cb8888e30edac16f66f51c462cc7b2a8 /dgit | |
parent | 5c9ed5c0a77935dca8bb6f0c1cf6181d2ee54e48 (diff) |
import-dsc: Introduce $info (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -5281,6 +5281,9 @@ sub cmd_import_dsc { badusage "dry run makes no sense with import-dsc" unless act_local(); + my $info = "$dscfn"; + + my $specbranch = $dstbranch; $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#; $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch; @@ -5312,7 +5315,7 @@ Your git tree does not have that object. Try `git fetch' from a plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again. END } - @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $dscfn", + @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info", $dstbranch, $dgit_commit); runcmd @cmd; progress "dgit: import-dsc updated git ref $dstbranch"; @@ -5344,7 +5347,7 @@ END my @mergeinputs = generate_commits_from_dsc(); die unless @mergeinputs == 1; - my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $dscfn", + my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info", $dstbranch, $mergeinputs[0]{Commit}); runcmd @cmd; progress "dgit: import-dsc results are in in git ref $dstbranch"; |