Merge branch 'jc/format-patch'

[git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 4c6bfed56ee0fe3c84124e0b9a9c5bb80c9abcf2..ce063b4ffa48eb1db8849d5aabb6732fc98946b6 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -94,7 +94,7 @@ static char *grab_blob(const unsigned char *sha1, unsigned long *size)
 {
        char *blob;
        char type[20];
-       if (!memcmp(sha1, null_sha1, 20)) {
+       if (is_null_sha1(sha1)) {
                /* deleted blob */
                *size = 0;
                return xcalloc(1, 1);
@@ -611,7 +611,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
        struct sline *sline; /* survived lines */
        int mode_differs = 0;
        int i, show_hunks;
-       int working_tree_file = !memcmp(elem->sha1, null_sha1, 20);
+       int working_tree_file = is_null_sha1(elem->sha1);
        int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV;
        mmfile_t result_file;