]> git.ipfire.org Git - thirdparty/git.git/commit
diff: fix --merge-base with annotated tags
authorAlyssa Ross <hi@alyssa.is>
Sun, 1 Oct 2023 15:18:45 +0000 (15:18 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Oct 2023 18:55:42 +0000 (11:55 -0700)
commit4adceb5a299164aad1ef9794cdcbdb232ab10299
tree2f7f857cc9cea4778b6c7e5e4ee1dc0b87caa27b
parent43c8a30d150ecede9709c1f2527c8fba92c65f40
diff: fix --merge-base with annotated tags

Checking early for OBJ_COMMIT excludes other objects that can be
resolved to commits, like annotated tags.  If we remove it, annotated
tags will be resolved and handled just fine by
lookup_commit_reference(), and if we are given something that can't be
resolved to a commit, we'll still get a useful error message, e.g.:

> error: object 21ab162211ac3ef13c37603ca88b27e9c7e0d40b is a tree, not a commit
> fatal: no merge base found

Signed-off-by: Alyssa Ross <hi@alyssa.is>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-lib.c
t/t4068-diff-symmetric-merge-base.sh