From: "SZEDER Gábor" <szeder@ira.uka.de>
To: git@vger.kernel.org
Cc: "SZEDER Gábor" <szeder@ira.uka.de>
Subject: [RFC PATCH 18/19] bash prompt: avoid command substitution when checking for untracked files
Date: Wed, 9 May 2012 02:44:49 +0200 [thread overview]
Message-ID: <1336524290-30023-19-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <1336524290-30023-1-git-send-email-szeder@ira.uka.de>
When enabled, the bash prompt can indicate the presence of untracked
files with a '%' sign. __git_ps1() checks for untracked files by running the
'$(git ls-files --others --exclude-standard)' command substitution,
and displays the indicator when there is no output.
Avoid this command substitution by additionally passing
'--error-unmatch *', and checking the command's return value.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
This seems to do the right thing, but I'm not quite sure, so I would
appreciate a pair of expert eyeballs on it.
contrib/completion/git-completion.bash | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c4feab68..5ea19018 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -348,9 +348,8 @@ __git_ps1 ()
fi
if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
- if [ -n "$(git ls-files --others --exclude-standard)" ]; then
- u="%"
- fi
+ git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null &&
+ u="%"
fi
fi
fi
--
1.7.10.1.541.gb1be298
next prev parent reply other threads:[~2012-05-09 0:47 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 0:44 [PATCH 00/19] Bash prompt speedup SZEDER Gábor
2012-05-09 0:44 ` [PATCH 01/19] tests: move code to run tests under bash into a helper library SZEDER Gábor
2012-05-09 0:44 ` [PATCH 02/19] tests: add tests for the bash prompt functions in the completion script SZEDER Gábor
2012-05-09 8:07 ` Johannes Sixt
2012-05-09 18:08 ` Junio C Hamano
2012-05-10 6:09 ` Johannes Sixt
2012-05-09 18:36 ` Junio C Hamano
2012-05-09 20:33 ` SZEDER Gábor
2012-05-09 0:44 ` [PATCH 03/19] completion: use __gitdir() in _git_log() SZEDER Gábor
2012-05-09 18:41 ` Junio C Hamano
2012-05-09 19:01 ` SZEDER Gábor
2012-05-09 0:44 ` [PATCH 04/19] completion: respect $GIT_DIR SZEDER Gábor
2012-05-09 8:09 ` Johannes Sixt
2012-05-09 18:54 ` Junio C Hamano
2012-05-09 0:44 ` [PATCH 05/19] bash prompt: don't show the prompt when .git/HEAD is unreadable SZEDER Gábor
2012-05-09 19:32 ` Junio C Hamano
2012-05-09 19:45 ` SZEDER Gábor
2012-05-09 0:44 ` [PATCH 06/19] bash prompt: return early from __git_ps1() when not in a git repository SZEDER Gábor
2012-05-09 0:44 ` [PATCH 07/19] completion: make __gitdir() store repository path in $__git_dir SZEDER Gábor
2012-05-09 19:36 ` Junio C Hamano
2012-05-09 0:44 ` [PATCH 08/19] completion: use $__git_dir instead of $(__gitdir) SZEDER Gábor
2012-05-09 19:43 ` Junio C Hamano
2012-05-09 20:22 ` SZEDER Gábor
2012-05-09 20:56 ` Junio C Hamano
2012-05-09 21:36 ` SZEDER Gábor
2012-05-09 0:44 ` [RFC PATCH 09/19] completion: platform-specific helper function to get physical path SZEDER Gábor
2012-05-09 7:37 ` Johannes Sixt
2012-05-09 0:44 ` [PATCH 10/19] completion: use bash builtins to search for repository SZEDER Gábor
2012-05-09 19:52 ` Junio C Hamano
2012-05-09 22:34 ` SZEDER Gábor
2012-05-09 22:59 ` Junio C Hamano
2012-05-09 0:44 ` [PATCH 11/19] bash prompt: use bash builtins to find out current branch SZEDER Gábor
2012-05-09 20:02 ` Junio C Hamano
2012-05-09 21:11 ` SZEDER Gábor
2012-05-09 21:25 ` Junio C Hamano
2012-05-09 21:45 ` SZEDER Gábor
2012-05-09 21:50 ` Junio C Hamano
2012-05-09 0:44 ` [PATCH 12/19] bash prompt: use bash builtins to check whether inside git dir SZEDER Gábor
2012-05-09 8:07 ` Johannes Sixt
2012-05-09 20:06 ` Junio C Hamano
2012-05-09 0:44 ` [PATCH 13/19] bash prompt: check whether inside the worktree only when necessary SZEDER Gábor
2012-05-09 0:44 ` [PATCH 14/19] bash prompt: use bash builtins to find out current branch during rebase SZEDER Gábor
2012-05-09 0:44 ` [PATCH 15/19] bash prompt: use bash builtins to get detached HEAD abbrev. object name SZEDER Gábor
2012-05-09 0:44 ` [PATCH 16/19] bash prompt: display stash and upstream state even inside the repository SZEDER Gábor
2012-05-09 0:44 ` [PATCH 17/19] bash prompt: use bash builtins to check stash state SZEDER Gábor
2012-05-09 0:44 ` SZEDER Gábor [this message]
2012-05-09 20:32 ` [RFC PATCH 18/19] bash prompt: avoid command substitution when checking for untracked files Junio C Hamano
2012-05-09 0:44 ` [PATCH 19/19] bash prompt: alternative git prompt without command substitution SZEDER Gábor
2012-05-09 19:38 ` Andrew Sayers
2012-05-09 22:08 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336524290-30023-19-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).