summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-28 11:12:47 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-28 11:12:47 -0800
commit7025616048e2cdf61b7f5c6e4fba8045020fb537 (patch)
treef56fa3fdf48e1e646552b731b05a4063b5f1446c
parent095d65d73b92040d7b277792172826d28225fa66 (diff)
parentca87dd623d24590c4d48a922effa1d9e1e1fd253 (diff)
downloadgit-7025616048e2cdf61b7f5c6e4fba8045020fb537.tar.gz
Merge branch 'ds/completion-silence-in-tree-path-probe' into maint
* 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 a4c48e179e..14dd5e7ca2 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,$, ,