mirror of
https://github.com/jorgebucaran/fisher
synced 2024-11-09 07:10:27 +00:00
Stash only for non-master branches.
This commit is contained in:
parent
6a8998c51f
commit
6b9969205e
@ -7,8 +7,10 @@ function __fisher_path_update -a path
|
||||
return 1
|
||||
end
|
||||
|
||||
git stash --quiet ^ /dev/null
|
||||
git checkout master --quiet ^ /dev/null
|
||||
if test "$branch" != master
|
||||
git stash --quiet ^ /dev/null
|
||||
git checkout master --quiet ^ /dev/null
|
||||
end
|
||||
|
||||
if not git pull --rebase origin master --quiet ^ /dev/null
|
||||
git rebase --abort --quiet
|
||||
@ -17,11 +19,10 @@ function __fisher_path_update -a path
|
||||
git clean -d --force --quiet
|
||||
end
|
||||
|
||||
if test ! -z "$branch"
|
||||
if test "$branch" != master
|
||||
git checkout "$branch" --quiet
|
||||
git stash apply --quiet ^ /dev/null
|
||||
end
|
||||
|
||||
git stash apply --quiet ^ /dev/null
|
||||
|
||||
popd
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user