From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Feb 2015 20:28:27 +0000 (-0800)
Subject: Merge branch 'jc/diff-files-ita'
X-Git-Tag: v2.4.0-rc0~100
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dcc883dcbc25276784bb98dce5927d76d2ed5c6c?hp=070f6fed052ca0cf6625f6566d23c71530d7abf9

Merge branch 'jc/diff-files-ita'

Code cleanup.

* jc/diff-files-ita:
run_diff_files(): clarify computation of sha1 validity
---

diff --git a/diff-lib.c b/diff-lib.c
index 875aff8643..a85c4971ac 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -101,6 +101,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 		struct cache_entry *ce = active_cache[i];
 		int changed;
 		unsigned dirty_submodule = 0;
+		const unsigned char *old_sha1, *new_sha1;
 
 		if (diff_can_quit_early(&revs->diffopt))
 			break;
@@ -224,9 +225,12 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 				continue;
 		}
 		oldmode = ce->ce_mode;
+		old_sha1 = ce->sha1;
+		new_sha1 = changed ? null_sha1 : ce->sha1;
 		diff_change(&revs->diffopt, oldmode, newmode,
-			    ce->sha1, (changed ? null_sha1 : ce->sha1),
-			    !is_null_sha1(ce->sha1), (changed ? 0 : !is_null_sha1(ce->sha1)),
+			    old_sha1, new_sha1,
+			    !is_null_sha1(old_sha1),
+			    !is_null_sha1(new_sha1),
 			    ce->name, 0, dirty_submodule);
 
 	}