git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Joey Hess <joey@kitenet.net>
Cc: git@vger.kernel.org, 554682@bugs.debian.org,
	Adam Brewster <adambrewster@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 6/8] Fix bundle --stdin
Date: Sat, 26 Jun 2010 01:28:11 -0500	[thread overview]
Message-ID: <20100626062811.GG15881@burratino> (raw)
In-Reply-To: <20100626061735.GA15881@burratino>

To write a bundle’s table of contents, the name passed on the command
line for each ref is needed.  Unfortunately, names passed through
stdin are put in a temporary buffer and then freed; the random
gibberish that tends to replace them does not look like a meaningful
ref name to bundle_list_refs(), so no valid toc entries are found and
‘git bundle --stdin’ thinks it has been asked to create an empty
bundle.

So teach the revision walker to keep rev names after reading them from
stdin.  This fixes ‘git bundle --stdin’ at the cost of a memory leak.

Reported-by: Joey Hess <joey@kitenet.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 revision.c        |    2 +-
 t/t5704-bundle.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/revision.c b/revision.c
index f4b8b38..cf86af3 100644
--- a/revision.c
+++ b/revision.c
@@ -1022,7 +1022,7 @@ static void read_revisions_from_stdin(struct rev_info *revs, const char ***prune
 			}
 			die("options not supported in --stdin mode");
 		}
-		if (handle_revision_arg(sb.buf, revs, 0, 1))
+		if (handle_revision_arg(xstrdup(sb.buf), revs, 0, 1))
 			die("bad revision '%s'", sb.buf);
 	}
 	if (seen_dashdash)
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
index ddc3dc5..cc463f3 100755
--- a/t/t5704-bundle.sh
+++ b/t/t5704-bundle.sh
@@ -30,7 +30,7 @@ test_expect_success 'tags can be excluded by rev-list options' '
 
 '
 
-test_expect_failure 'bundle --stdin' '
+test_expect_success 'bundle --stdin' '
 
 	echo master | git bundle create stdin-bundle.bdl --stdin &&
 	git ls-remote stdin-bundle.bdl >output &&
@@ -38,7 +38,7 @@ test_expect_failure 'bundle --stdin' '
 
 '
 
-test_expect_failure 'bundle --stdin <rev-list options>' '
+test_expect_success 'bundle --stdin <rev-list options>' '
 
 	echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
 	git ls-remote hybrid-bundle.bdl >output &&
-- 
1.7.1.198.g8d802

  parent reply	other threads:[~2010-06-26  6:28 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-19  0:26 bug: git-bundle create foo --stdin -> segfault Joey Hess
2010-01-19 23:52 ` Johannes Schindelin
2010-04-19  7:14 ` [PATCH 0/2] test bundle --stdin, fix objects_array_remove_duplicates() Jonathan Nieder
2010-04-19  8:03   ` [PATCH 1/2] t5704 (bundle): add tests for bundle --stdin Jonathan Nieder
2010-04-19  8:03   ` [PATCH 2/2] fix "bundle --stdin" segfault Jonathan Nieder
2010-04-20  5:16   ` [PATCH 0/2] test bundle --stdin, fix objects_array_remove_duplicates() Junio C Hamano
2010-06-26  6:17 ` [RFC/PATCH 0/8] Re: bug: git-bundle create foo --stdin -> segfault Jonathan Nieder
2010-06-26  6:19   ` [PATCH 1/8] bundle: split basis discovery into its own function Jonathan Nieder
2010-06-26  6:20   ` [PATCH 2/8] bundle: use libified rev-list --boundary Jonathan Nieder
2010-06-30 17:57     ` Junio C Hamano
2010-06-30 20:34       ` Jonathan Nieder
2010-06-26  6:20   ` [PATCH 3/8] bundle: give list_prerequisites() loop body its own function Jonathan Nieder
2010-06-30 18:04     ` Junio C Hamano
2010-06-30 20:37       ` Jonathan Nieder
2010-06-26  6:21   ` [PATCH 4/8] bundle: split table of contents output into " Jonathan Nieder
2010-06-26  6:22   ` [PATCH 5/8] bundle: reuse setup_revisions result Jonathan Nieder
2010-06-26  6:28   ` Jonathan Nieder [this message]
2010-06-26  6:29   ` [RFC/PATCH 7/8] bundle: Keep names of basis refs after discovery Jonathan Nieder
2010-06-26  6:31   ` [PATCH 8/8] bundle_create: Do not exit when given no revs to bundle Jonathan Nieder

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=20100626062811.GG15881@burratino \
    --to=jrnieder@gmail.com \
    --cc=554682@bugs.debian.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=adambrewster@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=joey@kitenet.net \
    /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).