threads / patch / 19558

patchbash: display git prompt in case of merge conflict during rebase

Subject: [PATCH] bash: display git prompt in case of merge conflict during rebase

## tl;dr

4 messages between May 28, 2009 and May 29, 2009. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

SZEDER Gábor· May 28, 2009, 16:17 UTC · lore

Since e5dd864a (completion: Better __git_ps1 support when not in working directory, 2009-02-11) the git prompt becomes empty, if we hit a merge conflict during a rebase.

e5dd864a added an if statement at the end of __git_ps1 to only display anything in the prompt, if the branch name is not empty. This caused the empty prompt in the "merge conflict during rebase" case, because in this case we display neither the branch name nor the abbreviated SHA1, the ongoing rebase is identified.

This patch removes that check, so the git prompt is displayed even if the branch name is empty.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

Show changes to contrib/completion/git-completion.bash +4 −6

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0c8bb53..6c78c94 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -152,12 +152,10 @@ __git_ps1 ()
 			fi
 		fi
 
-		if [ -n "$b" ]; then
-			if [ -n "${1-}" ]; then
-				printf "$1" "$c${b##refs/heads/}$w$i$r"
-			else
-				printf " (%s)" "$c${b##refs/heads/}$w$i$r"
-			fi
+		if [ -n "${1-}" ]; then
+			printf "$1" "$c${b##refs/heads/}$w$i$r"
+		else
+			printf " (%s)" "$c${b##refs/heads/}$w$i$r"
 		fi
 	fi
 }

-- 
1.6.3.1.189.g9321

SZEDER Gábor· May 28, 2009, 17:01 UTC · re: SZEDER Gábor · lore

Re: [PATCH] bash: display git prompt in case of merge conflict during rebase

On Thu, May 28, 2009 at 06:17:21PM +0200, SZEDER Gábor wrote:

Show 9 quoted lines

> Since e5dd864a (completion: Better __git_ps1 support when not in
> working directory, 2009-02-11) the git prompt becomes empty, if we hit
> a merge conflict during a rebase.
> 
> e5dd864a added an if statement at the end of __git_ps1 to only display
> anything in the prompt, if the branch name is not empty.  This caused
> the empty prompt in the "merge conflict during rebase" case, because
> in this case we display neither the branch name nor the abbreviated
> SHA1, the ongoing rebase is identified.

       ^- although...

SZEDER Gábor· May 29, 2009, 12:00 UTC · re: SZEDER Gábor · lore

[PATCH] bash: remove always true if statement from __git_ps1()

The recent commits 8763dbb1 (completion: fix PS1 display during a merge on detached HEAD, 2009-05-16), ff790b6a (completion: simplify "current branch" in __git_ps1(), 2009-05-10), and d7107ca6 (completion: fix PS1 display during an AM on detached HEAD, 2009-05-26) ensure that the branch name in __git_ps1() is always set to something sensible. Therefore, the condition for checking the non-empty branch name is always fulfilled, and can be removed.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---

The patch is the same, but the commit message is different, because Junio's d7107ca6 has fixed the issue.

 contrib/completion/git-completion.bash |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

Show changes to contrib/completion/git-completion.bash +4 −6

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0c8bb53..6c78c94 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -152,12 +152,10 @@ __git_ps1 ()
 			fi
 		fi
 
-		if [ -n "$b" ]; then
-			if [ -n "${1-}" ]; then
-				printf "$1" "$c${b##refs/heads/}$w$i$r"
-			else
-				printf " (%s)" "$c${b##refs/heads/}$w$i$r"
-			fi
+		if [ -n "${1-}" ]; then
+			printf "$1" "$c${b##refs/heads/}$w$i$r"
+		else
+			printf " (%s)" "$c${b##refs/heads/}$w$i$r"
 		fi
 	fi
 }

-- 
1.6.3.1.189.g9321

Shawn O. Pearce· May 29, 2009, 15:03 UTC · re: SZEDER Gábor · lore

Re: [PATCH] bash: remove always true if statement from __git_ps1()

SZEDER G??bor <szeder@ira.uka.de> wrote:

Show 16 quoted lines

> The recent commits 8763dbb1 (completion: fix PS1 display during a
> merge on detached HEAD, 2009-05-16), ff790b6a (completion: simplify
> "current branch" in __git_ps1(), 2009-05-10), and d7107ca6
> (completion: fix PS1 display during an AM on detached HEAD,
> 2009-05-26) ensure that the branch name in __git_ps1() is always set
> to something sensible.  Therefore, the condition for checking the
> non-empty branch name is always fulfilled, and can be removed.
> 
> Signed-off-by: SZEDER G??bor <szeder@ira.uka.de>
> ---
> 
> The patch is the same, but the commit message is different, because
> Junio's d7107ca6 has fixed the issue.
>
>  contrib/completion/git-completion.bash |   10 ++++------
>  1 files changed, 4 insertions(+), 6 deletions(-)

Yay, code reduction is good.  :-)

Trivially-Acked-by: Shawn O. Pearce <spearce@spearce.org>

-- 
Shawn.