bundle create: keep symbolic refs' names instead of resolving them
When creating a bundle, symbolic refs used to be resolved to the non-symbolic refs they point to before being written to the list of contained refs. I.e. "git bundle create a1.bundle HEAD master" would show something like 388afe7881b33102fada216dd07806728773c011 refs/heads/master 388afe7881b33102fada216dd07806728773c011 refs/heads/master instead of 388afe7881b33102fada216dd07806728773c011 HEAD 388afe7881b33102fada216dd07806728773c011 refs/heads/master Introduce a special handling so that the symbolic refs are listed with the names passed on the command line. Noticed by Santi Béjar. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 22, 2007 at 12:24 UTC
c5546e88fe492558313965a49512ce5c71a98dfe
2 files changed
+21
-1
builtin-bundle.c
+8
-1
@@ -6,6 +6,7 @@
6
#include "revision.h"
7
#include "list-objects.h"
8
#include "run-command.h"
9
+#include "refs.h"
10
11
/*
12
* Basic handler for bundle files to connect repositories via sneakernet.
@@ -253,11 +254,17 @@ static int create_bundle(struct bundle_header *header, const char *path,
254
struct object_array_entry *e = revs.pending.objects + i;
255
unsigned char sha1[20];
256
char *ref;
257
+ const char *display_ref;
258
+ int flag;
259
260
if (e->item->flags & UNINTERESTING)
261
continue;
262
if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
263
continue;
264
+ if (!resolve_ref(e->name, sha1, 1, &flag))
265
+ flag = 0;
266
+ display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
267
+
268
/*
269
* Make sure the refs we wrote out is correct; --max-count and
270
* other limiting options could have prevented all the tips
@@ -308,7 +315,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
315
ref_count++;
316
write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
317
write_or_die(bundle_fd, " ", 1);
311
- write_or_die(bundle_fd, ref, strlen(ref));
318
+ write_or_die(bundle_fd, display_ref, strlen(display_ref));
319
write_or_die(bundle_fd, "\n", 1);
320
free(ref);
321
}
t/t5510-fetch.sh
+13
@@ -153,4 +153,17 @@ test_expect_success 'bundle should be able to create a full history' '
153
154
'
155
156
+test_expect_success 'bundle should record HEAD correctly' '
157
+
158
+ cd "$D" &&
159
+ git bundle create bundle5 HEAD master &&
160
+ git bundle list-heads bundle5 >actual &&
161
+ for h in HEAD refs/heads/master
162
+ do
163
+ echo "$(git rev-parse --verify $h) $h"
164
+ done >expect &&
165
+ diff -u expect actual
166
+
167
+'
168
+
169
test_done