From: Jeff King <peff@peff.net>
To: William Chargin <wchargin@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] sha1-name.c: for ":/", find detached HEAD commits
Date: Tue, 10 Jul 2018 13:54:47 -0400 [thread overview]
Message-ID: <20180710175447.GB25861@sigill.intra.peff.net> (raw)
In-Reply-To: <20180710154106.5356-1-wchargin@gmail.com>
On Tue, Jul 10, 2018 at 08:41:06AM -0700, William Chargin wrote:
> This patch broadens the set of commits matched by ":/" pathspecs to
> include commits reachable from HEAD but not any named ref. This avoids
> surprising behavior when working with a detached HEAD and trying to
> refer to a commit that was recently created and only exists within the
> detached state.
>
> Signed-off-by: William Chargin <wchargin@gmail.com>
> Based-on-patch-by: Jeff King <peff@peff.net>
Thanks, this looks perfect!
Just to be clear on licensing, I'll add my:
Signed-off-by: Jeff King <peff@peff.net>
> diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
> index 62f335b2d..41b9f3eba 100755
> --- a/t/t4208-log-magic-pathspec.sh
> +++ b/t/t4208-log-magic-pathspec.sh
> @@ -25,6 +25,20 @@ test_expect_success '"git log :/a -- " should not be ambiguous' '
> git log :/a --
> '
>
> +test_expect_success '"git log :/detached -- " should find a commit only in HEAD' '
> + test_when_finished "git checkout master" &&
> + git checkout --detach &&
> + test_tick &&
> + git commit --allow-empty -m detached &&
> + test_tick &&
> + git commit --allow-empty -m something-else &&
> + git log :/detached --
> +'
At first I wondered if you could just use test_commit here (instead of a
manual test_tick and commit). But we care about reachability only from
the detached HEAD here, so this must _not_ use test_commit, which
creates an extra tag.
It could be worth mentioning that in a comment (since somebody who later
refactors to make that change would not realize the problem, as it would
simply cause a broken test to return a false success). But...
> +test_expect_success '"git log :/detached -- " should not find an orphaned commit' '
> + test_must_fail git log :/detached --
> +'
This follow-up test _would_ notice such a breakage. Very nicely done.
-Peff
next prev parent reply other threads:[~2018-07-10 18:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 15:41 [PATCH] sha1-name.c: for ":/", find detached HEAD commits William Chargin
2018-07-10 17:54 ` Jeff King [this message]
2018-07-10 19:06 ` Junio C Hamano
2018-07-11 6:18 ` William Chargin
2018-07-11 12:32 ` Jeff King
2018-07-11 16:34 ` Junio C Hamano
2018-07-11 15:45 ` Duy Nguyen
2018-07-11 16:40 ` Jeff King
2018-07-11 17:20 ` Junio C Hamano
2018-07-11 17:37 ` Duy Nguyen
2018-07-11 17:49 ` William Chargin
2018-07-12 5:49 ` [PATCH v2] " William Chargin
2018-07-12 15:49 ` Jeff King
2018-07-12 16:04 ` Junio C Hamano
2018-07-12 16:14 ` William Chargin
2018-07-12 19:09 ` Junio C Hamano
2018-07-12 20:01 ` William Chargin
2018-07-13 19:24 ` Jeff King
2018-07-13 19:40 ` William Chargin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710175447.GB25861@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=wchargin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).