{"thread":{"id":"20184","subject":"[PATCH 2/2] Replace remaining git-* calls in git stash","startedAt":"2009-07-21T20:06:16Z","lastAt":"2009-07-23T05:13:40Z","messageCount":8,"participants":["Martin Koegler","Johannes Schindelin","Junio C Hamano","Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"118401","messageId":"1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at","threadId":"20184","inReplyTo":null,"subject":"[PATCH 1/2] Fix git stash apply","fromName":"Martin Koegler","fromEmail":"mkoegler@auto.tuwien.ac.at","sentAt":"2009-07-21T20:06:16Z","receivedAt":"2009-07-21T20:06:16Z","isPatch":true,"sender":{"key":"mkoegler@auto.tuwien.ac.at","avatar":null},"body":"Signed-off-by: Martin Koegler \n---\n git-stash.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 531c7c3..5b4b4e6 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -219,7 +219,7 @@ apply_stash () {\n \tthen\n \t\texport GIT_MERGE_VERBOSITY=0\n \tfi\n-\tif git-merge-recursive $b_tree -- $c_tree $w_tree\n+\tif git merge-recursive $b_tree -- $c_tree $w_tree\n \tthen\n \t\t# No conflict\n \t\tif test -n \"$unstashed_index_tree\"\n-- \n1.5.6.5\n"},{"id":"118400","messageId":"1248206777-6984-2-git-send-email-mkoegler@auto.tuwien.ac.at","threadId":"20184","inReplyTo":"1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at","subject":"[PATCH 2/2] Replace remaining git-* calls in git stash","fromName":"Martin Koegler","fromEmail":"mkoegler@auto.tuwien.ac.at","sentAt":"2009-07-21T20:06:17Z","receivedAt":"2009-07-21T20:06:17Z","isPatch":true,"sender":{"key":"mkoegler@auto.tuwien.ac.at","avatar":null},"body":"Signed-off-by: Martin Koegler \n---\n git-stash.sh | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 5b4b4e6..03e589f 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -203,7 +203,7 @@ apply_stash () {\n \t\tgit diff-tree --binary $s^2^..$s^2 | git apply --cached\n \t\ttest $? -ne 0 &&\n \t\t\tdie 'Conflicts in index. Try without --index.'\n-\t\tunstashed_index_tree=$(git-write-tree) ||\n+\t\tunstashed_index_tree=$(git write-tree) ||\n \t\t\tdie 'Could not save index tree'\n \t\tgit reset\n \tfi\n@@ -297,7 +297,7 @@ apply_to_branch () {\n \tfi\n \tstash=$2\n \n-\tgit-checkout -b $branch $stash^ &&\n+\tgit checkout -b $branch $stash^ &&\n \tapply_stash --index $stash &&\n \tdrop_stash $stash\n }\n-- \n1.5.6.5\n"},{"id":"118425","messageId":"alpine.DEB.1.00.0907212253440.3155@pacific.mpi-cbg.de","threadId":"20184","inReplyTo":"1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at","subject":"Re: [PATCH 1/2] Fix git stash apply","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-07-21T20:56:29Z","receivedAt":"2009-07-21T20:56:29Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 21 Jul 2009, Martin Koegler wrote:\n\n> Signed-off-by: Martin Koegler \n\nAs \"git stash\" is run through the Git wrapper, which appends the libexec \npath to PATH, this is no \"fix\".\n\nApart from that, it is a nice patch, though, except maybe your leaving \nonly white space between the commit subject and the sign-off: you could \nhave _said_ that this is converting a dashed command to a non-dashed one, \ninstead of sending everybody who is interested enough on a hunt where \nexactly those two lines differ (was not easy to spot, let me tell you \nthis).\n\nHth,\nDscho\n"},{"id":"118427","messageId":"7v1vo9ah5v.fsf@alter.siamese.dyndns.org","threadId":"20184","inReplyTo":"alpine.DEB.1.00.0907212253440.3155@pacific.mpi-cbg.de","subject":"Re: [PATCH 1/2] Fix git stash apply","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-07-21T20:57:00Z","receivedAt":"2009-07-21T20:57:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> On Tue, 21 Jul 2009, Martin Koegler wrote:\n>\n>> Signed-off-by: Martin Koegler \n>\n> As \"git stash\" is run through the Git wrapper, which appends the libexec \n> path to PATH, this is no \"fix\".\n>\n> Apart from that, it is a nice patch, though, except maybe your leaving \n> only white space between the commit subject and the sign-off: you could \n> have _said_ that this is converting a dashed command to a non-dashed one, \n> instead of sending everybody who is interested enough on a hunt where \n> exactly those two lines differ (was not easy to spot, let me tell you \n> this).\n\nThanks for a review. I think the two patches can be squashed into one and\nthe subject from the second one reflects what is being done more fairly.\nIt is modernizing the style of the codebase.\n"},{"id":"118426","messageId":"alpine.DEB.1.00.0907212256450.3155@pacific.mpi-cbg.de","threadId":"20184","inReplyTo":"1248206777-6984-2-git-send-email-mkoegler@auto.tuwien.ac.at","subject":"Re: [PATCH 2/2] Replace remaining git-* calls in git stash","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-07-21T20:57:37Z","receivedAt":"2009-07-21T20:57:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 21 Jul 2009, Martin Koegler wrote:\n\n> Signed-off-by: Martin Koegler \n\nHere, at least, the commit subject is helpful.\n\nAnd why exactly can't you squash 2/2 into 1/2 (keeping the commit subject \nof 2/2, more or less)? The changes are conceptually the same.\n\nCiao,\nDscho\n"},{"id":"118508","messageId":"20090723070810.6117@nanako3.lavabit.com","threadId":"20184","inReplyTo":"1248206777-6984-2-git-send-email-mkoegler@auto.tuwien.ac.at","subject":"Re: [PATCH 2/2] Replace remaining git-* calls in git stash","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-07-22T22:08:10Z","receivedAt":"2009-07-22T22:08:10Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Martin Koegler :\n\n> Signed-off-by: Martin Koegler \n> ---\n\nThank you. Even though 'git blame' says I am not responsible for these two (I AM responsible for the one in your other patch)...\n\nAcked-by: Nanako Shiraishi \n\n> git-stash.sh | 4 ++--\n> 1 files changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/git-stash.sh b/git-stash.sh\n> index 5b4b4e6..03e589f 100755\n> --- a/git-stash.sh\n> +++ b/git-stash.sh\n> @@ -203,7 +203,7 @@ apply_stash () {\n> \t\tgit diff-tree --binary $s^2^..$s^2 | git apply --cached\n> \t\ttest $? -ne 0 &&\n> \t\t\tdie 'Conflicts in index. Try without --index.'\n> -\t\tunstashed_index_tree=$(git-write-tree) ||\n> +\t\tunstashed_index_tree=$(git write-tree) ||\n> \t\t\tdie 'Could not save index tree'\n> \t\tgit reset\n> \tfi\n> @@ -297,7 +297,7 @@ apply_to_branch () {\n> \tfi\n> \tstash=$2\n> \n> -\tgit-checkout -b $branch $stash^ &&\n> +\tgit checkout -b $branch $stash^ &&\n> \tapply_stash --index $stash &&\n> \tdrop_stash $stash\n> }\n> -- \n> 1.5.6.5\n\n\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"118519","messageId":"7vtz14bb3e.fsf@alter.siamese.dyndns.org","threadId":"20184","inReplyTo":"20090723070810.6117@nanako3.lavabit.com","subject":"Re: [PATCH 2/2] Replace remaining git-* calls in git stash","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-07-22T22:35:01Z","receivedAt":"2009-07-22T22:35:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Quoting Martin Koegler :\n>\n>> Signed-off-by: Martin Koegler \n>> ---\n>\n> Thank you. Even though 'git blame' says I am not responsible for these two (I AM responsible for the one in your other patch)...\n>\n> Acked-by: Nanako Shiraishi \n\nThanks.\n"},{"id":"118549","messageId":"20090723051340.GA28934@auto.tuwien.ac.at","threadId":"20184","inReplyTo":"7vtz14bb3e.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 2/2] Replace remaining git-* calls in git stash","fromName":"Martin Koegler","fromEmail":"mkoegler@auto.tuwien.ac.at","sentAt":"2009-07-23T05:13:40Z","receivedAt":"2009-07-23T05:13:40Z","isPatch":true,"sender":{"key":"mkoegler@auto.tuwien.ac.at","avatar":null},"body":"On Wed, Jul 22, 2009 at 03:35:01PM -0700, Junio C Hamano wrote:\n> Nanako Shiraishi writes:\n> \n> > Quoting Martin Koegler :\n> >\n> >> Signed-off-by: Martin Koegler \n> >> ---\n> >\n> > Thank you. Even though 'git blame' says I am not responsible for these two (I AM responsible for the one in your other patch)...\n> >\n> > Acked-by: Nanako Shiraishi \n\nI got an error from the mailing list for my reworked patch, so I sent\nit again as attachment.\n\n\n\n>From 03fa7d2f6c558b22747f21a76c21adad522e0a5d Mon Sep 17 00:00:00 2001\nFrom: Martin Koegler \nDate: Tue, 21 Jul 2009 21:57:27 +0200\nSubject: [PATCH] git stash: replace git-XXX calls\nStatus: O\nContent-Length: 1056\nLines: 40\n\nReplace remaining git-XXX calls with git XXX.\n\nSigned-off-by: Martin Koegler \n---\n git-stash.sh | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 531c7c3..03e589f 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -203,7 +203,7 @@ apply_stash () {\n \t\tgit diff-tree --binary $s^2^..$s^2 | git apply --cached\n \t\ttest $? -ne 0 &&\n \t\t\tdie 'Conflicts in index. Try without --index.'\n-\t\tunstashed_index_tree=$(git-write-tree) ||\n+\t\tunstashed_index_tree=$(git write-tree) ||\n \t\t\tdie 'Could not save index tree'\n \t\tgit reset\n \tfi\n@@ -219,7 +219,7 @@ apply_stash () {\n \tthen\n \t\texport GIT_MERGE_VERBOSITY=0\n \tfi\n-\tif git-merge-recursive $b_tree -- $c_tree $w_tree\n+\tif git merge-recursive $b_tree -- $c_tree $w_tree\n \tthen\n \t\t# No conflict\n \t\tif test -n \"$unstashed_index_tree\"\n@@ -297,7 +297,7 @@ apply_to_branch () {\n \tfi\n \tstash=$2\n \n-\tgit-checkout -b $branch $stash^ &&\n+\tgit checkout -b $branch $stash^ &&\n \tapply_stash --index $stash &&\n \tdrop_stash $stash\n }\n-- \n1.5.6.5\n\n"}]}