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

Merge branch 'jc/diff-files-ita'

Browse Source 
Code cleanup.

* jc/diff-files-ita:
  run_diff_files(): clarify computation of sha1 validity
This commit is contained in:
Junio C Hamano 2015-02-22 12:28:27 -08:00
commit dcc883dcbc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
diff-lib.c
View File

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