Merge branch 'fixes'

diff --git a/git-checkout.sh b/git-checkout.sh
index 4e7c57a5f39894c85a6b1f8f2e1eee444808c57f..37afcdda309ca8df52bb5033e5e7f0b771dfa067 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -22,7 +22,8 @@ while [ "$#" != "0" ]; do
                force=1
                ;;
        *)
-               rev=$(git-rev-parse --verify "$arg^0") || exit
+               rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null) ||
+                       die "I don't know any '$arg'."
                if [ -z "$rev" ]; then
                        echo "unknown flag $arg"
                        exit 1
@@ -55,6 +56,7 @@ then
     git-read-tree --reset $new &&
        git-checkout-index -q -f -u -a
 else
+    git-update-index --refresh >/dev/null
     git-read-tree -m -u $old $new
 fi