From f82a9e517fc063bb97063e4df2cdde2fd1f7ffbe Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 7 Oct 2020 00:56:17 -0700 Subject: add-patch: add NEEDSWORK about comparing commits The two versions of add-patch has special-casing for the literal revision "HEAD". However, we want to handle other ways of saying "HEAD" in the same way.[0] Add a NEEDSWORK to the add-patch code that does this so that it can be addressed later. [0]: https://lore.kernel.org/git/xmqqsgat7ttf.fsf@gitster.c.googlers.com/ Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- add-patch.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'add-patch.c') diff --git a/add-patch.c b/add-patch.c index f899389e2c..64ab7faa96 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1646,6 +1646,14 @@ int run_add_p(struct repository *r, enum add_p_mode mode, if (mode == ADD_P_STASH) s.mode = &patch_mode_stash; else if (mode == ADD_P_RESET) { + /* + * NEEDSWORK: Instead of comparing to the literal "HEAD", + * compare the commit objects instead so that other ways of + * saying the same thing (such as "@") are also handled + * appropriately. + * + * This applies to the cases below too. + */ if (!revision || !strcmp(revision, "HEAD")) s.mode = &patch_mode_reset_head; else -- cgit v1.2.3