undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-diff: don't squelch the new SHA1 in submodule diffs

Browse Source 
The code to squelch empty diffs introduced by commit
fb13227e08 would inadvertently
populate filespec "two" of a submodule change using the uninitialized
(null) SHA1, thereby replacing the submodule SHA1 by 0{40} in the output.

This change teaches diffcore_skip_stat_unmatch to handle
submodule changes correctly.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sven Verdoolaege 2007-09-08 12:30:22 +02:00 committed by Junio C Hamano
parent a51cdb0c04
commit 5701115aa7
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -3144,6 +3144,22 @@ static void diffcore_apply_filter(const char *filter)
*q = outq; *q = outq;
} }
/* Check whether two filespecs with the same mode and size are identical */
static int diff_filespec_is_identical(struct diff_filespec *one,
struct diff_filespec *two)
{
if (S_ISGITLINK(one->mode)) {
diff_fill_sha1_info(one);
diff_fill_sha1_info(two);
return !hashcmp(one->sha1, two->sha1);
}
if (diff_populate_filespec(one, 0))
return 0;
if (diff_populate_filespec(two, 0))
return 0;
return !memcmp(one->data, two->data, one->size);
}
static void diffcore_skip_stat_unmatch(struct diff_options *diffopt) static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
{ {
int i; int i;
@ -3175,10 +3191,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
diff_populate_filespec(p->one, 1) || diff_populate_filespec(p->one, 1) ||
diff_populate_filespec(p->two, 1) || diff_populate_filespec(p->two, 1) ||
(p->one->size != p->two->size) || (p->one->size != p->two->size) ||
!diff_filespec_is_identical(p->one, p->two)) /* (2) */
diff_populate_filespec(p->one, 0) || /* (2) */
diff_populate_filespec(p->two, 0) ||
memcmp(p->one->data, p->two->data, p->one->size))
diff_q(&outq, p); diff_q(&outq, p);
else { else {
/* /*

4
t/t7400-submodule-basic.sh
View File

@ -152,6 +152,10 @@ test_expect_success 'the --cached sha1 should be rev1' '
git-submodule --cached status | grep "^+$rev1" git-submodule --cached status | grep "^+$rev1"
' '
test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
git-diff | grep "^+Subproject commit $rev2"
'
test_expect_success 'update should checkout rev1' ' test_expect_success 'update should checkout rev1' '
git-submodule update && git-submodule update &&
head=$(cd lib && git rev-parse HEAD) && head=$(cd lib && git rev-parse HEAD) &&