summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-10 15:26:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-10 15:28:53 +0100
commit9145241120781f5274cbccd8359d38d209a83dca (patch)
tree6318ebb64bb85afdc99e24d0a9f11a0a717c1f4a
parentcc245dcf0eda3ff55a3b1f2cabffd06d2c503eea (diff)
git-debrebase: Improve ffq head recording message
Say `recorded _previous_ head' rather than `current head'. Since by the time the message appears, it's the previous head. In particular, `current' is very confusing if there were previous progress messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog2
-rwxr-xr-xgit-debrebase2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b5a7192..63d6f20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
dgit (6.7~) unstable; urgency=medium
- *
+ * git-debrebase: Improve ffq head recording message.
--
diff --git a/git-debrebase b/git-debrebase
index f4602d5..ad20e4b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1156,7 +1156,7 @@ sub record_ffq_prev_deferred () {
push @deferred_updates, "update $ffq_prev $currentval $git_null_obj";
push @deferred_updates, "delete $gdrlast";
- push @deferred_update_messages, "Recorded current head for preservation";
+ push @deferred_update_messages, "Recorded previous head for preservation";
return ('deferred', undef);
}