Skip to content

git-blame bug

Ben Willard git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2t8006: Add test to show blame failuret/t8006-blame.sh+21 -00 replies
2/2blame: Fix corner case when a directory becomes a filebuiltin-blame.c t/t8006-blame.sh+9 -52 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] git-blame bug

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

Read the cover letter in its thread