bekucera/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-09-10 22:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/diff-rename-follow-fix'

Browse Source 
A corner-case bug in "git log --follow -B" has been fixed.

* en/diff-rename-follow-fix:
  diffcore-rename: fix BUG when break detection and --follow used together
This commit is contained in:
Junio C Hamano
2025-03-29 16:39:09 +09:00
parent 27fe152e88 554051d691
commit b9b404fa1c
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
diffcore-rename.c
View File

@@ -33,7 +33,7 @@ static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
{
/* Lookup by p->ONE->path */
int idx = break_idx ? strintmap_get(break_idx, p->one->path) : -1;
return (idx == -1) ? NULL : &rename_dst[idx];
return (idx == -1 || idx == rename_dst_nr) ? NULL : &rename_dst[idx];
}
/*
@@ -1669,9 +1669,10 @@ void diffcore_rename_extended(struct diff_options *options,
if (DIFF_PAIR_BROKEN(p)) {
/* broken delete */
struct diff_rename_dst *dst = locate_rename_dst(p);
if (!dst)
BUG("tracking failed somehow; failed to find associated dst for broken pair");
if (dst->is_rename)
if (options->single_follow && dst &&
strcmp(dst->p->two->path, p->two->path))
dst = NULL;
if (dst && dst->is_rename)
/* counterpart is now rename/copy */
pair_to_free = p;
}

32
t/t4206-log-follow-harder-copies.sh
View File

@@ -54,4 +54,36 @@ test_expect_success 'validate the output.' '
compare_diff_patch current expected
'
test_expect_success 'log --follow -B does not BUG' '
git switch --orphan break_and_follow_are_icky_so_use_both &&
test_seq 1 127 >numbers &&
git add numbers &&
git commit -m "numbers" &&
printf "%s\n" A B C D E F G H I J K L M N O Q R S T U V W X Y Z >pool &&
echo changed >numbers &&
git add pool numbers &&
git commit -m "pool" &&
git log -1 -B --raw --follow -- "p*"
'
test_expect_success 'log --follow -B does not die or use uninitialized memory' '
printf "%s\n" A B C D E F G H I J K L M N O P Q R S T U V W X Y Z >z &&
git add z &&
git commit -m "Initial" &&
test_seq 1 130 >z &&
echo lame >somefile &&
git add z somefile &&
git commit -m "Rewrite z, introduce lame somefile" &&
echo Content >somefile &&
git add somefile &&
git commit -m "Rewrite somefile" &&
git log -B --follow somefile
'
test_done