diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:50:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:50:44 -0700 |
| commit | fadf96abaa5f42c4bb7b4b5017926779c23d8ef3 (patch) | |
| tree | c2999c9aafd8071d01cabfd16d152cd20e437e11 /builtin/checkout.c | |
| parent | af226bf01e99043f5f3d8bc09ad302d17e0de757 (diff) | |
| parent | 625c3304e200f9bdc05626be1397311faa4962ba (diff) | |
| download | git-fadf96abaa5f42c4bb7b4b5017926779c23d8ef3.tar.gz | |
Merge branch 'nd/magic-pathspec'
Use "struct pathspec" interface in more places, instead of array of
characters, the latter of which cannot express magic pathspecs
(e.g. ":(icase)makefile" that matches both Makefile and makefile).
* nd/magic-pathspec:
add: lift the pathspec magic restriction on "add -p"
pathspec: catch prepending :(prefix) on pathspec with short magic
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 62a96a7e2f..0f57397037 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1146,13 +1146,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); |