git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johan Herland <johan@herland.net>
To: grubba@grubba.org
Cc: git@vger.kernel.org, jrnieder@gmail.com, johan@herland.net
Subject: [RFC/PATCH 0/3] fast-import: Fix incremental use of notes
Date: Fri, 25 Nov 2011 01:09:44 +0100	[thread overview]
Message-ID: <1322179787-4422-1-git-send-email-johan@herland.net> (raw)
In-Reply-To: <Pine.GSO.4.63.1111231137350.5099@shipon.roxen.com>

Hi,

This is a first attempt at fixing the bug reported by Henrik.

The first two patches provide testcases for the bug, and the last patch
provides a fix.

Have fun! :)

...Johan


Johan Herland (3):
  t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
  t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
  fast-import: Fix incorrect fanout level when modifying existing notes refs

 fast-import.c                |   28 ++++++++++++++++--
 t/t9301-fast-import-notes.sh |   63 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 83 insertions(+), 8 deletions(-)

-- 
1.7.5.rc1.3.g4d7b

  parent reply	other threads:[~2011-11-25  1:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-23 12:09 Incremental use of fast-import may cause conflicting notes Henrik Grubbström
2011-11-23 12:10 ` Henrik Grubbström
2011-11-24 23:09 ` Jonathan Nieder
2011-11-25  0:09 ` Johan Herland [this message]
2011-11-25  0:09   ` [RFC/PATCH 1/3] t9301: Fix testcase covering up a bug in fast-import's notes fanout handling Johan Herland
2011-11-25  0:09   ` [RFC/PATCH 2/3] t9301: Add 2nd testcase exposing bugs " Johan Herland
2011-11-25  0:09   ` [RFC/PATCH 3/3] fast-import: Fix incorrect fanout level when modifying existing notes refs Johan Herland

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=1322179787-4422-1-git-send-email-johan@herland.net \
    --to=johan@herland.net \
    --cc=git@vger.kernel.org \
    --cc=grubba@grubba.org \
    --cc=jrnieder@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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).