summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-15 18:36:47 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-16 01:13:26 +0000
commite38f77d844867620d08d334ca46f1d9d2594bdc0 (patch)
tree53f7348a2e3bd5c93e894bbdd9da253b23a92442
parenta6c66a1add35c473a32e72938374b5ffc1017b92 (diff)
dgit: import_dsc: Break out import_dsc_result
No functional change other than slight change to messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit21
1 files changed, 13 insertions, 8 deletions
diff --git a/dgit b/dgit
index fbf844e..dbfe1ac 100755
--- a/dgit
+++ b/dgit
@@ -6049,6 +6049,13 @@ sub cmd_quilt_fixup {
build_maybe_quilt_fixup();
}
+sub import_dsc_result {
+ my ($dstref, $newhash, $what_log, $what_msg) = @_;
+ my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
+ runcmd @cmd;
+ progress "dgit: import-dsc: $what_msg";
+}
+
sub cmd_import_dsc {
my $needsig = 0;
@@ -6145,10 +6152,9 @@ END
fail "Not fast forward to $dsc_hash";
}
}
- @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
- $dstbranch, $dsc_hash);
- runcmd @cmd;
- progress "dgit: import-dsc updated git ref $dstbranch";
+ import_dsc_result $dstbranch, $dsc_hash,
+ "dgit import-dsc (Dgit): $info",
+ "updated git ref $dstbranch";
return 0;
}
@@ -6208,10 +6214,9 @@ END
}
}
- my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
- $dstbranch, $newhash);
- runcmd @cmd;
- progress "dgit: import-dsc results are in in git ref $dstbranch";
+ import_dsc_result $dstbranch, $newhash,
+ "dgit import-dsc: $info",
+ "results are in in git ref $dstbranch";
}
sub cmd_archive_api_query {