@matheusbsbs / matheus-bagliano / commits / 5701115aa7
Fork 0

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

The code to squelch empty diffs introduced by commit fb13227e089f22dc31a3b1624559153821056848 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>

Sven Verdoolaege committed Sep 8, 2007 at 12:30 UTC 5701115aa7cfe7edd57c2483085456a37e27a5ba
2 files changed +21 -4
diff.c
+17 -4
@@ -3144,6 +3144,22 @@ static void diffcore_apply_filter(const char *filter)
3144 *q = outq;
3145 }
3146
3147 +/* Check whether two filespecs with the same mode and size are identical */
3148 +static int diff_filespec_is_identical(struct diff_filespec *one,
3149 + struct diff_filespec *two)
3150 +{
3151 + if (S_ISGITLINK(one->mode)) {
3152 + diff_fill_sha1_info(one);
3153 + diff_fill_sha1_info(two);
3154 + return !hashcmp(one->sha1, two->sha1);
3155 + }
3156 + if (diff_populate_filespec(one, 0))
3157 + return 0;
3158 + if (diff_populate_filespec(two, 0))
3159 + return 0;
3160 + return !memcmp(one->data, two->data, one->size);
3161 +}
3162 +
3163 static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3164 {
3165 int i;
@@ -3175,10 +3191,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
3191 diff_populate_filespec(p->one, 1) ||
3192 diff_populate_filespec(p->two, 1) ||
3193 (p->one->size != p->two->size) ||
3178 -
3179 - diff_populate_filespec(p->one, 0) || /* (2) */
3180 - diff_populate_filespec(p->two, 0) ||
3181 - memcmp(p->one->data, p->two->data, p->one->size))
3194 + !diff_filespec_is_identical(p->one, p->two)) /* (2) */
3195 diff_q(&outq, p);
3196 else {
3197 /*
t/t7400-submodule-basic.sh
+4
@@ -152,6 +152,10 @@ test_expect_success 'the --cached sha1 should be rev1' '
152 git-submodule --cached status | grep "^+$rev1"
153 '
154
155 +test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
156 + git-diff | grep "^+Subproject commit $rev2"
157 +'
158 +
159 test_expect_success 'update should checkout rev1' '
160 git-submodule update &&
161 head=$(cd lib && git rev-parse HEAD) &&