aboutsummaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-17 22:27:08 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-17 23:00:31 -0800
commitb2a6d1c6868b6d5e7d2b4fa9129341220a1e848a (patch)
treec5223916691e2b380166006e6014e0e524cafd9b /bundle.c
parentf0298cf1c6a7b5cc8b79d84a03b0ce07df2d9e6b (diff)
downloadgit-b2a6d1c6868b6d5e7d2b4fa9129341220a1e848a.tar.gz
git-b2a6d1c6868b6d5e7d2b4fa9129341220a1e848a.tar.xz
bundle: allow the same ref to be given more than once
"git bundle create x master master" used to create a bundle that lists the same branch (master) twice. Cloning from such a bundle resulted in a needless warning "warning: Duplicated ref: refs/remotes/origin/master". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bundle.c b/bundle.c
index daecd8e1c..b20f2101f 100644
--- a/bundle.c
+++ b/bundle.c
@@ -240,6 +240,8 @@ int create_bundle(struct bundle_header *header, const char *path,
return error("unrecognized argument: %s'", argv[i]);
}
+ object_array_remove_duplicates(&revs.pending);
+
for (i = 0; i < revs.pending.nr; i++) {
struct object_array_entry *e = revs.pending.objects + i;
unsigned char sha1[20];