From 4ab980fde0d1f51ebf67f0353605e30e923b0975 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 23 Oct 2016 20:18:54 +0100 Subject: [PATCH] import-dsc: Introduce $info (nfc) Signed-off-by: Ian Jackson --- dgit | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index 809d0b9d..87419c26 100755 --- a/dgit +++ b/dgit @@ -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"; -- 2.30.2