From: "SZEDER Gábor" <szeder@ira.uka.de>
To: git@vger.kernel.org
Cc: "Eduardo D'Avila" <erdavila@gmail.com>,
"SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCHv3 08/16] bash prompt: use bash builtins to find out rebase state
Date: Mon, 24 Jun 2013 18:39:18 +0200 [thread overview]
Message-ID: <1372091966-19315-9-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <1372091966-19315-1-git-send-email-szeder@ira.uka.de>
During an ongoing interactive rebase __git_ps1() finds out the name of
the rebased branch, the total number of patches and the number of the
current patch by executing a '$(cat .git/rebase-merge/<FILE>)' command
substitution for each. That is not quite the most efficient way to
read single line single word files, because it imposes the overhead of
fork()ing a subshell and fork()+exec()ing 'cat' several times.
Use the 'read' bash builtin instead to avoid those overheads.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
contrib/completion/git-prompt.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 0563dea8..bc402f56 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -325,9 +325,9 @@ __git_ps1 ()
local step=""
local total=""
if [ -d "$g/rebase-merge" ]; then
- b="$(cat "$g/rebase-merge/head-name" 2>/dev/null)"
- step=$(cat "$g/rebase-merge/msgnum" 2>/dev/null)
- total=$(cat "$g/rebase-merge/end" 2>/dev/null)
+ read b 2>/dev/null <"$g/rebase-merge/head-name"
+ read step 2>/dev/null <"$g/rebase-merge/msgnum"
+ read total 2>/dev/null <"$g/rebase-merge/end"
if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i"
else
@@ -335,10 +335,10 @@ __git_ps1 ()
fi
else
if [ -d "$g/rebase-apply" ]; then
- step=$(cat "$g/rebase-apply/next" 2>/dev/null)
- total=$(cat "$g/rebase-apply/last" 2>/dev/null)
+ read step 2>/dev/null <"$g/rebase-apply/next"
+ read total 2>/dev/null <"$g/rebase-apply/last"
if [ -f "$g/rebase-apply/rebasing" ]; then
- b="$(cat "$g/rebase-apply/head-name" 2>/dev/null)"
+ read b 2>/dev/null <"$g/rebase-apply/head-name"
r="|REBASE"
elif [ -f "$g/rebase-apply/applying" ]; then
r="|AM"
--
1.8.3.1.599.g4459181
next prev parent reply other threads:[~2013-06-24 16:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-24 16:39 [PATCHv3 00/16] bash prompt speedup SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 01/16] bash prompt: fix redirection coding style in tests SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 02/16] bash prompt: use 'write_script' helper in interactive rebase test SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 03/16] completion, bash prompt: move __gitdir() tests to completion test suite SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 04/16] bash prompt: add a test for symbolic link symbolic refs SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 05/16] bash prompt: print unique detached HEAD abbreviated object name SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 06/16] bash prompt: return early from __git_ps1() when not in a git repository SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 07/16] bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir() SZEDER Gábor
2013-06-24 16:39 ` SZEDER Gábor [this message]
2013-06-24 16:39 ` [PATCHv3 09/16] bash prompt: use bash builtins to find out current branch SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 10/16] bash prompt: combine 'git rev-parse' executions in the main code path SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 11/16] bash prompt: combine 'git rev-parse' for detached head SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 12/16] bash prompt: use bash builtins to check for unborn branch for dirty state SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 13/16] bash prompt: use bash builtins to check stash state SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 14/16] bash prompt: avoid command substitution when checking for untracked files SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 15/16] bash prompt: avoid command substitution when finalizing gitstring SZEDER Gábor
2013-06-24 16:39 ` [PATCHv3 16/16] bash prompt: mention that PROMPT_COMMAND mode is faster SZEDER Gábor
2013-06-24 19:25 ` [PATCHv3 00/16] bash prompt speedup Junio C Hamano
2013-06-25 2:00 ` Eduardo R. D'Avila
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372091966-19315-9-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=erdavila@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).