diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-13 14:18:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-13 14:18:28 -0700 |
| commit | 09dcbb486d964b59222136dd1668023098658eda (patch) | |
| tree | 55dcbe81f5b84e32861d8391a1ca08c64a264af5 /diff-lib.c | |
| parent | Merge branch 'js/submodule-fix-misuse-of-path-and-name' (diff) | |
| parent | diff: fix --merge-base with annotated tags (diff) | |
| download | git-09dcbb486d964b59222136dd1668023098658eda.tar.gz git-09dcbb486d964b59222136dd1668023098658eda.zip | |
Merge branch 'ar/diff-index-merge-base-fix'
"git diff --merge-base X other args..." insisted that X must be a
commit and errored out when given an annotated tag that peels to a
commit, but we only need it to be a committish. This has been
corrected.
* ar/diff-index-merge-base-fix:
diff: fix --merge-base with annotated tags
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 5848e4f9ca..0e9ec4f68a 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -571,8 +571,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")); } /* |