Re: [PATCH 3/3] rebase -i: write better reflog messages for start

3 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 3/3] rebase -i: write better reflog messages for start

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:40

Ramkumar Ramachandra [off-list ref] writes:
Invoking 'git rebase -i' writes the following line to the reflog at the
start of the operation:

  rebase -i (start)

This is not very useful.  Make it more informative like:

  rebase -i (start): checkout master
Makes sense to me, at least within the scope of the patch context.

I am curious what breaks, though.
quoted hunk
Signed-off-by: Ramkumar Ramachandra <redacted>
---
 git-rebase--interactive.sh | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5822b2c..a05a6e4 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -837,6 +837,7 @@ comment_for_reflog start
 
 if test ! -z "$switch_to"
 then
+	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
 	output git checkout "$switch_to" -- ||
 		die "Could not checkout $switch_to"
 fi
@@ -980,6 +981,7 @@ has_action "$todo" ||
 
 test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
 
+GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
 output git checkout $onto || die_abort "could not detach HEAD"
 git update-ref ORIG_HEAD $orig_head
 do_rest

Re: [PATCH 3/3] rebase -i: write better reflog messages for start

From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:40

Junio C Hamano wrote:
I am curious what breaks, though.
t/status-help.  Looks seriously unrelated, and I'm breaking my head
over it.  Any clues?
--- expected    2013-06-10 17:16:42.276356867 +0000
+++ actual      2013-06-10 17:16:42.279690201 +0000
@@ -1,4 +1,4 @@
-# HEAD detached at 000106f
+# HEAD detached from 88a81b6
 # You are currently rebasing branch 'rebase_conflicts' on '000106f'.
 #   (fix conflicts and then run "git rebase --continue")
 #   (use "git rebase --skip" to skip this patch)
not ok 5 - status when rebase in progress before resolving conflicts

Re: [PATCH 3/3] rebase -i: write better reflog messages for start

From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:43

Ramkumar Ramachandra wrote:
t/status-help.  Looks seriously unrelated, and I'm breaking my head
over it.  Any clues?
Damn it!  A recent commit is responsible for this avalanche in test
breakages: b397ea (status: show more info than "currently not on any
branch", 2013-03-13).  It re-implements a backward version of
grab_nth_branch_switch(): grab_1st_switch() essentially _relies_ on
the random unintended pollution that rebase writes to the reflog to
print a more useful (?) status :/

I have no choice but to completely redo this bit, and update all the
tests.  Let me know if there is some easy way to work around this that
I'm missing.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help