diff: check for merge bases before assigning sym->base

[thirdparty/git.git] / builtin / diff.c

diff --git a/builtin/diff.c b/builtin/diff.c
index 96ee2cbb2ab7db9f3eaf6589ba7fdab00131313a..64ac8ae0af4252c8a48eeb3427d3387b064d35b2 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -355,9 +355,9 @@ static void symdiff_prepare(struct rev_info *rev, struct symdiff *sym)
 
        sym->left = rev->pending.objects[lpos].name;
        sym->right = rev->pending.objects[rpos].name;
-       sym->base = rev->pending.objects[basepos].name;
        if (basecount == 0)
                die(_("%s...%s: no merge base"), sym->left, sym->right);
+       sym->base = rev->pending.objects[basepos].name;
        bitmap_unset(map, basepos);     /* unmark the base we want */
        sym->warn = basecount > 1;
        sym->skip = map;