summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-03 19:47:46 -0800
committerJunio C Hamano <junkio@cox.net>2007-03-03 19:47:46 -0800
commit253e772edeb56092e0fad43ec0640658671313c5 (patch)
tree8e9278a4ac03353056acd765c04779e01b0ce2f9 /refs.c
parent4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c (diff)
parent7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd (diff)
downloadgit-253e772edeb56092e0fad43ec0640658671313c5.tar.gz
Merge branch 'maint'
* maint: Unset NO_C99_FORMAT on Cygwin. Fix a "pointer type missmatch" warning. Fix some "comparison is always true/false" warnings. Fix an "implicit function definition" warning. Fix a "label defined but unreferenced" warning. Document the config variable format.suffix git-merge: fail correctly when we cannot fast forward. builtin-archive: use RUN_SETUP Fix git-gc usage note
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/refs.c b/refs.c
index d347876c87..7a1f89caad 100644
--- a/refs.c
+++ b/refs.c
@@ -1042,7 +1042,9 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
return -1;
}
+#ifndef NO_SYMLINK_HEAD
done:
+#endif
if (logmsg && !read_ref(refs_heads_master, new_sha1))
log_ref_write(ref_target, old_sha1, new_sha1, logmsg);