projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Explain what went wrong on update-cache of new file
[git.git]
/
pull.c
diff --git
a/pull.c
b/pull.c
index
e7bf83b
..
ff55044
100644
(file)
--- a/
pull.c
+++ b/
pull.c
@@
-156,7
+156,7
@@
static int loop(void)
//fprintf(stderr, "fetch %s\n", sha1_to_hex(obj->sha1));
//fprintf(stderr, "fetch %s\n", sha1_to_hex(obj->sha1));
- if (make_sure_we_have_it(obj->type ?: "object",
+ if (make_sure_we_have_it(obj->type ?
obj->type
: "object",
obj->sha1))
return -1;
if (!obj->type)
obj->sha1))
return -1;
if (!obj->type)