Tell between packed, unpacked and symbolic refs.
This adds a "int *flag" parameter to resolve_ref() and makes for_each_ref() family to call callback function with an extra "int flag" parameter. They are used to give two bits of information (REF_ISSYMREF and REF_ISPACKED) about the ref. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 20, 2006 at 22:02 UTC
8da197755450d4f16018bd4b5486dc8ed88b0f2a
23 files changed
+75
-49
builtin-fmt-merge-msg.c
+1
-1
@@ -277,7 +277,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
277
usage(fmt_merge_msg_usage);
278
279
/* get current branch */
280
- current_branch = resolve_ref("HEAD", head_sha1, 1);
280
+ current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
281
if (!strncmp(current_branch, "refs/heads/", 11))
282
current_branch += 11;
283
builtin-name-rev.c
+1
-1
@@ -75,7 +75,7 @@ copy_data:
75
}
76
}
77
78
-static int name_ref(const char *path, const unsigned char *sha1, void *cb_data)
78
+static int name_ref(const char *path, const unsigned char *sha1, int flags, void *cb_data)
79
{
80
struct object *o = parse_object(sha1);
81
int tags_only = *(int*)cb_data;
builtin-pack-refs.c
+2
-1
@@ -9,7 +9,8 @@ static void remove_lock_file(void)
9
unlink(lock_path);
10
}
11
12
-static int handle_one_ref(const char *path, const unsigned char *sha1, void *cb_data)
12
+static int handle_one_ref(const char *path, const unsigned char *sha1,
13
+ int flags, void *cb_data)
14
{
15
FILE *refs_file = cb_data;
16
builtin-prune.c
+1
-1
@@ -174,7 +174,7 @@ static void walk_commit_list(struct rev_info *revs)
174
}
175
}
176
177
-static int add_one_ref(const char *path, const unsigned char *sha1, void *cb_data)
177
+static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
178
{
179
struct object *object = parse_object(sha1);
180
if (!object)
builtin-push.c
+1
-1
@@ -27,7 +27,7 @@ static void add_refspec(const char *ref)
27
refspec_nr = nr;
28
}
29
30
-static int expand_one_ref(const char *ref, const unsigned char *sha1, void *cb_data)
30
+static int expand_one_ref(const char *ref, const unsigned char *sha1, int flag, void *cb_data)
31
{
32
/* Ignore the "refs/" at the beginning of the refname */
33
ref += 5;
builtin-rev-parse.c
+1
-1
@@ -137,7 +137,7 @@ static void show_default(void)
137
}
138
}
139
140
-static int show_reference(const char *refname, const unsigned char *sha1, void *cb_data)
140
+static int show_reference(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
141
{
142
show_rev(NORMAL, sha1, refname);
143
return 0;
builtin-show-branch.c
+11
-11
@@ -346,7 +346,7 @@ static void sort_ref_range(int bottom, int top)
346
compare_ref_name);
347
}
348
349
-static int append_ref(const char *refname, const unsigned char *sha1, void *cb_data)
349
+static int append_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
350
{
351
struct commit *commit = lookup_commit_reference_gently(sha1, 1);
352
int i;
@@ -369,7 +369,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, void *cb_d
369
return 0;
370
}
371
372
-static int append_head_ref(const char *refname, const unsigned char *sha1, void *cb_data)
372
+static int append_head_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
373
{
374
unsigned char tmp[20];
375
int ofs = 11;
@@ -380,14 +380,14 @@ static int append_head_ref(const char *refname, const unsigned char *sha1, void
380
*/
381
if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
382
ofs = 5;
383
- return append_ref(refname + ofs, sha1, cb_data);
383
+ return append_ref(refname + ofs, sha1, flag, cb_data);
384
}
385
386
-static int append_tag_ref(const char *refname, const unsigned char *sha1, void *cb_data)
386
+static int append_tag_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
387
{
388
if (strncmp(refname, "refs/tags/", 10))
389
return 0;
390
- return append_ref(refname + 5, sha1, cb_data);
390
+ return append_ref(refname + 5, sha1, flag, cb_data);
391
}
392
393
static const char *match_ref_pattern = NULL;
@@ -401,7 +401,7 @@ static int count_slash(const char *s)
401
return cnt;
402
}
403
404
-static int append_matching_ref(const char *refname, const unsigned char *sha1, void *cb_data)
404
+static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
405
{
406
/* we want to allow pattern hold/<asterisk> to show all
407
* branches under refs/heads/hold/, and v0.99.9? to show
@@ -417,10 +417,10 @@ static int append_matching_ref(const char *refname, const unsigned char *sha1, v
417
if (fnmatch(match_ref_pattern, tail, 0))
418
return 0;
419
if (!strncmp("refs/heads/", refname, 11))
420
- return append_head_ref(refname, sha1, cb_data);
420
+ return append_head_ref(refname, sha1, flag, cb_data);
421
if (!strncmp("refs/tags/", refname, 10))
422
- return append_tag_ref(refname, sha1, cb_data);
423
- return append_ref(refname, sha1, cb_data);
422
+ return append_tag_ref(refname, sha1, flag, cb_data);
423
+ return append_ref(refname, sha1, flag, cb_data);
424
}
425
426
static void snarf_refs(int head, int tag)
@@ -487,7 +487,7 @@ static void append_one_rev(const char *av)
487
{
488
unsigned char revkey[20];
489
if (!get_sha1(av, revkey)) {
490
- append_ref(av, revkey, NULL);
490
+ append_ref(av, revkey, 0, NULL);
491
return;
492
}
493
if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
@@ -630,7 +630,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
630
ac--; av++;
631
}
632
633
- head_p = resolve_ref("HEAD", head_sha1, 1);
633
+ head_p = resolve_ref("HEAD", head_sha1, 1, NULL);
634
if (head_p) {
635
head_len = strlen(head_p);
636
memcpy(head, head_p, head_len + 1);
builtin-symbolic-ref.c
+5
-1
@@ -1,5 +1,6 @@
1
#include "builtin.h"
2
#include "cache.h"
3
+#include "refs.h"
4
5
static const char git_symbolic_ref_usage[] =
6
"git-symbolic-ref name [ref]";
@@ -7,10 +8,13 @@ static const char git_symbolic_ref_usage[] =
8
static void check_symref(const char *HEAD)
9
{
10
unsigned char sha1[20];
10
- const char *refs_heads_master = resolve_ref(HEAD, sha1, 0);
11
+ int flag;
12
+ const char *refs_heads_master = resolve_ref(HEAD, sha1, 0, &flag);
13
14
if (!refs_heads_master)
15
die("No such ref: %s", HEAD);
16
+ else if (!(flag & REF_ISSYMREF))
17
+ die("ref %s is not a symbolic ref", HEAD);
18
puts(refs_heads_master);
19
}
20
cache.h
+1
-1
@@ -286,7 +286,7 @@ extern int get_sha1(const char *str, unsigned char *sha1);
286
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
287
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
288
extern int read_ref(const char *filename, unsigned char *sha1);
289
-extern const char *resolve_ref(const char *path, unsigned char *sha1, int);
289
+extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
290
extern int create_symref(const char *ref, const char *refs_heads_master);
291
extern int validate_symref(const char *ref);
292
describe.c
+1
-1
@@ -53,7 +53,7 @@ static void add_to_known_names(const char *path,
53
names = ++idx;
54
}
55
56
-static int get_name(const char *path, const unsigned char *sha1, void *cb_data)
56
+static int get_name(const char *path, const unsigned char *sha1, int flag, void *cb_data)
57
{
58
struct commit *commit = lookup_commit_reference_gently(sha1, 1);
59
struct object *object;
fetch-pack.c
+2
-2
@@ -42,7 +42,7 @@ static void rev_list_push(struct commit *commit, int mark)
42
}
43
}
44
45
-static int rev_list_insert_ref(const char *path, const unsigned char *sha1, void *cb_data)
45
+static int rev_list_insert_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
46
{
47
struct object *o = deref_tag(parse_object(sha1), path, 0);
48
@@ -253,7 +253,7 @@ done:
253
254
static struct commit_list *complete;
255
256
-static int mark_complete(const char *path, const unsigned char *sha1, void *cb_data)
256
+static int mark_complete(const char *path, const unsigned char *sha1, int flag, void *cb_data)
257
{
258
struct object *o = parse_object(sha1);
259
fetch.c
+1
-1
@@ -201,7 +201,7 @@ static int interpret_target(char *target, unsigned char *sha1)
201
return -1;
202
}
203
204
-static int mark_complete(const char *path, const unsigned char *sha1, void *cb_data)
204
+static int mark_complete(const char *path, const unsigned char *sha1, int flag, void *cb_data)
205
{
206
struct commit *commit = lookup_commit_reference_gently(sha1, 1);
207
if (commit) {
fsck-objects.c
+4
-3
@@ -402,7 +402,7 @@ static void fsck_dir(int i, char *path)
402
403
static int default_refs;
404
405
-static int fsck_handle_ref(const char *refname, const unsigned char *sha1, void *cb_data)
405
+static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
406
{
407
struct object *obj;
408
@@ -458,9 +458,10 @@ static void fsck_object_dir(const char *path)
458
static int fsck_head_link(void)
459
{
460
unsigned char sha1[20];
461
- const char *head_points_at = resolve_ref("HEAD", sha1, 1);
461
+ int flag;
462
+ const char *head_points_at = resolve_ref("HEAD", sha1, 1, &flag);
463
463
- if (!head_points_at)
464
+ if (!head_points_at || !(flag & REF_ISSYMREF))
465
return error("HEAD is not a symbolic ref");
466
if (strncmp(head_points_at, "refs/heads/", 11))
467
return error("HEAD points to something strange (%s)",
http-push.c
+1
-1
@@ -1864,7 +1864,7 @@ static int update_remote(unsigned char *sha1, struct remote_lock *lock)
1864
static struct ref *local_refs, **local_tail;
1865
static struct ref *remote_refs, **remote_tail;
1866
1867
-static int one_local_ref(const char *refname, const unsigned char *sha1, void *cb_data)
1867
+static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
1868
{
1869
struct ref *ref;
1870
int len = strlen(refname) + 1;
receive-pack.c
+2
-2
@@ -12,7 +12,7 @@ static int report_status;
12
static char capabilities[] = "report-status";
13
static int capabilities_sent;
14
15
-static int show_ref(const char *path, const unsigned char *sha1, void *cb_data)
15
+static int show_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
16
{
17
if (capabilities_sent)
18
packet_write(1, "%s %s\n", sha1_to_hex(sha1), path);
@@ -27,7 +27,7 @@ static void write_head_info(void)
27
{
28
for_each_ref(show_ref, NULL);
29
if (!capabilities_sent)
30
- show_ref("capabilities^{}", null_sha1, NULL);
30
+ show_ref("capabilities^{}", null_sha1, 0, NULL);
31
32
}
33
refs.c
+31
-13
@@ -5,6 +5,7 @@
5
6
struct ref_list {
7
struct ref_list *next;
8
+ unsigned char flag; /* ISSYMREF? ISPACKED? */
9
unsigned char sha1[20];
10
char name[FLEX_ARRAY];
11
};
@@ -36,7 +37,8 @@ static const char *parse_ref_line(char *line, unsigned char *sha1)
37
return line;
38
}
39
39
-static struct ref_list *add_ref(const char *name, const unsigned char *sha1, struct ref_list *list)
40
+static struct ref_list *add_ref(const char *name, const unsigned char *sha1,
41
+ int flag, struct ref_list *list)
42
{
43
int len;
44
struct ref_list **p = &list, *entry;
@@ -58,6 +60,7 @@ static struct ref_list *add_ref(const char *name, const unsigned char *sha1, str
60
entry = xmalloc(sizeof(struct ref_list) + len);
61
hashcpy(entry->sha1, sha1);
62
memcpy(entry->name, name, len);
63
+ entry->flag = flag;
64
entry->next = *p;
65
*p = entry;
66
return list;
@@ -78,7 +81,7 @@ static struct ref_list *get_packed_refs(void)
81
const char *name = parse_ref_line(refline, sha1);
82
if (!name)
83
continue;
81
- list = add_ref(name, sha1, list);
84
+ list = add_ref(name, sha1, REF_ISPACKED, list);
85
}
86
fclose(f);
87
refs = list;
@@ -104,6 +107,7 @@ static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)
107
while ((de = readdir(dir)) != NULL) {
108
unsigned char sha1[20];
109
struct stat st;
110
+ int flag;
111
int namelen;
112
113
if (de->d_name[0] == '.')
@@ -120,11 +124,11 @@ static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)
124
list = get_ref_dir(ref, list);
125
continue;
126
}
123
- if (read_ref(ref, sha1) < 0) {
127
+ if (!resolve_ref(ref, sha1, 1, &flag)) {
128
error("%s points nowhere!", ref);
129
continue;
130
}
127
- list = add_ref(ref, sha1, list);
131
+ list = add_ref(ref, sha1, flag, list);
132
}
133
free(ref);
134
closedir(dir);
@@ -147,12 +151,15 @@ static struct ref_list *get_loose_refs(void)
151
/* We allow "recursive" symbolic refs. Only within reason, though */
152
#define MAXDEPTH 5
153
150
-const char *resolve_ref(const char *ref, unsigned char *sha1, int reading)
154
+const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *flag)
155
{
156
int depth = MAXDEPTH, len;
157
char buffer[256];
158
static char ref_buffer[256];
159
160
+ if (flag)
161
+ *flag = 0;
162
+
163
for (;;) {
164
const char *path = git_path("%s", ref);
165
struct stat st;
@@ -174,6 +181,8 @@ const char *resolve_ref(const char *ref, unsigned char *sha1, int reading)
181
while (list) {
182
if (!strcmp(ref, list->name)) {
183
hashcpy(sha1, list->sha1);
184
+ if (flag)
185
+ *flag |= REF_ISPACKED;
186
return ref;
187
}
188
list = list->next;
@@ -191,6 +200,8 @@ const char *resolve_ref(const char *ref, unsigned char *sha1, int reading)
200
buffer[len] = 0;
201
strcpy(ref_buffer, buffer);
202
ref = ref_buffer;
203
+ if (flag)
204
+ *flag |= REF_ISSYMREF;
205
continue;
206
}
207
}
@@ -219,6 +230,8 @@ const char *resolve_ref(const char *ref, unsigned char *sha1, int reading)
230
buf[len] = 0;
231
memcpy(ref_buffer, buf, len + 1);
232
ref = ref_buffer;
233
+ if (flag)
234
+ *flag |= REF_ISSYMREF;
235
}
236
if (len < 40 || get_sha1_hex(buffer, sha1))
237
return NULL;
@@ -270,12 +283,13 @@ int create_symref(const char *ref_target, const char *refs_heads_master)
283
284
int read_ref(const char *ref, unsigned char *sha1)
285
{
273
- if (resolve_ref(ref, sha1, 1))
286
+ if (resolve_ref(ref, sha1, 1, NULL))
287
return 0;
288
return -1;
289
}
290
278
-static int do_for_each_ref(const char *base, each_ref_fn fn, int trim, void *cb_data)
291
+static int do_for_each_ref(const char *base, each_ref_fn fn, int trim,
292
+ void *cb_data)
293
{
294
int retval;
295
struct ref_list *packed = get_packed_refs();
@@ -303,7 +317,8 @@ static int do_for_each_ref(const char *base, each_ref_fn fn, int trim, void *cb_
317
error("%s does not point to a valid object!", entry->name);
318
continue;
319
}
306
- retval = fn(entry->name + trim, entry->sha1, cb_data);
320
+ retval = fn(entry->name + trim, entry->sha1,
321
+ entry->flag, cb_data);
322
if (retval)
323
return retval;
324
}
@@ -311,7 +326,8 @@ static int do_for_each_ref(const char *base, each_ref_fn fn, int trim, void *cb_
326
packed = packed ? packed : loose;
327
while (packed) {
328
if (!strncmp(base, packed->name, trim)) {
314
- retval = fn(packed->name + trim, packed->sha1, cb_data);
329
+ retval = fn(packed->name + trim, packed->sha1,
330
+ packed->flag, cb_data);
331
if (retval)
332
return retval;
333
}
@@ -323,8 +339,10 @@ static int do_for_each_ref(const char *base, each_ref_fn fn, int trim, void *cb_
339
int head_ref(each_ref_fn fn, void *cb_data)
340
{
341
unsigned char sha1[20];
326
- if (!read_ref("HEAD", sha1))
327
- return fn("HEAD", sha1, cb_data);
342
+ int flag;
343
+
344
+ if (resolve_ref("HEAD", sha1, 1, &flag))
345
+ return fn("HEAD", sha1, flag, cb_data);
346
return 0;
347
}
348
@@ -415,7 +433,7 @@ int check_ref_format(const char *ref)
433
static struct ref_lock *verify_lock(struct ref_lock *lock,
434
const unsigned char *old_sha1, int mustexist)
435
{
418
- if (!resolve_ref(lock->ref_name, lock->old_sha1, mustexist)) {
436
+ if (!resolve_ref(lock->ref_name, lock->old_sha1, mustexist, NULL)) {
437
error("Can't verify ref %s", lock->ref_name);
438
unlock_ref(lock);
439
return NULL;
@@ -441,7 +459,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *ref,
459
lock = xcalloc(1, sizeof(struct ref_lock));
460
lock->lock_fd = -1;
461
444
- ref = resolve_ref(ref, lock->old_sha1, mustexist);
462
+ ref = resolve_ref(ref, lock->old_sha1, mustexist, NULL);
463
if (!ref) {
464
int last_errno = errno;
465
error("unable to resolve reference %s: %s",
refs.h
+3
-1
@@ -14,7 +14,9 @@ struct ref_lock {
14
* Calls the specified function for each ref file until it returns nonzero,
15
* and returns the value
16
*/
17
-typedef int each_ref_fn(const char *refname, const unsigned char *sha1, void *cb_data);
17
+#define REF_ISSYMREF 01
18
+#define REF_ISPACKED 02
19
+typedef int each_ref_fn(const char *refname, const unsigned char *sha1, int flags, void *cb_data);
20
extern int head_ref(each_ref_fn, void *);
21
extern int for_each_ref(each_ref_fn, void *);
22
extern int for_each_tag_ref(each_ref_fn, void *);
revision.c
+1
-1
@@ -466,7 +466,7 @@ static void limit_list(struct rev_info *revs)
466
static int all_flags;
467
static struct rev_info *all_revs;
468
469
-static int handle_one_ref(const char *path, const unsigned char *sha1, void *cb_data)
469
+static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
470
{
471
struct object *object = get_reference(all_revs, path, sha1, all_flags);
472
add_pending_object(all_revs, object, "");
send-pack.c
+1
-1
@@ -215,7 +215,7 @@ static int ref_newer(const unsigned char *new_sha1,
215
static struct ref *local_refs, **local_tail;
216
static struct ref *remote_refs, **remote_tail;
217
218
-static int one_local_ref(const char *refname, const unsigned char *sha1, void *cb_data)
218
+static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
219
{
220
struct ref *ref;
221
int len = strlen(refname) + 1;
server-info.c
+1
-1
@@ -7,7 +7,7 @@
7
/* refs */
8
static FILE *info_ref_fp;
9
10
-static int add_info_ref(const char *path, const unsigned char *sha1, void *cb_data)
10
+static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
11
{
12
struct object *o = parse_object(sha1);
13
sha1_name.c
+1
-1
@@ -276,7 +276,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
276
277
for (p = fmt; *p; p++) {
278
this_result = refs_found ? sha1_from_ref : sha1;
279
- ref = resolve_ref(mkpath(*p, len, str), this_result, 1);
279
+ ref = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
280
if (ref) {
281
if (!refs_found++)
282
real_ref = xstrdup(ref);
upload-pack.c
+1
-1
@@ -416,7 +416,7 @@ static void receive_needs(void)
416
}
417
}
418
419
-static int send_ref(const char *refname, const unsigned char *sha1, void *cb_data)
419
+static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
420
{
421
static const char *capabilities = "multi_ack thin-pack side-band side-band-64k";
422
struct object *o = parse_object(sha1);
wt-status.c
+1
-1
@@ -41,7 +41,7 @@ void wt_status_prepare(struct wt_status *s)
41
42
s->is_initial = get_sha1("HEAD", sha1) ? 1 : 0;
43
44
- head = resolve_ref("HEAD", sha1, 0);
44
+ head = resolve_ref("HEAD", sha1, 0, NULL);
45
s->branch = head ? xstrdup(head) : NULL;
46
47
s->reference = "HEAD";