path: root/upload-pack.c
diff options
authorJunio C Hamano <>2006-11-01 16:48:50 (GMT)
committerJunio C Hamano <>2006-11-01 16:48:50 (GMT)
commit58a1e0e83bcdbf063fb708ee9a8a563c0aa14f87 (patch)
treee3534fae05b865abb5d686c191cdbde9b9cbf3d0 /upload-pack.c
parentec1e46897329317d7a9996264d7e999f9a68e307 (diff)
parent2e6d8f181dd77d40a1148549d4f33cdf2877fb19 (diff)
Merge branch 'lj/refs'
* lj/refs: (63 commits) Fix show-ref usagestring t3200: git-branch testsuite update sha1_name.c: avoid compilation warnings. Make git-branch a builtin ref-log: fix D/F conflict coming from deleted refs. git-revert with conflicts to behave as git-merge with conflicts core.logallrefupdates thinko-fix git-pack-refs --all core.logallrefupdates create new log file only for branch heads. Remove bashism from ref-log: allow ref@{count} syntax. pack-refs: call fflush before fsync. pack-refs: use lockfile as everybody else does. git-fetch: do not look into $GIT_DIR/refs to see if a tag exists. lock_ref_sha1_basic does not remove empty directories on BSD Do not create tag leading directories since git update-ref does it. Check that a tag exists using show-ref instead of looking for the ref file. Use git-update-ref to delete a tag instead of rm()ing the ref file. Fix refs.c;:repack_without_ref() clean-up path Clean up "" and add remove recursive dir test cases. ...
Diffstat (limited to 'upload-pack.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 9ec3775..ddaa72f 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -420,7 +420,7 @@ static void receive_needs(void)
-static int send_ref(const char *refname, const unsigned char *sha1)
+static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
static const char *capabilities = "multi_ack thin-pack side-band side-band-64k ofs-delta";
struct object *o = parse_object(sha1);
@@ -448,8 +448,8 @@ static int send_ref(const char *refname, const unsigned char *sha1)
static void upload_pack(void)
- head_ref(send_ref);
- for_each_ref(send_ref);
+ head_ref(send_ref, NULL);
+ for_each_ref(send_ref, NULL);
if ( {