diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-03 00:23:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-03 00:23:52 -0800 |
| commit | 407e1d6e127357a0fbe1a9f91ee616a2b7ec29db (patch) | |
| tree | a2efb8d179aff14b73db024f936ef0dd092b7a7c /upload-pack.c | |
| parent | aac91b7eeae4e8cf6521a5370caf03eb432ce492 (diff) | |
| parent | 6255ef08ae746bdad34851297a989ad6f36f6a21 (diff) | |
| download | git-407e1d6e127357a0fbe1a9f91ee616a2b7ec29db.tar.gz | |
Merge branch 'master' into np/index-pack
* master: (90 commits)
gitweb: Better support for non-CSS aware web browsers
gitweb: Output also empty patches in "commitdiff" view
gitweb: Use git-for-each-ref to generate list of heads and/or tags
for-each-ref: "creator" and "creatordate" fields
Add --global option to git-repo-config.
pack-refs: Store the full name of the ref even when packing only tags.
git-clone documentation didn't mention --origin as equivalent of -o
Minor grammar fixes for git-diff-index.txt
link_temp_to_file: call adjust_shared_perm() only when we created the directory
Remove uneccessarily similar printf() from print_ref_list() in builtin-branch
pack-objects doesn't create random pack names
branch: work in subdirectories.
gitweb: Use 's' regexp modifier to secure against filenames with LF
gitweb: Secure against commit-ish/tree-ish with the same name as path
gitweb: esc_html() author in blame
git-svnimport: support for partial imports
link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
Move deny_non_fast_forwards handling completely into receive-pack.
revision traversal: --unpacked does not limit commit list anymore.
Continue traversal when rev-list --unpacked finds a packed commit.
...
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c index 9ec3775049..ddaa72f0a9 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) { reset_timeout(); - head_ref(send_ref); - for_each_ref(send_ref); + head_ref(send_ref, NULL); + for_each_ref(send_ref, NULL); packet_flush(1); receive_needs(); if (want_obj.nr) { |