diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-01 15:18:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-02 11:55:42 -0700 |
| commit | 4adceb5a299164aad1ef9794cdcbdb232ab10299 (patch) | |
| tree | 2f7f857cc9cea4778b6c7e5e4ee1dc0b87caa27b /diff-lib.c | |
| parent | 43c8a30d150ecede9709c1f2527c8fba92c65f40 (diff) | |
| download | git-4adceb5a299164aad1ef9794cdcbdb232ab10299.tar.gz | |
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>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index 6b0c6a7180..543398b4d8 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -572,8 +572,6 @@ void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb) struct object *obj = revs->pending.objects[i].item; if (obj->flags) die(_("--merge-base does not work with ranges")); - if (obj->type != OBJ_COMMIT) - die(_("--merge-base only works with commits")); } /* |