diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-21 00:29:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-21 00:29:37 -0700 |
| commit | 340adb8bccf48b9d933f0608fd99c75a5c28003c (patch) | |
| tree | 7f56898365b94fcac608f3d25788fd864570d2ca /send-pack.c | |
| parent | 9f613ddd21cbd05bfc139d9b1551b5780aa171f6 (diff) | |
| parent | 968846015229fe0fec28e3c85db722e131c15f93 (diff) | |
| download | git-340adb8bccf48b9d933f0608fd99c75a5c28003c.tar.gz | |
Merge branch 'lt/refs' into jc/for-each-ref-with-lt-refs
* lt/refs: (58 commits)
git-pack-refs --prune
pack-refs: do not pack symbolic refs.
Tell between packed, unpacked and symbolic refs.
Add callback data to for_each_ref() family.
symbolit-ref: fix resolve_ref conversion.
Fix broken sha1 locking
fsck-objects: adjust to resolve_ref() clean-up.
gitignore: git-pack-refs is a generated file.
wt-status: use simplified resolve_ref to find current branch
Fix t1400-update-ref test minimally
Enable the packed refs file format
Make ref resolution saner
Add support for negative refs
Start handling references internally as a sorted in-memory list
gitweb fix validating pg (page) parameter
git-repack(1): document --window and --depth
git-apply(1): document --unidiff-zero
gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
upload-archive: monitor child communication even more carefully.
gitweb: export options
...
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/send-pack.c b/send-pack.c index 5bb123a376..fbd792ccf4 100644 --- a/send-pack.c +++ b/send-pack.c @@ -215,7 +215,7 @@ static int ref_newer(const unsigned char *new_sha1, static struct ref *local_refs, **local_tail; static struct ref *remote_refs, **remote_tail; -static int one_local_ref(const char *refname, const unsigned char *sha1) +static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) { struct ref *ref; int len = strlen(refname) + 1; @@ -230,7 +230,7 @@ static int one_local_ref(const char *refname, const unsigned char *sha1) static void get_local_heads(void) { local_tail = &local_refs; - for_each_ref(one_local_ref); + for_each_ref(one_local_ref, NULL); } static int receive_status(int in) |