undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git stash: modernize use of "dashed" git-XXX calls

Browse Source 
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>
This commit is contained in:
Martin Koegler 2009-07-22 07:30:58 +02:00 committed by Junio C Hamano
parent f693b7e9a5
commit 5207079053
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-stash.sh
View File

@ -203,7 +203,7 @@ apply_stash () {
git diff-tree --binary $s^2^..$s^2 | git apply --cached git diff-tree --binary $s^2^..$s^2 | git apply --cached
test $? -ne 0 && test $? -ne 0 &&
die 'Conflicts in index. Try without --index.' 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' die 'Could not save index tree'
git reset git reset
fi fi
@ -219,7 +219,7 @@ apply_stash () {
then then
export GIT_MERGE_VERBOSITY=0 export GIT_MERGE_VERBOSITY=0
fi fi
if git-merge-recursive $b_tree -- $c_tree $w_tree if git merge-recursive $b_tree -- $c_tree $w_tree
then then
# No conflict # No conflict
if test -n "$unstashed_index_tree" if test -n "$unstashed_index_tree"
@ -297,7 +297,7 @@ apply_to_branch () {
fi fi
stash=$2 stash=$2
git-checkout -b $branch $stash^ && git checkout -b $branch $stash^ &&
apply_stash --index $stash && apply_stash --index $stash &&
drop_stash $stash drop_stash $stash
} }