diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-31 15:23:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-31 15:23:54 -0700 |
| commit | b0a7ca5ee07c1962c4ed8a3c65eb3317fe6e6184 (patch) | |
| tree | 2448da7390b2f36d4c3a586b93714311f312f9ea /fetch.c | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | fetch.c: do not pass uninitialized lock to unlock_ref(). (diff) | |
| download | tgif-b0a7ca5ee07c1962c4ed8a3c65eb3317fe6e6184.tar.xz | |
Merge branch 'sp/reflog' into next
* sp/reflog:
fetch.c: do not pass uninitialized lock to unlock_ref().
Diffstat (limited to 'fetch.c')
| -rw-r--r-- | fetch.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -209,7 +209,7 @@ static int mark_complete(const char *path, const unsigned char *sha1) int pull(char *target) { - struct ref_lock *lock; + struct ref_lock *lock = NULL; unsigned char sha1[20]; char *msg; int ret; @@ -229,15 +229,18 @@ int pull(char *target) if (interpret_target(target, sha1)) { error("Could not interpret %s as something to pull", target); - unlock_ref(lock); + if (lock) + unlock_ref(lock); return -1; } if (process(lookup_unknown_object(sha1))) { - unlock_ref(lock); + if (lock) + unlock_ref(lock); return -1; } if (loop()) { - unlock_ref(lock); + if (lock) + unlock_ref(lock); return -1; } |