projects/fisher
1
0
Fork 0
mirror of https://github.com/jorgebucaran/fisher synced 2024-06-28 23:01:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stash only for non-master branches.

Browse source
This commit is contained in:
Jorge Bucaran 2016-03-02 00:26:42 +09:00
parent 895faf9235
commit 328b6fc38a
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
functions/__fisher_path_update.fish
View file

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