commit 3857284f7b892f855edffc5b9c196a0dd74b1b7d
author Junio C Hamano <junkio@cox.net> Wed Aug 24 18:54:24 2005 -0700
committer Junio C Hamano <junkio@cox.net> Wed Aug 24 18:54:24 2005 -0700
tree 76754f705371a6a6c4d0e55fa806feb53bd0e64f
parent 96fdc218f726b1a7c0eb195fcadabadf46f9c2f8
parent 569061432e3a695d5a4178d515971ddcc0a80709

Merge refs/heads/master from . 

git-checkout-script

diff --git a/git-checkout-script b/git-checkout-script
index a377407..9feff14 100755
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -72,4 +72,6 @@
 	fi
 	[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
 	rm -f "$GIT_DIR/MERGE_HEAD"
+else
+	exit 1
 fi

ls-files.c

diff --git a/ls-files.c b/ls-files.c
index 2c7aada..e53d245 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -496,7 +496,7 @@
 			char c = n[i];
 			if (prev && prev[i] != c)
 				break;
-			if (c == '*' || c == '?')
+			if (!c || c == '*' || c == '?')
 				break;
 			if (c == '/')
 				len = i+1;