diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:02:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:02:01 -0700 |
| commit | 10d781b9caa4f71495c7b34963bef137216f86a8 (patch) | |
| tree | eec73f3aec2ea1255bb3e131bd54e0a04e64d0f2 /pull.c | |
| parent | 928f74de22536129b696218073a3940ae4ab1199 (diff) | |
| parent | fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1 (diff) | |
| download | git-10d781b9caa4f71495c7b34963bef137216f86a8.tar.gz | |
Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
Diffstat (limited to 'pull.c')
| -rw-r--r-- | pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -156,7 +156,7 @@ static int loop(void) //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) |