@matheusbsbs / matheus-bagliano / commits / 84d938b732

add: do not accept pathspec magic 'attr'

Commit b0db704652 (pathspec: allow querying for attributes - 2017-03-13) adds new pathspec magic 'attr' but only with match_pathspec(). "git add" has some pathspec related code that still does not know about 'attr' and will bail out: $ git add ':(attr:foo)' fatal: BUG:dir.c:1584: unsupported magic 40 A better solution would be making this code support 'attr'. But I don't know how much work is needed (I'm not familiar with this new magic). For now, let's simply reject this magic with a friendlier message: $ git add ':(attr:foo)' fatal: :(attr:foo): pathspec magic not supported by this command: 'attr' Update t6135 so that the expected error message is from the "graceful" rejection codepath, not "oops, we were supposed to reject the request to trigger this magic" codepath. Reported-by: smaudet@sebastianaudet.com Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Sep 18, 2018 at 19:31 UTC 84d938b732242e81ec68647994070eb7c34d061f

2 files changed +2 -2

builtin/add.c

+1 -1

@@ -433,7 +433,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)

433 * Check the "pathspec '%s' did not match any files" block

434 * below before enabling new magic.

435 */

436 - parse_pathspec(&pathspec, 0,

436 + parse_pathspec(&pathspec, PATHSPEC_ATTR,

437 PATHSPEC_PREFER_FULL |

438 PATHSPEC_SYMLINK_LEADING_PATH,

439 prefix, argv);

t/t6135-pathspec-with-attrs.sh

+1 -1

@@ -166,7 +166,7 @@ test_expect_success 'fail if attr magic is used places not implemented' '

166 # though, but git-add is convenient as it has its own internal pathspec

167 # parsing.

168 test_must_fail git add ":(attr:labelB)" 2>actual &&

169 - test_i18ngrep "unsupported magic" actual

169 + test_i18ngrep "magic not supported" actual

170 '

171

172 test_expect_success 'abort on giving invalid label on the command line' '