[PATCH] bisect--helper: warn if we are assuming an unlikely pathspec
- From
Chris Down <chris@chrisdown.name>
- Date
- May 1, 2022, 12:29 UTC
- Message-ID
- <Ym59GmfWpCSV9Bqr@chrisdown.name>
Commit 73c6de06aff8 ("bisect: don't use invalid oid as rev when starting") changes the behaviour to consider invalid oids as pathspecs again, as in the old shell implementation.
While that behaviour may be desirable, it can also cause confusion. For example, while bisecting in a particular repo I encountered this:
$ git bisect start d93ff48803f0 v6.3
$...which led to me sitting for a few moments, wondering why there's no printout stating the first rev to check.
It turns out that the tag was actually "6.3", not "v6.3", and thus the bisect was still silently started with only a bad rev, because d93ff48803f0 was a valid oid and "v6.3" was silently considered to be a pathspec.
While this behaviour may be desirable, it can be confusing, especially with different repo conventions either using or not using "v" before release names, or when a branch name or tag is simply misspelled on the command line.
In order to avoid this, emit a warning when we are assuming an argument is a pathspec, but no such path exists in the checkout and this doesn't look like a pathspec according to looks_like_pathspec:
$ git bisect start d93ff48803f0 v6.3
warning: assuming 'v6.3' is a path
$If the filename is after the double dash, assume the user knows what they're doing, just like with other git commands.
Signed-off-by: Chris Down <chris@chrisdown.name> --- builtin/bisect--helper.c | 4 ++++ cache.h | 1 + setup.c | 2 +- t/t6030-bisect-porcelain.sh | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8b2b259ff0..30a73e2a7d 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -682,6 +682,10 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, const char **a die(_("'%s' does not appear to be a valid " "revision"), arg); } else { + if (!has_double_dash && + !looks_like_pathspec(arg) && + !check_filename(NULL, arg)) + warning(_("assuming '%s' is a path"), arg); break; } } diff --git a/cache.h b/cache.h index 6226f6a8a5..bae92859a3 100644 --- a/cache.h +++ b/cache.h @@ -648,6 +648,7 @@ void verify_filename(const char *prefix, int diagnose_misspelt_rev); void verify_non_filename(const char *prefix, const char *name); int path_inside_repo(const char *prefix, const char *path); +int looks_like_pathspec(const char *arg); #define INIT_DB_QUIET 0x0001 #define INIT_DB_EXIST_OK 0x0002 diff --git a/setup.c b/setup.c index a7b36f3ffb..bafbfb0d5e 100644 --- a/setup.c +++ b/setup.c @@ -208,7 +208,7 @@ static void NORETURN die_verify_filename(struct repository *r, * but which look sufficiently like pathspecs that we'll consider * them such for the purposes of rev/pathspec DWIM parsing. */ -static int looks_like_pathspec(const char *arg) +int looks_like_pathspec(const char *arg) { const char *p; int escaped = 0; diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 5382e5d216..2ea50f4ba4 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -1025,4 +1025,22 @@ test_expect_success 'bisect visualize with a filename with dash and space' ' git bisect visualize -p -- "-hello 2" ' +test_expect_success 'bisect warning on implicit enoent pathspec' ' + git bisect reset && + git bisect start "$HASH4" doesnotexist 2>output && + grep -F "assuming '\''doesnotexist'\'' is a path" output +' + +test_expect_success 'bisect fatal on implicit enoent pathspec with dash' ' + git bisect reset && + test_must_fail git bisect start "$HASH4" doesnotexist -- dne2 2>output && + grep -F "'\''doesnotexist'\'' does not appear to be a valid revision" output +' + +test_expect_success 'bisect no warning on explicit enoent pathspec' ' + git bisect reset && + git bisect start "$HASH4" -- doesnotexist 2>output && + [ -z "$(cat output)" ] +' + test_done
-- 2.36.0