[PATCH 1/2] Fix git stash apply

[PATCH 1/2] Fix git stash apply

[Martin Koegler]

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
 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

[PATCH 2/2] Replace remaining git-* calls in git stash

[Martin Koegler]

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
 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

Re: [PATCH 1/2] Fix git stash apply

[Johannes Schindelin]

Hi,

On Tue, 21 Jul 2009, Martin Koegler wrote:

> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>

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

Re: [PATCH 1/2] Fix git stash apply

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Tue, 21 Jul 2009, Martin Koegler wrote:
>
>> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
>
> 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.

Re: [PATCH 2/2] Replace remaining git-* calls in git stash

[Johannes Schindelin]

Hi,

On Tue, 21 Jul 2009, Martin Koegler wrote:

> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>

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

Re: [PATCH 2/2] Replace remaining git-* calls in git stash

[Nanako Shiraishi]

Quoting Martin Koegler <mkoegler@auto.tuwien.ac.at>:

> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
> ---

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 <nanako3@lavabit.com>

>  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/

Re: [PATCH 2/2] Replace remaining git-* calls in git stash

[Junio C Hamano]

Nanako Shiraishi <nanako3@lavabit.com> writes:

> Quoting Martin Koegler <mkoegler@auto.tuwien.ac.at>:
>
>> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
>> ---
>
> 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 <nanako3@lavabit.com>

Thanks.

Re: [PATCH 2/2] Replace remaining git-* calls in git stash

[Martin Koegler]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

On Wed, Jul 22, 2009 at 03:35:01PM -0700, Junio C Hamano wrote:
> Nanako Shiraishi <nanako3@lavabit.com> writes:
> 
> > Quoting Martin Koegler <mkoegler@auto.tuwien.ac.at>:
> >
> >> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
> >> ---
> >
> > 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 <nanako3@lavabit.com>

I got an error from the mailing list for my reworked patch, so I sent
it again as attachment.


[-- Attachment #2: 0001-git-stash-replace-git-XXX-calls.patch --]
[-- Type: text/x-diff, Size: 1309 bytes --]

>From 03fa7d2f6c558b22747f21a76c21adad522e0a5d Mon Sep 17 00:00:00 2001
From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
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 <mkoegler@auto.tuwien.ac.at>
---
 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