summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-26 00:45:01 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-26 01:36:35 +0100
commita840640baebaa11079b64be2ae5f89a111648985 (patch)
tree3a23fa476aab1832b74bbf6eae7bf5712454dc2b /dgit
parenta96666fd8cd9fedd9bf988bc2f3a904401c21498 (diff)
Pseudomerge: pseudomerge_make_commit: Lift up some message generation
Move the calculation of whether to put "--overwrite=" in the message into the common code. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit27
1 files changed, 15 insertions, 12 deletions
diff --git a/dgit b/dgit
index 18e485a..0dea96c 100755
--- a/dgit
+++ b/dgit
@@ -2412,23 +2412,32 @@ sub pseudomerge_version_check ($$) {
return $i_arch_v;
}
-sub pseudomerge_make_commit ($$$$$) {
- my ($clogp, $dgitview, $archive_hash, $i_arch_v, $msg) = @_;
+sub pseudomerge_make_commit ($$$$ $$) {
+ my ($clogp, $dgitview, $archive_hash, $i_arch_v,
+ $msg_cmd, $msg_msg) = @_;
progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
my $authline = clogp_authline $clogp;
+ chomp $msg_msg;
+ $msg_cmd .=
+ !defined $overwrite_version ? ""
+ : " --overwrite=".$overwrite_version;
+
mkpath '.git/dgit';
my $pmf = ".git/dgit/pseudomerge";
open MC, ">", $pmf or die "$pmf $!";
- print MC <<END, $msg or die $!;
+ print MC <<END or die $!;
tree $tree
parent $dgitview
parent $archive_hash
author $authline
commiter $authline
+$msg_msg
+
+[$msg_cmd]
END
close MC or die $!;
@@ -2477,14 +2486,11 @@ sub splitbrain_pseudomerge ($$$$) {
my $r = pseudomerge_make_commit
$clogp, $dgitview, $archive_hash, $i_arch_v,
+ "dgit --quilt=$quilt_mode",
(defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
Declare fast forward from $overwrite_version
-
-[dgit --quilt=$quilt_mode --overwrite=$overwrite_version]
END_OVERWR
Make fast forward from $i_arch_v->[0]
-
-[dgit --quilt=$quilt_mode]
END_MAKEFF
progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
@@ -2513,11 +2519,8 @@ sub plain_overwrite_pseudomerge ($$$) {
my $m = "Declare fast forward from $overwrite_version";
my $r = pseudomerge_make_commit
- $clogp, $head, $archive_hash, $i_arch_v, <<END;
-$m
-
-[dgit --overwrite=$overwrite_version]
-END
+ $clogp, $head, $archive_hash, $i_arch_v,
+ "dgit", $m;
runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;