Skip to content

Commit

Permalink
git stash: modernize use of "dashed" git-XXX calls
Browse files Browse the repository at this point in the history
Replace remaining git-XXX calls with git XXX.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Acked-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Martin Koegler authored and Junio C Hamano committed Jul 23, 2009
1 parent f693b7e commit 5207079
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions git-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 5207079

Please sign in to comment.