public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Ben Willard <benwillard@gmail•com>
To: git@vger•kernel.org
Cc: gitster@pobox•com
Subject: [PATCH 0/2] git-blame bug
Date: Tue, 2 Jun 2009 15:28:39 -0400	[thread overview]
Message-ID: <cover.1243969358.git.benwillard@gmail.com> (raw)

Hi,

I ran across this git-blame failure the other day: if a directory is deleted
and a file is created with the same name in a single commit, then git blame
will fail on it with this error:
	fatal: internal error in blame::find_origin
	
Anyway, patch 1/2 shows this failure with a test, and 2/2 is a possible fix.
They should apply on maint. 

Thanks,
--
Ben

Ben Willard (2):
  t8006: Add test to show blame failure
  blame: Fix corner case when a directory becomes a file

 builtin-blame.c  |   12 ++++++++----
 t/t8006-blame.sh |   21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100755 t/t8006-blame.sh

next             reply	other threads:[~2009-06-02 19:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-02 19:28 Ben Willard [this message]
2009-06-02 19:28 ` [PATCH 1/2] t8006: Add test to show blame failure Ben Willard
2009-06-02 19:29 ` [PATCH 2/2] blame: Fix corner case when a directory becomes a file Ben Willard
2009-06-03  7:43   ` Junio C Hamano
2009-06-03 12:40     ` Ben Willard

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=cover.1243969358.git.benwillard@gmail.com \
    --to=benwillard@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox