[PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 046d9a3..dd1c0b6 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