projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add the merge test Linus called "test script from hell".
[git.git]
/
read-cache.c
diff --git
a/read-cache.c
b/read-cache.c
index
47aa2d4
..
da2adf4
100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-152,7
+152,7
@@
static int check_file_directory_conflict(const struct cache_entry *ce,
cp = pathbuf;
while (1) {
char *ep = strchr(cp, '/');
cp = pathbuf;
while (1) {
char *ep = strchr(cp, '/');
- if (
ep == 0
)
+ if (
!ep
)
break;
*ep = 0; /* first cut it at slash */
pos = cache_name_pos(pathbuf,
break;
*ep = 0; /* first cut it at slash */
pos = cache_name_pos(pathbuf,