Thread (3 messages) flat view 3 messages, 1 author, 2016-06-15
DORMANTno replies

[PATCH 0/2] git-blame bug

From: Ben Willard <hidden>
Date: 2016-06-15 22:46:53

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help