git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 0/2] test bundle --stdin, fix objects_array_remove_duplicates()
Date: Mon, 19 Apr 2010 02:14:49 -0500	[thread overview]
Message-ID: <20100419071449.GA23166@progeny.tock> (raw)
In-Reply-To: <20100119002641.GA31434@gnu.kitenet.net>

This series does not make ‘git bundle --stdin’ work.  In fact,
the bug that it does fix would not be visible if bundle --stdin
worked as it was supposed to.

Instead, this fixes a segfault that the bug triggers.  The
patches have been sitting in my git tree for a while.  They fix
a real problem regardless, and maybe they would help someone
to get bundle --stdin working properly.

Thoughts welcome, as always.
Jonathan Nieder (2):
  t5704 (bundle): add tests for bundle --stdin
  fix "bundle --stdin" segfault

 object.c          |    4 ++--
 t/t5704-bundle.sh |   16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

As for how to fix bundle --stdin, Joey Hess wrote:

> I also tried going back to 22568f0a336ac37ae7329c917857b455839d1d09, but
> still see a bug with Adam Brewster's initial code to add --stdin to
> git-bundle. That code still tries to read stdin twice. If it sees
> "master" both times, it does create a bundle.

and Johannes Schindelin suggested slurping up the input and explicitly
using it twice, or:

> Alternatively, you can try to implement the rev-list --boundary by
> hand (the --pretty=oneline is only needed to get a boundary marker
> IIRC), taking care to reset the commit flags that were set in the
> process.
[...]
> If you want to go that route (which is arguably more elegant anyway),
> I suggest having a look at the merge_bases() and get_merge_bases()
> functions in commit.c

Dscho’s full message is pretty helpful:
http://thread.gmane.org/gmane.comp.version-control.git/137414/focus=137503

  parent reply	other threads:[~2010-04-19  7:14 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 ` Jonathan Nieder [this message]
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   ` [PATCH 6/8] Fix bundle --stdin Jonathan Nieder
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=20100419071449.GA23166@progeny.tock \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    /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).