diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-09-05 10:40:39 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 12:25:22 -0700 |
| commit | 625c3304e200f9bdc05626be1397311faa4962ba (patch) | |
| tree | 1919e135d6040a280c7415a71b3e3c59f43e2f6e | |
| parent | bc341c8b61f7f55920798f809a296f3e4dd84e39 (diff) | |
| download | git-625c3304e200f9bdc05626be1397311faa4962ba.tar.gz | |
add: lift the pathspec magic restriction on "add -p"
Since 480ca64 (convert run_add_interactive to use struct pathspec -
2013-07-14), we have unconditionally passed :(prefix)xxx to
add-interactive.perl. It implies that all commands
add-interactive.perl calls must be aware of pathspec magic, or
:(prefix) is barfed. The restriction to :/ only becomes unnecessary.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/add.c | 8 | ||||
| -rw-r--r-- | builtin/checkout.c | 7 |
2 files changed, 1 insertions, 14 deletions
diff --git a/builtin/add.c b/builtin/add.c index 9d52fc7915..b4035f6468 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -270,13 +270,7 @@ int interactive_add(int argc, const char **argv, const char *prefix, int patch) { struct pathspec pathspec; - /* - * git-add--interactive itself does not parse pathspec. It - * simply passes the pathspec to other builtin commands. Let's - * hope all of them support all magic, or we'll need to limit - * the magic here. - */ - parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP, + parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_FULL | PATHSPEC_SYMLINK_LEADING_PATH | PATHSPEC_PREFIX_ORIGIN, diff --git a/builtin/checkout.c b/builtin/checkout.c index 7ea1100338..b235e04558 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1149,13 +1149,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) } if (argc) { - /* - * In patch mode (opts.patch_mode != 0), we pass the - * pathspec to an external program, git-add--interactive. - * Do not accept any kind of magic that that program - * cannot handle. Magic mask is pretty safe to be - * lifted for new magic when opts.patch_mode == 0. - */ parse_pathspec(&opts.pathspec, 0, opts.patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0, prefix, argv); |