# [PATCH 2/2] Replace remaining git-* calls in git stash 8 messages from 2009-07-21 to 2009-07-23. Participants: Martin Koegler, Johannes Schindelin, Junio C Hamano, Nanako Shiraishi. Thread: https://gitlist.dev/t/20184 ## Martin Koegler, 2009-07-21 20:06 Subject: [PATCH 1/2] Fix git stash apply Message-ID: <1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at> URL: https://gitlist.dev/e/1248206777-6984-1-git-send-email-mkoegler%40auto.tuwien.ac.at ``` Signed-off-by: Martin Koegler --- git-stash.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 531c7c3..5b4b4e6 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -219,7 +219,7 @@ apply_stash () { then export GIT_MERGE_VERBOSITY=0 fi - if git-merge-recursive $b_tree -- $c_tree $w_tree + if git merge-recursive $b_tree -- $c_tree $w_tree then # No conflict if test -n "$unstashed_index_tree" -- 1.5.6.5 ``` ## Martin Koegler, 2009-07-21 20:06 Subject: [PATCH 2/2] Replace remaining git-* calls in git stash Message-ID: <1248206777-6984-2-git-send-email-mkoegler@auto.tuwien.ac.at> URL: https://gitlist.dev/e/1248206777-6984-2-git-send-email-mkoegler%40auto.tuwien.ac.at In-Reply-To: <1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at> ``` Signed-off-by: Martin Koegler --- git-stash.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 5b4b4e6..03e589f 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -203,7 +203,7 @@ apply_stash () { git diff-tree --binary $s^2^..$s^2 | git apply --cached test $? -ne 0 && die 'Conflicts in index. Try without --index.' - unstashed_index_tree=$(git-write-tree) || + unstashed_index_tree=$(git write-tree) || die 'Could not save index tree' git reset fi @@ -297,7 +297,7 @@ apply_to_branch () { fi stash=$2 - git-checkout -b $branch $stash^ && + git checkout -b $branch $stash^ && apply_stash --index $stash && drop_stash $stash } -- 1.5.6.5 ``` ## Johannes Schindelin, 2009-07-21 20:56 Subject: Re: [PATCH 1/2] Fix git stash apply Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0907212253440.3155%40pacific.mpi-cbg.de In-Reply-To: <1248206777-6984-1-git-send-email-mkoegler@auto.tuwien.ac.at> ``` Hi, On Tue, 21 Jul 2009, Martin Koegler wrote: > Signed-off-by: Martin Koegler As "git stash" is run through the Git wrapper, which appends the libexec path to PATH, this is no "fix". Apart from that, it is a nice patch, though, except maybe your leaving only white space between the commit subject and the sign-off: you could have _said_ that this is converting a dashed command to a non-dashed one, instead of sending everybody who is interested enough on a hunt where exactly those two lines differ (was not easy to spot, let me tell you this). Hth, Dscho ``` ## Junio C Hamano, 2009-07-21 20:57 Subject: Re: [PATCH 1/2] Fix git stash apply Message-ID: <7v1vo9ah5v.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v1vo9ah5v.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Johannes Schindelin writes: > On Tue, 21 Jul 2009, Martin Koegler wrote: > >> Signed-off-by: Martin Koegler > > As "git stash" is run through the Git wrapper, which appends the libexec > path to PATH, this is no "fix". > > Apart from that, it is a nice patch, though, except maybe your leaving > only white space between the commit subject and the sign-off: you could > have _said_ that this is converting a dashed command to a non-dashed one, > instead of sending everybody who is interested enough on a hunt where > exactly those two lines differ (was not easy to spot, let me tell you > this). Thanks for a review. I think the two patches can be squashed into one and the subject from the second one reflects what is being done more fairly. It is modernizing the style of the codebase. ``` ## Johannes Schindelin, 2009-07-21 20:57 Subject: Re: [PATCH 2/2] Replace remaining git-* calls in git stash Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0907212256450.3155%40pacific.mpi-cbg.de In-Reply-To: <1248206777-6984-2-git-send-email-mkoegler@auto.tuwien.ac.at> ``` Hi, On Tue, 21 Jul 2009, Martin Koegler wrote: > Signed-off-by: Martin Koegler Here, at least, the commit subject is helpful. And why exactly can't you squash 2/2 into 1/2 (keeping the commit subject of 2/2, more or less)? The changes are conceptually the same. Ciao, Dscho ``` ## Nanako Shiraishi, 2009-07-22 22:08 Subject: Re: [PATCH 2/2] Replace remaining git-* calls in git stash Message-ID: <20090723070810.6117@nanako3.lavabit.com> URL: https://gitlist.dev/e/20090723070810.6117%40nanako3.lavabit.com In-Reply-To: <1248206777-6984-2-git-send-email-mkoegler@auto.tuwien.ac.at> ``` Quoting Martin Koegler : > Signed-off-by: Martin Koegler > --- Thank you. Even though 'git blame' says I am not responsible for these two (I AM responsible for the one in your other patch)... Acked-by: Nanako Shiraishi > git-stash.sh | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/git-stash.sh b/git-stash.sh > index 5b4b4e6..03e589f 100755 > --- a/git-stash.sh > +++ b/git-stash.sh > @@ -203,7 +203,7 @@ apply_stash () { > git diff-tree --binary $s^2^..$s^2 | git apply --cached > test $? -ne 0 && > die 'Conflicts in index. Try without --index.' > - unstashed_index_tree=$(git-write-tree) || > + unstashed_index_tree=$(git write-tree) || > die 'Could not save index tree' > git reset > fi > @@ -297,7 +297,7 @@ apply_to_branch () { > fi > stash=$2 > > - git-checkout -b $branch $stash^ && > + git checkout -b $branch $stash^ && > apply_stash --index $stash && > drop_stash $stash > } > -- > 1.5.6.5 -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ``` ## Junio C Hamano, 2009-07-22 22:35 Subject: Re: [PATCH 2/2] Replace remaining git-* calls in git stash Message-ID: <7vtz14bb3e.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vtz14bb3e.fsf%40alter.siamese.dyndns.org In-Reply-To: <20090723070810.6117@nanako3.lavabit.com> ``` Nanako Shiraishi writes: > Quoting Martin Koegler : > >> Signed-off-by: Martin Koegler >> --- > > Thank you. Even though 'git blame' says I am not responsible for these two (I AM responsible for the one in your other patch)... > > Acked-by: Nanako Shiraishi Thanks. ``` ## Martin Koegler, 2009-07-23 05:13 Subject: Re: [PATCH 2/2] Replace remaining git-* calls in git stash Message-ID: <20090723051340.GA28934@auto.tuwien.ac.at> URL: https://gitlist.dev/e/20090723051340.GA28934%40auto.tuwien.ac.at In-Reply-To: <7vtz14bb3e.fsf@alter.siamese.dyndns.org> ``` On Wed, Jul 22, 2009 at 03:35:01PM -0700, Junio C Hamano wrote: > Nanako Shiraishi writes: > > > Quoting Martin Koegler : > > > >> Signed-off-by: Martin Koegler > >> --- > > > > Thank you. Even though 'git blame' says I am not responsible for these two (I AM responsible for the one in your other patch)... > > > > Acked-by: Nanako Shiraishi I got an error from the mailing list for my reworked patch, so I sent it again as attachment. >From 03fa7d2f6c558b22747f21a76c21adad522e0a5d Mon Sep 17 00:00:00 2001 From: Martin Koegler Date: Tue, 21 Jul 2009 21:57:27 +0200 Subject: [PATCH] git stash: replace git-XXX calls Status: O Content-Length: 1056 Lines: 40 Replace remaining git-XXX calls with git XXX. Signed-off-by: Martin Koegler --- git-stash.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 531c7c3..03e589f 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -203,7 +203,7 @@ apply_stash () { git diff-tree --binary $s^2^..$s^2 | git apply --cached test $? -ne 0 && die 'Conflicts in index. Try without --index.' - unstashed_index_tree=$(git-write-tree) || + unstashed_index_tree=$(git write-tree) || die 'Could not save index tree' git reset fi @@ -219,7 +219,7 @@ apply_stash () { then export GIT_MERGE_VERBOSITY=0 fi - if git-merge-recursive $b_tree -- $c_tree $w_tree + if git merge-recursive $b_tree -- $c_tree $w_tree then # No conflict if test -n "$unstashed_index_tree" @@ -297,7 +297,7 @@ apply_to_branch () { fi stash=$2 - git-checkout -b $branch $stash^ && + git checkout -b $branch $stash^ && apply_stash --index $stash && drop_stash $stash } -- 1.5.6.5 ```