diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-22 16:07:00 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:01 +0100 |
commit | e221ca98a0eb6ad2601f58002e0abdb0ea4f7374 (patch) | |
tree | 6c244769df211a35f8cd3655c3ba89ba619f3637 /git-debrebase | |
parent | 6e01ca271e5b8dfdda90b32b225fc53f38ccfc47 (diff) |
git-debrebase: Improve/fix handling of $prose
Allow specification of the whole prose. Set the default in
cmd_stitch. Always include the word `stitch' in the reflog.
Also fix a comment typo.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index 8826141..599fe15 100755 --- a/git-debrebase +++ b/git-debrebase @@ -503,7 +503,7 @@ sub keycommits ($;$$$) { # $dgitimport->("unclean-$tagsfx", $msg) # is callled for each situation or commit that # wouldn't be found in a laundered branch - # $furniture is forfurniture commits such as might be found on an + # $furniture is for furniture commits such as might be found on an # interchange branch (pseudomerge, d/patches, changelog) # $trouble is for things whnich prevent the return of # anchor and breakwater information; if that is ignored, @@ -1065,10 +1065,10 @@ sub stitch ($$$$$) { fresh_workarea(); my $new_head = make_commit [ $old_head, $ffq_prev ], [ 'Declare fast forward / record previous work', - "[git-debrebase pseudomerge: stitch$prose]", + "[git-debrebase pseudomerge: $prose]", ]; push @deferred_updates, "update $gdrlast $new_head $git_null_obj"; - update_head $old_head, $new_head, "stitch"; + update_head $old_head, $new_head, "stitch: $prose"; } sub cmd_new_upstream_v0 () { @@ -1282,7 +1282,7 @@ sub cmd_breakwater () { } sub cmd_stitch () { - my $prose = ''; + my $prose = 'stitch'; GetOptions('prose=s', \$prose) or die badusage("bad options to stitch"); badusage "no arguments allowed" if @ARGV; |