Re: [PATCH] Completion: Hint whether amend is the right thing to do.

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

Re: [PATCH] Completion: Hint whether amend is the right thing to do.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:39 

Robin Rosenberg [off-list ref] writes:
quoted hunk
When you get a conflict during interactive rebase the next
thing to do is not to amend, but to continue the rebase.
With this change you get a reminder in the prompt.

Signed-off-by: Robin Rosenberg <redacted>
---
 contrib/completion/git-completion.bash |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

I got a couple of broken rebases. Hence this fix.

-- robin

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1698463..a606328 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -82,7 +82,12 @@ __git_ps1 ()
 			b="$(git symbolic-ref HEAD 2>/dev/null)"
 		elif [ -f "$g/.dotest-merge/interactive" ]
 		then
-			r="|REBASE-i"
+			if [ -f "$g/.dotest-merge/amend" ]
+			then
+				r="|REBASE-i-amend"
+			else
+				r="|REBASE-i-continue"
+			fi
 			b="$(cat "$g/.dotest-merge/head-name")"
 		elif [ -d "$g/.dotest-merge" ]
 		then
-- 
1.5.5.1.178.g1f811
Hmm.  The "|REBASE-blah" prefix is already too long for my liking and this
makes it even longer X-<

Does this mean that it would help reduce mistakes if "git commit --amend"
noticed the presense of .dotest-merge but absense of .dotest-merge/amend
and refused to operate, I have to wonder?

Re: [PATCH] Completion: Hint whether amend is the right thing to do.

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:44:39 

Junio C Hamano [off-list ref] wrote:
Robin Rosenberg [off-list ref] writes:
quoted
When you get a conflict during interactive rebase the next
thing to do is not to amend, but to continue the rebase.
With this change you get a reminder in the prompt.
...
Does this mean that it would help reduce mistakes if "git commit --amend"
noticed the presense of .dotest-merge but absense of .dotest-merge/amend
and refused to operate, I have to wonder?
Yea, even though rebase and commit are two different tools we
don't want the user to amend in the middle of a failed conflict
from rebase.  Adding the safety valve to commit --amend makes
more sense to me than teaching bash to show you the state.  Not
all of our users use bash.  Not all of our bash using users use
the bash completion package, or the _git_ps1 function we ship.
Etc.

I'd rather see the amend safety net than the bash prompt change.

-- 
Shawn.

Re: [PATCH] Completion: Hint whether amend is the right thing to do.

From: Robin Rosenberg <hidden>
Date: 2016-06-15 22:44:39 

onsdagen den 28 maj 2008 17.53.40 skrev Junio C Hamano:
Does this mean that it would help reduce mistakes if "git commit --amend"
noticed the presense of .dotest-merge but absense of .dotest-merge/amend
and refused to operate, I have to wonder?
Well I found myself making these mistakes. That would probably be better. 
Shouldn't one block commit without amend too then? And then rebase needs
another option to be able to commit. Fixing the prompt was easier at the time .)

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