@matheusbsbs / matheus-bagliano / commits / aac4fac168

get_sha1: don't die() on bogus search strings

The get_sha1() function generally returns an error code rather than dying, and we sometimes speculatively call it with something that may be a revision or a pathspec, in order to see which one it might be. If it sees a bogus ":/" search string, though, it complains, without giving the caller the opportunity to recover. We can demonstrate this in t6133 by looking for ":/*.t", which should mean "*.t at the root of the tree", but instead dies because of the invalid regex (the "*" has nothing to operate on). We can fix this by returning an error rather than calling die(). Unfortunately, the tradeoff is that the error message is slightly worse in cases where we _do_ know we have a rev. E.g., running "git log ':/*.t' --" before yielded: fatal: Invalid search pattern: *.t and now we get only: fatal: bad revision ':/*.t' There's not a simple way to fix this short of passing a "quiet" flag all the way through the get_sha1() stack. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 10, 2016 at 16:19 UTC aac4fac1689f7d1414523d2ac96f1c737ee53b71

2 files changed +12 -2

sha1_name.c

+2 -2

@@ -858,12 +858,12 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1,

858

859 if (prefix[0] == '!') {

860 if (prefix[1] != '!')

861 - die ("Invalid search pattern: %s", prefix);

861 + return -1;

862 prefix++;

863 }

864

865 if (regcomp(&regex, prefix, REG_EXTENDED))

866 - die("Invalid search pattern: %s", prefix);

866 + return -1;

867

868 for (l = list; l; l = l->next) {

869 l->item->object.flags |= ONELINE_SEEN;

t/t6133-pathspec-rev-dwim.sh

+10

@@ -35,4 +35,14 @@ test_expect_success '@{foo} with metacharacters dwims to rev' '

35 test_cmp expect actual

36 '

38 +test_expect_success ':/*.t from a subdir dwims to a pathspec' '

39 + mkdir subdir &&

40 + (

41 + cd subdir &&

42 + git log -- ":/*.t" >expect &&

43 + git log ":/*.t" >actual &&

44 + test_cmp expect actual

45 + )

46 +'

47 +

48 test_done