git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Santi Béjar" <sbejar@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] bundle create: keep symbolic refs' names instead of resolving them
Date: Wed, 21 Nov 2007 16:53:12 +0000 (GMT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0711211652470.27959@racer.site> (raw)
In-Reply-To: <8aa486160711210815g5a1973c2see28a6263fc56030@mail.gmail.com>

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2328 bytes --]


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

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>
---
 bundle.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bundle.c b/bundle.c
index e4d60cd..5e8242f 100644
--- a/bundle.c
+++ b/bundle.c
@@ -6,6 +6,7 @@
 #include "revision.h"
 #include "list-objects.h"
 #include "run-command.h"
+#include "refs.h"
 
 static const char bundle_signature[] = "# v2 git bundle\n";
 
@@ -231,12 +232,17 @@ int create_bundle(struct bundle_header *header, const char *path,
 	for (i = 0; i < revs.pending.nr; i++) {
 		struct object_array_entry *e = revs.pending.objects + i;
 		unsigned char sha1[20];
-		char *ref;
+		const char *ref;
+		int flag;
 
 		if (e->item->flags & UNINTERESTING)
 			continue;
-		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
+		ref = resolve_ref(e->name, sha1, 1, &flag);
+		if (!ref)
 			continue;
+		if (flag & REF_ISSYMREF)
+			ref = e->name;
+
 		/*
 		 * Make sure the refs we wrote out is correct; --max-count and
 		 * other limiting options could have prevented all the tips
@@ -249,7 +255,6 @@ int create_bundle(struct bundle_header *header, const char *path,
 		if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
 			warning("ref '%s' is excluded by the rev-list options",
 				e->name);
-			free(ref);
 			continue;
 		}
 		/*
@@ -280,7 +285,6 @@ int create_bundle(struct bundle_header *header, const char *path,
 				obj->flags |= SHOWN;
 				add_pending_object(&revs, obj, e->name);
 			}
-			free(ref);
 			continue;
 		}
 
@@ -289,7 +293,6 @@ int create_bundle(struct bundle_header *header, const char *path,
 		write_or_die(bundle_fd, " ", 1);
 		write_or_die(bundle_fd, ref, strlen(ref));
 		write_or_die(bundle_fd, "\n", 1);
-		free(ref);
 	}
 	if (!ref_count)
 		die ("Refusing to create empty bundle.");
-- 
1.5.3.6.1977.g54d30

  parent reply	other threads:[~2007-11-21 16:53 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-21 14:54 Wishlist for a bundle-only transport mode Santi Béjar
2007-11-21 15:04 ` Jakub Narebski
2007-11-21 15:24   ` Santi Béjar
2007-11-21 15:46   ` Johannes Schindelin
2007-11-21 16:52     ` Jakub Narebski
2007-11-21 16:59       ` Johannes Schindelin
2007-11-21 17:11         ` Jakub Narebski
2007-11-21 17:26           ` Johannes Schindelin
2007-11-21 17:52             ` Jakub Narebski
2007-11-22  9:42             ` Santi Béjar
2007-11-22 10:02               ` Junio C Hamano
2007-11-23  9:18                 ` Jakub Narebski
2007-11-23  9:31                   ` Junio C Hamano
2007-11-23 10:04                     ` Jakub Narebski
2007-11-23 10:13                     ` Santi Béjar
2007-11-23 12:18                       ` Johannes Schindelin
2007-11-23 15:06                       ` Junio C Hamano
2007-11-23 15:34                         ` Santi Béjar
2007-11-23 16:05                           ` Junio C Hamano
2007-11-23 16:39                             ` Santi Béjar
2007-11-24 19:15                               ` Junio C Hamano
2007-11-23 19:09                           ` Jakub Narebski
2007-11-21 15:59 ` Johannes Schindelin
2007-11-21 16:15   ` Santi Béjar
2007-11-21 16:36     ` Johannes Schindelin
2007-11-21 16:44       ` Santi Béjar
2007-11-21 16:53     ` Johannes Schindelin [this message]
2007-11-22 12:03       ` [PATCH] bundle create: keep symbolic refs' names instead of resolving them Johannes Schindelin
2007-11-22 12:24       ` [REPLACEMENT PATCH] " Johannes Schindelin
2007-11-21 16:23   ` Wishlist for a bundle-only transport mode Kristian Høgsberg
2007-11-21 17:07     ` Johannes Schindelin
2007-11-21 17:06 ` Jakub Narebski
2007-11-21 17:29   ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.0711211652470.27959@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=sbejar@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).