diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-24 18:54:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 18:54:24 -0700 |
| commit | 3857284f7b892f855edffc5b9c196a0dd74b1b7d (patch) | |
| tree | 76754f705371a6a6c4d0e55fa806feb53bd0e64f | |
| parent | Merge refs/heads/master from . (diff) | |
| parent | [PATCH] Fix silly pathspec bug in git-ls-files (diff) | |
| download | tgif-3857284f7b892f855edffc5b9c196a0dd74b1b7d.tar.xz | |
Merge refs/heads/master from .
| -rwxr-xr-x | git-checkout-script | 2 | ||||
| -rw-r--r-- | ls-files.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/git-checkout-script b/git-checkout-script index a37740713e..9feff149ac 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 2c7aada88c..e53d245884 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; |