diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-09 14:00:43 -0700 |
| commit | 46be023084bd6ce4958f16427da7cdaf91cff205 (patch) | |
| tree | 2986f28c116c2a6eaf96f551968e1a878abfde97 /builtin/diff.c | |
| parent | Merge branch 'rs/line-log-until' into master (diff) | |
| parent | diff: check for merge bases before assigning sym->base (diff) | |
| download | tgif-46be023084bd6ce4958f16427da7cdaf91cff205.tar.xz | |
Merge branch 'ct/diff-with-merge-base-clarification' into master
Recent update to "git diff" meant as a code clean-up introduced a
bug in its error handling code, which has been corrected.
* ct/diff-with-merge-base-clarification:
diff: check for merge bases before assigning sym->base
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 8c36da09b6..cb98811c21 100644 --- 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; |