1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00

Merge refs/heads/master from .

This commit is contained in:
Junio C Hamano 2005-08-24 18:54:24 -07:00
commit 3857284f7b
2 changed files with 3 additions and 1 deletions

View file

@ -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

View file

@ -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;