{"thread":{"id":"26225","subject":"[PATCH] Mark gitk script executable","startedAt":"2011-01-07T01:14:41Z","lastAt":"2011-01-07T20:56:57Z","messageCount":7,"participants":["Anders Kaseorg","Junio C Hamano","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"159086","messageId":"alpine.DEB.2.02.1101061943140.6372@dr-wily.mit.edu","threadId":"26225","inReplyTo":null,"subject":"[PATCH] Mark gitk script executable","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2011-01-07T01:14:41Z","receivedAt":"2011-01-07T01:14:41Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"The executable bit on gitk-git/gitk was lost (accidentally it seems) by \ncommit 62ba5143ec2ab9d4083669b1b1679355e7639cd5. Put it back, so that \ngitk can be run directly from a git.git checkout.\n\nNote that the script is already executable in gitk.git, just not in \ngit.git.\n\nSigned-off-by: Anders Kaseorg \n---\n 0 files changed, 0 insertions(+), 0 deletions(-)\n mode change 100644 => 100755 gitk-git/gitk\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nold mode 100644\nnew mode 100755\n-- \n1.7.4-rc0\n"},{"id":"159089","messageId":"7vlj2x8mr4.fsf@alter.siamese.dyndns.org","threadId":"26225","inReplyTo":"alpine.DEB.2.02.1101061943140.6372@dr-wily.mit.edu","subject":"Re: [PATCH] Mark gitk script executable","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-07T02:34:55Z","receivedAt":"2011-01-07T02:34:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Anders Kaseorg writes:\n\n> The executable bit on gitk-git/gitk was lost (accidentally it seems) by \n> commit 62ba5143ec2ab9d4083669b1b1679355e7639cd5. Put it back, so that \n> gitk can be run directly from a git.git checkout.\n>\n> Note that the script is already executable in gitk.git, just not in \n> git.git.\n\nIt did not lose the bit by accident but 62ba5143 pretty much was a\ndeliberate fix. \"gitk\" is a source file, and its build product,\ngitk-wish, is what is eventually installed with executable bit on.\n"},{"id":"159092","messageId":"20110107030119.GA32290@burratino","threadId":"26225","inReplyTo":"7vlj2x8mr4.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Mark gitk script executable","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2011-01-07T03:01:19Z","receivedAt":"2011-01-07T03:01:19Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n> Anders Kaseorg writes:\n\n>> The executable bit on gitk-git/gitk was lost (accidentally it seems) by \n>> commit 62ba5143ec2ab9d4083669b1b1679355e7639cd5. Put it back, so that \n>> gitk can be run directly from a git.git checkout.\n>>\n>> Note that the script is already executable in gitk.git, just not in \n>> git.git.\n>\n> It did not lose the bit by accident but 62ba5143 pretty much was a\n> deliberate fix. \"gitk\" is a source file, and its build product,\n> gitk-wish, is what is eventually installed with executable bit on.\n\nHow does this case differ from other executable source files like\ngit-am.sh?\n"},{"id":"159141","messageId":"7v4o9k7brc.fsf@alter.siamese.dyndns.org","threadId":"26225","inReplyTo":"20110107030119.GA32290@burratino","subject":"Re: [PATCH] Mark gitk script executable","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-07T19:29:59Z","receivedAt":"2011-01-07T19:29:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Junio C Hamano wrote:\n>> Anders Kaseorg writes:\n>\n>>> The executable bit on gitk-git/gitk was lost (accidentally it seems) by \n>>> commit 62ba5143ec2ab9d4083669b1b1679355e7639cd5. Put it back, so that \n>>> gitk can be run directly from a git.git checkout.\n>>>\n>>> Note that the script is already executable in gitk.git, just not in \n>>> git.git.\n>>\n>> It did not lose the bit by accident but 62ba5143 pretty much was a\n>> deliberate fix. \"gitk\" is a source file, and its build product,\n>> gitk-wish, is what is eventually installed with executable bit on.\n>\n> How does this case differ from other executable source files like\n> git-am.sh?\n\nOk, strike that.\n\nIn the old days, some of us (but not me) used to value somewhat to be able\nto run git-$frotz.sh from the build directory before installing, and having\nthe executable bit was in line with that philosophy.\n\nI don't know if it still hold today, though. For one thing, our Makefile\nreplace a lot more than it used to when building $(SCRIPTS) out of the\nsource files and git-$frotz.sh may not run in place as easily as before\nanymore.\n\nSo it doesn't matter too much either way (and of course you can always say\n\"sh ./git-$frotz.sh\" when it is not executable and the functioning of the\nscript does not depend on replacement done by the Makefile).\n\nIt seems that the majority is marked with executable bit, so just for the\nsake of uniformity it probably is Ok to make it executable. From a\npurist's point of view, I'd rather see them uniformly marked as\nnon-executable, but as I said, it doesn't matter much to me (iow, meh).\n\nThe change needs to come from gitk repository, so I'll leave it up to Paul\n;-)\n\nThanks for a sanity, Jonathan.\n"},{"id":"159153","messageId":"alpine.DEB.2.02.1101071526180.31807@dr-wily.mit.edu","threadId":"26225","inReplyTo":"7v4o9k7brc.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Mark gitk script executable","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2011-01-07T20:35:04Z","receivedAt":"2011-01-07T20:35:04Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"On Fri, 7 Jan 2011, Junio C Hamano wrote:\n> The change needs to come from gitk repository, so I'll leave it up to Paul\n> ;-)\n\nNo, the script has always been executable in gitk.git. The patch should \nbe applied directly to git.git to bring the two repositories in sync.\n\nAnders\n"},{"id":"159155","messageId":"7vbp3s5tpl.fsf@alter.siamese.dyndns.org","threadId":"26225","inReplyTo":"alpine.DEB.2.02.1101071526180.31807@dr-wily.mit.edu","subject":"Re: [PATCH] Mark gitk script executable","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-07T20:45:10Z","receivedAt":"2011-01-07T20:45:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Anders Kaseorg writes:\n\n> On Fri, 7 Jan 2011, Junio C Hamano wrote:\n>> The change needs to come from gitk repository, so I'll leave it up to Paul\n>> ;-)\n>\n> No, the script has always been executable in gitk.git. The patch should \n> be applied directly to git.git to bring the two repositories in sync.\n\nIf that is the case perhaps the next pull will fix that ;-)\n"},{"id":"159158","messageId":"alpine.DEB.2.02.1101071548020.31807@dr-wily.mit.edu","threadId":"26225","inReplyTo":"7vbp3s5tpl.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Mark gitk script executable","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2011-01-07T20:56:57Z","receivedAt":"2011-01-07T20:56:57Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"On Fri, 7 Jan 2011, Junio C Hamano wrote:\n> If that is the case perhaps the next pull will fix that ;-)\n\nNope. There’s nothing to pull; the current gitk.git master was already \ntaken by the last pull. Even once there are commits to pull, the common \nancestor will be 6758ad94, in which the script is executable, so the \nscript will remain non-executable in the merge result. (And you can see \nfor yourself that the last 28 pulls since 62ba5143 haven’t added the \nexecutable bit.)\n\nThe point is that 62ba5143 introduced a change to git.git that wasn’t in \ngitk.git, and that change will remain in git.git until it’s undone in \ngit.git.\n\nAnders\n"}]}