Merge branch 'nd/fix-directory-attrs-off-by-one' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a4c48e179eb778077462a812b491e762e284486c..14dd5e7ca272350b3fa13d6fc8da3ccb46e12227 100644 (file)
--- 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,$, ,