t5601-clone: remove broken and pointless check for plink.exe
PATCH 1/1 t5601-clone: remove broken and pointless check for plink.exe
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Considering, that 'plink.exe' is irrelevant on non-Windows, let's just remove the test and assume that the code "just works".
--- t/t5601-clone.sh | 6 ------ 1 file changed, 6 deletions(-)
t/t5601-clone.sh +0 -6
@@ -353,12 +353,6 @@ test_expect_success 'plink is treated specially (as putty)' ' expect_ssh "-P 123" myhost src ' -test_expect_success 'plink.exe is treated specially (as putty)' ' - copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && - git clone "[myhost:123]:src" ssh-bracket-clone-plink-1 && - expect_ssh "-P 123" myhost src -' - test_expect_success 'tortoiseplink is like putty, with extra arguments' ' copy_ssh_wrapper_as "$TRASH_DIRECTORY/tortoiseplink" && git clone "[myhost:123]:src" ssh-bracket-clone-plink-2 &&
Signature · 21 lines
2.3.2.245.gb5bf9d3 -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Hi Johannes,
Quoted 8 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Oh how would I wish you were working on Git for Windows even *just* a bit *with* me. At least I would wish for a more specific description of the development environment, because it sure as hell is not anything anybody can download and install as easily as Git for Windows' SDK.
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Please read this as my vote not to remove the test cases.
Thanks,
Johannes
Quoted 12 lines · Johannes Schindelin
Hi Johannes,
Quoted 8 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Quoted 5 lines
Oh how would I wish you were working on Git for Windows even *just* a bit *with* me. At least I would wish for a more specific description of the development environment, because it sure as hell is not anything anybody can download and install as easily as Git for Windows' SDK.
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Yuck. On Windows, it's the extension of a file that dictates what kind of file it is (and if it's executable or not), not the contents. If we get a shell script written with the ".exe"-prefix, it's considered as an invalid executable by the system. We should consider it the same way, otherwise we're on the path to user-experience schizophrenia.
I'm not sure I consider this commit a step in the right direction.
Quoted 11 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Considering, that 'plink.exe' is irrelevant on non-Windows, let's just remove the test and assume that the code "just works".
putty and plink are used on Unix as well. A quick check of Mac OS X, Linux, and FreeBSD reveals that package managers on each platform have putty and plink packages available.
Quoted 24 lines
Signed-off-by Johannes Sixt <[email protected]>--- t/t5601-clone.sh | 6 ------ 1 file changed, 6 deletions(-)t/t5601-clone.sh +0
-7@@ -353,12 +353,6 @@ test_expect_success 'plink is treated specially (as putty)' ' expect_ssh "-P 123" myhost src ' -test_expect_success 'plink.exe is treated specially (as putty)' ' - copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && - git clone "[myhost:123]:src" ssh-bracket-clone-plink-1 && - expect_ssh "-P 123" myhost src -' - test_expect_success 'tortoiseplink is like putty, with extra arguments' ' copy_ssh_wrapper_as "$TRASH_DIRECTORY/tortoiseplink" && git clone "[myhost:123]:src" ssh-bracket-clone-plink-2 && --2.3.2.245.gb5bf9d3
Signature · 18 lines
-- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Quoted 10 lines · Eric Sunshine
Quoted 9 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Quoted 6 lines
Quoted 2 lines
Considering, that 'plink.exe' is irrelevant on non-Windows, let's just remove the test and assume that the code "just works".
putty and plink are used on Unix as well. A quick check of Mac OS X, Linux, and FreeBSD reveals that package managers on each platform have putty and plink packages available.
But they do not force their users to say "plink.exe", but instead let them invoke "plink", no?
The test before the one that was removed is about "plink" (sans .exe), and what was removed is with ".exe", so I think J6t's patch is OK.
Or am I still missing something?
Quoted 29 lines
Quoted 24 lines
Signed-off-by Johannes Sixt <[email protected]>--- t/t5601-clone.sh | 6 ------ 1 file changed, 6 deletions(-)t/t5601-clone.sh +0
-7@@ -353,12 +353,6 @@ test_expect_success 'plink is treated specially (as putty)' ' expect_ssh "-P 123" myhost src ' -test_expect_success 'plink.exe is treated specially (as putty)' ' - copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && - git clone "[myhost:123]:src" ssh-bracket-clone-plink-1 && - expect_ssh "-P 123" myhost src -' - test_expect_success 'tortoiseplink is like putty, with extra arguments' ' copy_ssh_wrapper_as "$TRASH_DIRECTORY/tortoiseplink" && git clone "[myhost:123]:src" ssh-bracket-clone-plink-2 && --Quoted 1 line
2.3.2.245.gb5bf9d3
--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 19 lines · Junio C Hamano
Quoted 10 lines · Eric Sunshine
Quoted 9 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Quoted 6 lines
Quoted 2 lines
Considering, that 'plink.exe' is irrelevant on non-Windows, let's just remove the test and assume that the code "just works".
putty and plink are used on Unix as well. A quick check of Mac OS X, Linux, and FreeBSD reveals that package managers on each platform have putty and plink packages available.
Quoted 5 lines
But they do not force their users to say "plink.exe", but instead let them invoke "plink", no?
The test before the one that was removed is about "plink" (sans .exe), and what was removed is with ".exe", so I think J6t's patch is OK.
Ah, you're correct. I overlooked the extra emphasis j6t's commit message placed on ".exe".
Signature · 18 lines
-- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Quoted 10 lines · Eric Sunshine
Quoted 9 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Quoted 6 lines
Quoted 2 lines
Considering, that 'plink.exe' is irrelevant on non-Windows, let's just remove the test and assume that the code "just works".
putty and plink are used on Unix as well. A quick check of Mac OS X, Linux, and FreeBSD reveals that package managers on each platform have putty and plink packages available.
... so we should do the same !MINGW prereq instead?
Quoted 29 lines
Quoted 24 lines
Signed-off-by Johannes Sixt <[email protected]>--- t/t5601-clone.sh | 6 ------ 1 file changed, 6 deletions(-)t/t5601-clone.sh +0
-7@@ -353,12 +353,6 @@ test_expect_success 'plink is treated specially (as putty)' ' expect_ssh "-P 123" myhost src ' -test_expect_success 'plink.exe is treated specially (as putty)' ' - copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && - git clone "[myhost:123]:src" ssh-bracket-clone-plink-1 && - expect_ssh "-P 123" myhost src -' - test_expect_success 'tortoiseplink is like putty, with extra arguments' ' copy_ssh_wrapper_as "$TRASH_DIRECTORY/tortoiseplink" && git clone "[myhost:123]:src" ssh-bracket-clone-plink-2 && --Quoted 1 line
2.3.2.245.gb5bf9d3
--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 18 lines
-- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund:
Quoted 8 lines
Quoted 5 lines · Johannes Schindelin
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Quoted 7 lines
Yuck. On Windows, it's the extension of a file that dictates what kind of file it is (and if it's executable or not), not the contents. If we get a shell script written with the ".exe"-prefix, it's considered as an invalid executable by the system. We should consider it the same way, otherwise we're on the path to user-experience schizophrenia.
I'm not sure I consider this commit a step in the right direction.
I, too, think that it is a wrong decision to pessimize git for the sake of a single test case.
-- Hannes
Hi Johannes,
Quoted 15 lines · Johannes Sixt
Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund:
Quoted 14 lines
Quoted 5 lines · Johannes Schindelin
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Yuck. On Windows, it's the extension of a file that dictates what kind of file it is (and if it's executable or not), not the contents. If we get a shell script written with the ".exe"-prefix, it's considered as an invalid executable by the system. We should consider it the same way, otherwise we're on the path to user-experience schizophrenia.
Quoted 4 lines
Quoted 1 line
I'm not sure I consider this commit a step in the right direction.
I, too, think that it is a wrong decision to pessimize git for the sake of a single test case.
Oh, you make it sound as if you believe that I had indeed weakened Git *just* for a single test case.
That is quite a strong assumption, and could not be further from the truth, though, I have to point out. It is important to keep in mind that we (actually, IIRC it was you) taught Git to recognize shell scripts when executing external programs *because Windows does not do that for us*. So yes, we are deviating from the standard Windows way of things, and we do that quite intentionally so.
Now, let's look at the test case for a moment and let's try to understand the technique it uses (that breaks the test case currently). It puts a script in place of an .exe, with the intention to execute the script instead of the original executable.
This technique is an age-old technique on Unix, and it just works. There are a range of valid reasons, from debugging to slightly modifying the function of a particular .exe (possibly renaming the original .exe and calling it from the script) in the easiest way: by scripting on top of it.
If we want to allow such a thing -- allowing users to use scripts to modify the behavior of executables -- then we *have* to allow .exe suffixes for scripts, because that happens to be the suffix of executables on Windows.
I guess you would have had an easier time to understand my thinking if I had replaced the sentence
So the assumption that the .exe extension implies that the file is *not* a shell script is now wrong.
by
So this is a strong indicator that it was wrong to assume that .exe extensions imply that the file is *not* a shell script.
Further, I even looked at the performance impact, but that is at least well documented in the commit message.
I also have to point out that the alternative "solution" presented by your patch -- to disable the test case -- is no solution at all: the very platform that is most likely to have plink users is Windows. And to *exclude* that platform from running that unit test is questionable at best.
Ciao,
Johannes
Signature · 18 lines
-- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Am 13.08.2015 um 09:30 schrieb Johannes Schindelin:
Quoted 18 lines
Hi Johannes,
Quoted 15 lines · Johannes Sixt
Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund:
Quoted 14 lines
Quoted 5 lines · Johannes Schindelin
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Yuck. On Windows, it's the extension of a file that dictates what kind of file it is (and if it's executable or not), not the contents. If we get a shell script written with the ".exe"-prefix, it's considered as an invalid executable by the system. We should consider it the same way, otherwise we're on the path to user-experience schizophrenia.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
I'm not sure I consider this commit a step in the right direction.
I, too, think that it is a wrong decision to pessimize git for the sake of a single test case.
Oh, you make it sound as if you believe that I had indeed weakened Git *just* for a single test case.
Whatever. Since I do not have the time to provide hard numbers that prove my claim that your patch removes an optimization (and, furthermore, I do not want to reply to your arguments that I consider mostly philosophical rather than pragmatic), I bow out. Until this solution or that one is in upstream, I can help myself.
Junio, please drop my patch. I do not have the nerves to support it.
-- Hannes
Hi kusma,
Quoted 13 lines · Erik Faye-Lund
Quoted 11 lines · Johannes Schindelin
Quoted 8 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Quoted 8 lines
Quoted 5 lines
Oh how would I wish you were working on Git for Windows even *just* a bit *with* me. At least I would wish for a more specific description of the development environment, because it sure as hell is not anything anybody can download and install as easily as Git for Windows' SDK.
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Yuck. On Windows, it's the extension of a file that dictates what kind of file it is (and if it's executable or not), not the contents.
Careful. If you continue along those lines, interactive rebase, git add -p and all those wonderful scripts Git has will have to stop working.
Because those scripts completely disagree with what you just said about Windows if you think about it: *none* of them has an extension.
I know that you do not mean this, of course, but that is the argument you were making... ;-)
Quoted 2 lines
If we get a shell script written with the ".exe"-prefix, it's considered as an invalid executable by the system.
And if we get a shell script without any .exe suffix, it is still considered as an invalid executable by the system. And even if we tack on an .sh suffix (which is *not* in line with the way Git works), it is *still* considered as an invalid executable by the system.
Ciao,
Dscho
Signature · 18 lines
-- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Quoted 22 lines · Johannes Schindelin
Hi kusma,
Quoted 19 lines · Erik Faye-Lund
Quoted 16 lines · Johannes Schindelin
Quoted 8 lines · Johannes Sixt
Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where support for plink.exe would be relevant, the test case fails because it is not possible to execute a file with a .exe extension that is actually not a binary executable---it is a shell script in our test. We have to disable the test case on Windows.
Oh how would I wish you were working on Git for Windows even *just* a bit *with* me. At least I would wish for a more specific description of the development environment, because it sure as hell is not anything anybody can download and install as easily as Git for Windows' SDK.
FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy with all those tickets) to solve the problem mentioned in your patch in a different way:
https://github.com/git-for-windows/git/commit/2fff4b54a0d4e5c5e2e4638c9b0739d3c1ff1e45
Quoted 9 lines
Quoted 2 lines
Yuck. On Windows, it's the extension of a file that dictates what kind of file it is (and if it's executable or not), not the contents.
Careful. If you continue along those lines, interactive rebase,
git add -pand all those wonderful scripts Git has will have to stop working.Because those scripts completely disagree with what you just said about Windows if you think about it: *none* of them has an extension.
I know that you do not mean this, of course, but that is the argument you were making... ;-)
You should know better than to straw-man like that.
I was not arguing to break any current functionality, but to not move further away from Windows' semantics.
But if I would have, there's nothing that would stop us from renaming those scrips to *.sh, and let the filename dictate how to execute them. Or provide batch-files to wrap them.
Quoted 4 lines
Quoted 2 lines
If we get a shell script written with the ".exe"-prefix, it's considered as an invalid executable by the system.
And if we get a shell script without any
.exesuffix, it is still considered as an invalid executable by the system.
Nope, it's considered an unknown file, not an executable at all.
Quoted 1 line
And even if we tack on an
.shsuffix (which is *not* in line with the way Git works), it is *still* considered as an invalid executable by the system.
That's not necessarily true; the Git for Windows installer (optionally, but on by default) registers /bin/sh as a file-handler for .sh files. Windows knows just fine how to execute them, unless the user opts out.
But again, I was not arguing to patch git to not parse the shebang.