summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorPascal Obry <pascal.obry@wanadoo.fr>2007-11-26 22:04:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-28 04:42:21 (GMT)
commitaa4f31d5a3923939bf2cb670ecaa4f68025f4bf3 (patch)
tree299a15ffc6a45c84403aa689689a1456da4dd332 /git-stash.sh
parentecf4831d89ba6986249e1bf232b2e2f5f7536223 (diff)
downloadgit-aa4f31d5a3923939bf2cb670ecaa4f68025f4bf3.zip
git-aa4f31d5a3923939bf2cb670ecaa4f68025f4bf3.tar.gz
git-aa4f31d5a3923939bf2cb670ecaa4f68025f4bf3.tar.bz2
git-stash: do not get fooled with "color.diff = true"
When colors are set to "true" on the repository, the git log output will contain control characters to set/reset the colors, even when the output is to a pipe. This makes list_stash() fail as the downstream sed does not see what it is expecting. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 534eb16..dd15556 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -37,7 +37,7 @@ create_stash () {
# state of the base commit
if b_commit=$(git rev-parse --verify HEAD)
then
- head=$(git log --abbrev-commit --pretty=oneline -n 1 HEAD)
+ head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --)
else
die "You do not have the initial commit yet"
fi
@@ -108,7 +108,7 @@ have_stash () {
list_stash () {
have_stash || return 0
- git log --pretty=oneline -g "$@" $ref_stash |
+ git log --no-color --pretty=oneline -g "$@" $ref_stash -- |
sed -n -e 's/^[.0-9a-f]* refs\///p'
}