Merge branch 'maint'

diff --git a/git-lost-found.sh b/git-lost-found.sh
index f2ec5d147a56136b8c3aff8b693912a7c792da63..0b3e8c7a8652478a7dd3d629fde9240cac6d6e2b 100755 (executable)
--- a/git-lost-found.sh
+++ b/git-lost-found.sh
@@ -2,6 +2,7 @@
 
 USAGE=''
 SUBDIRECTORY_OK='Yes'
+OPTIONS_SPEC=
 . git-sh-setup
 
 echo "WARNING: '$0' is deprecated in favor of 'git fsck --lost-found'" >&2
@@ -19,7 +20,7 @@ while read dangling type sha1
 do
        case "$dangling" in
        dangling)
-               if git rev-parse --verify "$sha1^0" >/dev/null 2>/dev/null
+               if git rev-parse -q --verify "$sha1^0" >/dev/null
                then
                        dir="$laf/commit"
                        git show-branch "$sha1"