Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-whatchanged: make default output format be pretty.
[gitweb.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index 046d9a39293fa5d33529b59a251f626785ced233..dd1c0b6d55ded16509e8ea5f6cfd1ce5e770e22c 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-555,6
+555,7
@@
static void run_diff(const char *name,
{
const char *pgm = external_diff();
if (!pgm &&
+ one && two &&
DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
(S_IFMT & one->mode) != (S_IFMT & two->mode)) {
/* a filepair that changes between file and symlink