summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-25 01:54:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-25 01:54:24 (GMT)
commit3857284f7b892f855edffc5b9c196a0dd74b1b7d (patch)
tree76754f705371a6a6c4d0e55fa806feb53bd0e64f
parent96fdc218f726b1a7c0eb195fcadabadf46f9c2f8 (diff)
parent569061432e3a695d5a4178d515971ddcc0a80709 (diff)
downloadgit-3857284f7b892f855edffc5b9c196a0dd74b1b7d.zip
git-3857284f7b892f855edffc5b9c196a0dd74b1b7d.tar.gz
git-3857284f7b892f855edffc5b9c196a0dd74b1b7d.tar.bz2
Merge refs/heads/master from . v0.99.5
-rwxr-xr-xgit-checkout-script2
-rw-r--r--ls-files.c2
2 files changed, 3 insertions, 1 deletions
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 @@ if [ "$?" -eq 0 ]; then
fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
rm -f "$GIT_DIR/MERGE_HEAD"
+else
+ exit 1
fi
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 @@ 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;