Merge refs/heads/master from .

2005-08-24 18:54:24 -07:00 · 2005-08-24 18:54:24 -07:00 · 3857284f7b
commit 3857284f7b
parent 96fdc218f7 569061432e
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -72,4 +72,6 @@ if [ "$?" -eq 0 ]; then
 	fi
 	[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
 	rm -f "$GIT_DIR/MERGE_HEAD"
+else
+	exit 1
 fi
--- a/ls-files.c
+++ b/ls-files.c
@ -496,7 +496,7 @@ static void verify_pathspec(void)
 			char c = n[i];
 			if (prev && prev[i] != c)
 				break;
-			if (c == '*' || c == '?')
+			if (!c || c == '*' || c == '?')
 				break;
 			if (c == '/')
 				len = i+1;