summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-18 19:20:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-18 19:20:03 (GMT)
commit78292536846149eba74387ee7a8315bf9597268e (patch)
tree5eb31bc9b3655942e41ad2b2adaa4b0669bd8fe7
parentbd2734ae0dd55d329580df25a5fb27f6fcf593f8 (diff)
parentca87dd623d24590c4d48a922effa1d9e1e1fd253 (diff)
downloadgit-78292536846149eba74387ee7a8315bf9597268e.zip
git-78292536846149eba74387ee7a8315bf9597268e.tar.gz
git-78292536846149eba74387ee7a8315bf9597268e.tar.bz2
Merge branch 'ds/completion-silence-in-tree-path-probe'
An internal ls-tree call made by completion code only to probe if a path exists in the tree recorded in a commit object leaked error messages when the path is not there. It is not an error at all and should not be shown to the end user. * ds/completion-silence-in-tree-path-probe: git-completion.bash: silence "not a valid object" errors
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a4c48e1..14dd5e7 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -397,7 +397,7 @@ __git_complete_revlist_file ()
*) pfx="$ref:$pfx" ;;
esac
- __gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
+ __gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" 2>/dev/null \
| sed '/^100... blob /{
s,^.* ,,
s,$, ,