undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge refs/heads/master from .

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-checkout-script
View File

@ -72,4 +72,6 @@ if [ "$?" -eq 0 ]; then
fi fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD" [ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
rm -f "$GIT_DIR/MERGE_HEAD" rm -f "$GIT_DIR/MERGE_HEAD"
else
exit 1
fi fi

2
ls-files.c
View File

@ -496,7 +496,7 @@ static void verify_pathspec(void)
char c = n[i]; char c = n[i];
if (prev && prev[i] != c) if (prev && prev[i] != c)
break; break;
if (c == '*' || c == '?') if (!c || c == '*' || c == '?')
break; break;
if (c == '/') if (c == '/')
len = i+1; len = i+1;