Re: [PATCH] Turn off pathspec magic on {checkout,reset,add} -p on native Windows builds
Am 9/1/2013 4:08, schrieb Nguyễn Thái Ngọc Duy: git-add--interactive.perl rejects arguments with colons in 21e9757 (Hack git-add--interactive to make it work with ActiveState Perl - 2007-08-01). Pathspec magic starts with a colon, so it won't work if these pathspecs are passed to git-add--interactive.perl running with ActiveState Perl. Make sure we only pass plain paths in this case. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Johannes, can you check the test suite passes for you with this patch? I assume that Cygwin Perl behaves differently and does not hit this limit. So I keep the special case to GIT_WINDOWS_NATIVE only. I'll resend the patch with a few others on the same topic if it works for you. It does not help. The error in git-add--interactive is avoided, but the failure in t2016-checkout-patch.sh is now: expecting success: set_state dir/foo work head # the third n is to get out in case it mistakenly does not apply (echo y; echo n; echo n) | (cd dir git checkout -p foo) verify_saved_state bar verify_state dir/foo head head No changes. not ok 13 - path limiting works: foo inside dir and the same No changes. happens in t7105-reset-patch.sh +#ifdef GIT_WINDOWS_NATIVE + /* + * Pathspec magic is completely turned off on native Windows + * builds because git-add-interactive.perl won't accept + * arguments with colons in them. :/foo is an exception + * because no colons remain after parsing. + */ + parse_pathspec(pathspec, PATHSPEC_ALL_MAGIC ~PATHSPEC_FROMTOP, +PATHSPEC_PREFER_FULL | +PATHSPEC_SYMLINK_LEADING_PATH, +prefix, argv); +#else /* * git-add--interactive itself does not parse pathspec. It * simply passes the pathspec to other builtin commands. Let's @@ -281,6 +293,7 @@ int interactive_add(int argc, const char **argv, const char *prefix, int patch) PATHSPEC_SYMLINK_LEADING_PATH | PATHSPEC_PREFIX_ORIGIN, prefix, argv); +#endif [etc.] -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Turn off pathspec magic on {checkout,reset,add} -p on native Windows builds
On Mon, Sep 02, 2013 at 08:42:18AM +0200, Johannes Sixt wrote: Am 9/1/2013 4:08, schrieb Nguyễn Thái Ngọc Duy: git-add--interactive.perl rejects arguments with colons in 21e9757 (Hack git-add--interactive to make it work with ActiveState Perl - 2007-08-01). Pathspec magic starts with a colon, so it won't work if these pathspecs are passed to git-add--interactive.perl running with ActiveState Perl. Make sure we only pass plain paths in this case. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Johannes, can you check the test suite passes for you with this patch? I assume that Cygwin Perl behaves differently and does not hit this limit. So I keep the special case to GIT_WINDOWS_NATIVE only. I'll resend the patch with a few others on the same topic if it works for you. It does not help. The error in git-add--interactive is avoided, but the failure in t2016-checkout-patch.sh is now: expecting success: set_state dir/foo work head # the third n is to get out in case it mistakenly does not apply (echo y; echo n; echo n) | (cd dir git checkout -p foo) verify_saved_state bar verify_state dir/foo head head No changes. not ok 13 - path limiting works: foo inside dir and the same No changes. happens in t7105-reset-patch.sh Right. Because I got rid of ':(prefix)foo' form but I passed 'foo' instead of 'dir/foo'. How about this on top? -- 8 -- diff --git a/builtin/add.c b/builtin/add.c index 3402239..a138360 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -257,9 +257,15 @@ int run_add_interactive(const char *revision, const char *patch_mode, if (revision) args[ac++] = revision; args[ac++] = --; +#ifdef GIT_WINDOWS_NATIVE + GUARD_PATHSPEC(pathspec, PATHSPEC_FROMTOP); + for (i = 0; i pathspec-nr; i++) + args[ac++] = pathspec-items[i].match; +#else for (i = 0; i pathspec-nr; i++) /* pass original pathspec, to be re-parsed */ args[ac++] = pathspec-items[i].original; +#endif status = run_command_v_opt(args, RUN_GIT_CMD); free(args); -- 8 -- -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Turn off pathspec magic on {checkout,reset,add} -p on native Windows builds
Am 9/2/2013 11:30, schrieb Duy Nguyen: On Mon, Sep 02, 2013 at 08:42:18AM +0200, Johannes Sixt wrote: Am 9/1/2013 4:08, schrieb Nguyễn Thái Ngọc Duy: git-add--interactive.perl rejects arguments with colons in 21e9757 (Hack git-add--interactive to make it work with ActiveState Perl - 2007-08-01). Pathspec magic starts with a colon, so it won't work if these pathspecs are passed to git-add--interactive.perl running with ActiveState Perl. Make sure we only pass plain paths in this case. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Johannes, can you check the test suite passes for you with this patch? I assume that Cygwin Perl behaves differently and does not hit this limit. So I keep the special case to GIT_WINDOWS_NATIVE only. I'll resend the patch with a few others on the same topic if it works for you. It does not help. The error in git-add--interactive is avoided, but the failure in t2016-checkout-patch.sh is now: expecting success: set_state dir/foo work head # the third n is to get out in case it mistakenly does not apply (echo y; echo n; echo n) | (cd dir git checkout -p foo) verify_saved_state bar verify_state dir/foo head head No changes. not ok 13 - path limiting works: foo inside dir and the same No changes. happens in t7105-reset-patch.sh Right. Because I got rid of ':(prefix)foo' form but I passed 'foo' instead of 'dir/foo'. How about this on top? -- 8 -- diff --git a/builtin/add.c b/builtin/add.c index 3402239..a138360 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -257,9 +257,15 @@ int run_add_interactive(const char *revision, const char *patch_mode, if (revision) args[ac++] = revision; args[ac++] = --; +#ifdef GIT_WINDOWS_NATIVE + GUARD_PATHSPEC(pathspec, PATHSPEC_FROMTOP); + for (i = 0; i pathspec-nr; i++) + args[ac++] = pathspec-items[i].match; +#else for (i = 0; i pathspec-nr; i++) /* pass original pathspec, to be re-parsed */ args[ac++] = pathspec-items[i].original; +#endif status = run_command_v_opt(args, RUN_GIT_CMD); free(args); -- 8 -- With this patch, the two tests pass. Which features do we lose on Windows with the previous patch and this fixup? -- Hannes -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Turn off pathspec magic on {checkout,reset,add} -p on native Windows builds
On Mon, Sep 2, 2013 at 5:41 PM, Johannes Sixt j.s...@viscovery.net wrote: Which features do we lose on Windows with the previous patch and this fixup? New pathspec magic :(glob), :(literal) and :(icase). You can still use them via --*-pathspecs or equivalent env variables. You just can't enable them per individual pathspec. -- Duy -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] Turn off pathspec magic on {checkout,reset,add} -p on native Windows builds
git-add--interactive.perl rejects arguments with colons in 21e9757
(Hack git-add--interactive to make it work with ActiveState Perl -
2007-08-01). Pathspec magic starts with a colon, so it won't work if
these pathspecs are passed to git-add--interactive.perl running with
ActiveState Perl. Make sure we only pass plain paths in this case.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Johannes, can you check the test suite passes for you with this
patch? I assume that Cygwin Perl behaves differently and does not hit
this limit. So I keep the special case to GIT_WINDOWS_NATIVE only.
I'll resend the patch with a few others on the same topic if it works
for you.
builtin/add.c | 13 +
builtin/checkout.c | 23 ---
builtin/reset.c| 24
3 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 9d52fc7..3402239 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -270,6 +270,18 @@ int interactive_add(int argc, const char **argv, const
char *prefix, int patch)
{
struct pathspec pathspec;
+#ifdef GIT_WINDOWS_NATIVE
+ /*
+* Pathspec magic is completely turned off on native Windows
+* builds because git-add-interactive.perl won't accept
+* arguments with colons in them. :/foo is an exception
+* because no colons remain after parsing.
+*/
+ parse_pathspec(pathspec, PATHSPEC_ALL_MAGIC ~PATHSPEC_FROMTOP,
+ PATHSPEC_PREFER_FULL |
+ PATHSPEC_SYMLINK_LEADING_PATH,
+ prefix, argv);
+#else
/*
* git-add--interactive itself does not parse pathspec. It
* simply passes the pathspec to other builtin commands. Let's
@@ -281,6 +293,7 @@ int interactive_add(int argc, const char **argv, const char
*prefix, int patch)
PATHSPEC_SYMLINK_LEADING_PATH |
PATHSPEC_PREFIX_ORIGIN,
prefix, argv);
+#endif
return run_add_interactive(NULL,
patch ? --patch : NULL,
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 7ea1100..e12330f 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1156,9 +1156,26 @@ int cmd_checkout(int argc, const char **argv, const char
*prefix)
* 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);
+ if (opts.patch_mode) {
+#ifdef GIT_WINDOWS_NATIVE
+ /*
+* Pathspec magic is completely turned off on
+* native Windows builds because
+* git-add-interactive.perl won't accept
+* arguments with colons in them. :/foo is an
+* exception because no colons remain after
+* parsing.
+*/
+ parse_pathspec(opts.pathspec,
+ PATHSPEC_ALL_MAGIC ~PATHSPEC_FROMTOP,
+ 0, prefix, argv);
+#else
+ parse_pathspec(opts.pathspec, 0,
+ PATHSPEC_PREFIX_ORIGIN,
+ prefix, argv);
+#endif
+ } else
+ parse_pathspec(opts.pathspec, 0, 0, prefix, argv);
if (!opts.pathspec.nr)
die(_(invalid path specification));
diff --git a/builtin/reset.c b/builtin/reset.c
index 86150d1..65f7390 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -220,10 +220,26 @@ static void parse_args(struct pathspec *pathspec,
}
}
*rev_ret = rev;
- parse_pathspec(pathspec, 0,
- PATHSPEC_PREFER_FULL |
- (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
- prefix, argv);
+ if (patch_mode) {
+#ifdef GIT_WINDOWS_NATIVE
+ /*
+* Pathspec magic is completely turned off on native
+* Windows builds because git-add-interactive.perl
+* won't accept arguments with colons in them. :/foo
+* is an exception because no colons remain after
+* parsing.
+*/
+ parse_pathspec(pathspec,
+ PATHSPEC_ALL_MAGIC ~PATHSPEC_FROMTOP,
+ PATHSPEC_PREFER_FULL, prefix, argv);
+#else
+ parse_pathspec(pathspec, 0,
+ PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
+ prefix, argv);
+#endif
+ } else
+ parse_pathspec(pathspec, 0,
