git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv3 12/16] bash prompt: use bash builtins to check for unborn branch for dirty state

From
SZEDER Gábor <szeder@ira.uka.de>
Date
Jun 24, 2013, 16:39 UTC
Message-ID
<1372091966-19315-13-git-send-email-szeder@ira.uka.de>
In-Reply-To
<1372091966-19315-1-git-send-email-szeder@ira.uka.de>

When the dirty work tree and index status indicator is enabled, __git_ps1() checks for changes in the index by running 'git diff-index --cached --quiet HEAD --' and looking at its exit code. However, that makes sense only when HEAD points to a valid commit: on an unborn branch the failure of said command would be caused by the invalid HEAD, not by changes in the index. Therefore, __git_ps1() first checks for a valid HEAD by running 'git rev-parse --quiet --verify HEAD'.

Since the previous patch we implicitly check HEAD's validity by running 'git rev-parse ... --short HEAD', making the dirty status indicator's 'git rev-parse' check redundant. It's sufficient to check for non-emptyness of the variable holding the abbreviated commit object name, thereby sparing the overhead of fork()+exec()ing a git process.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-prompt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 88d6121d..6e8f486e 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -429,7 +429,7 @@ __git_ps1 ()
 		   [ "$(git config --bool bash.showDirtyState)" != "false" ]
 		then
 			git diff --no-ext-diff --quiet --exit-code || w="*"
-			if git rev-parse --quiet --verify HEAD >/dev/null; then
+			if [ -n "$short_sha" ]; then
 				git diff-index --cached --quiet HEAD -- || i="+"
 			else
 				i="#"
-- 
1.8.3.1.599.g4459181
Previous: SZEDER GáborNext: SZEDER Gábor
Message 13 of 19 in “[PATCHv3 00/16] bash prompt speedup”
  1. SZEDER GáborJun 24, 2013
  2. 01/16 bash prompt: fix redirection coding style in testsSZEDER Gábor, Jun 24, 2013
  3. 02/16 bash prompt: use 'write_script' helper in interactive rebase testSZEDER Gábor, Jun 24, 2013
  4. 03/16 completion, bash prompt: move __gitdir() tests to completion test suiteSZEDER Gábor, Jun 24, 2013
  5. 04/16 bash prompt: add a test for symbolic link symbolic refsSZEDER Gábor, Jun 24, 2013
  6. 05/16 bash prompt: print unique detached HEAD abbreviated object nameSZEDER Gábor, Jun 24, 2013
  7. 06/16 bash prompt: return early from __git_ps1() when not in a git repositorySZEDER Gábor, Jun 24, 2013
  8. 07/16 bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()SZEDER Gábor, Jun 24, 2013
  9. 08/16 bash prompt: use bash builtins to find out rebase stateSZEDER Gábor, Jun 24, 2013
  10. 09/16 bash prompt: use bash builtins to find out current branchSZEDER Gábor, Jun 24, 2013
  11. 10/16 bash prompt: combine 'git rev-parse' executions in the main code pathSZEDER Gábor, Jun 24, 2013
  12. 11/16 bash prompt: combine 'git rev-parse' for detached headSZEDER Gábor, Jun 24, 2013
  13. 12/16 bash prompt: use bash builtins to check for unborn branch for dirty stateSZEDER Gábor, Jun 24, 2013
  14. 13/16 bash prompt: use bash builtins to check stash stateSZEDER Gábor, Jun 24, 2013
  15. 14/16 bash prompt: avoid command substitution when checking for untracked filesSZEDER Gábor, Jun 24, 2013
  16. 15/16 bash prompt: avoid command substitution when finalizing gitstringSZEDER Gábor, Jun 24, 2013
  17. 16/16 bash prompt: mention that PROMPT_COMMAND mode is fasterSZEDER Gábor, Jun 24, 2013
  18. Junio C HamanoJun 24, 2013
  19. Eduardo R. D'AvilaJun 25, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.