Merge branch 'pb/prepare-commit-msg'

diff --git a/git-lost-found.sh b/git-lost-found.sh
index 9360804711d6b81983e53df67c86ddc8082e2ab4..9cedaf80ceac1d4100adf3cfb152c76c7f945e4d 100755 (executable)
--- a/git-lost-found.sh
+++ b/git-lost-found.sh
@@ -2,8 +2,11 @@
 
 USAGE=''
 SUBDIRECTORY_OK='Yes'
+OPTIONS_SPEC=
 . git-sh-setup
 
+echo "WARNING: '$0' is deprecated in favor of 'git fsck --lost-found'" >&2
+
 if [ "$#" != "0" ]
 then
     usage
@@ -12,15 +15,15 @@ fi
 laf="$GIT_DIR/lost-found"
 rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit
 
-git fsck --full |
+git fsck --full --no-reflogs |
 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 --verify "$sha1^0" >/dev/null 2>/dev/null
                then
                        dir="$laf/commit"
-                       git-show-branch "$sha1"
+                       git show-branch "$sha1"
                else
                        dir="$laf/other"
                fi