git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d4eecc
9dd70e0
)
Merge branch 'jg/prompt-localize-temporary'
author
Junio C Hamano
<redacted>
Mon, 22 Dec 2014 20:28:20 +0000
(12:28 -0800)
committer
Junio C Hamano
<redacted>
Mon, 22 Dec 2014 20:28:20 +0000
(12:28 -0800)
"git-prompt" (in contrib/) used a variable from the global scope,
possibly contaminating end-user's namespace.
* jg/prompt-localize-temporary:
git-prompt.sh: make $f local to __git_eread()
1
2
contrib/completion/git-prompt.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
contrib/completion/git-prompt.sh
index c5473dc8dba78b372fd95ef2bf5257ff5cdc3baf,dba928ed00458cae9987e2bdbbad324827435ad3..729f7694795d1116ccedfc653f82da757e6e4ef4
---
1
/
contrib/completion/git-prompt.sh
---
2
/
contrib/completion/git-prompt.sh
+++ b/
contrib/completion/git-prompt.sh
@@@
-268,9
-259,9
+268,9
@@@
__git_ps1_colorize_gitstring (
r="$c_clear$r"
}
-eread ()
+
__git_
eread ()
{
- f="$1"
+
local
f="$1"
shift
test -r "$f" && read "$@" <"$f"
}
git clone https://git.99rst.org/PROJECT