Archives/fisher
2
0
Fork 0
mirror of https://github.com/jorgebucaran/fisher synced 2024-11-03 15:40:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression causing update to fail in some plugins.

Browse Source
This commit is contained in:
Jorge Bucaran 2016-03-02 10:39:13 +09:00
parent 03baee2d24
commit aa8a98a966
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
functions/__fisher_path_update.fish
View File

@ -7,22 +7,21 @@ function __fisher_path_update -a path
return 1
end
if test "$branch" != master
git stash --quiet ^ /dev/null
git checkout master --quiet ^ /dev/null
end
git stash --quiet ^ /dev/null
git checkout master --quiet ^ /dev/null
if not git pull --rebase origin master --quiet ^ /dev/null
if not git pull --rebase origin master --quiet
git rebase --abort --quiet
git fetch origin master --quiet
git reset --hard FETCH_HEAD --quiet
git clean -d --force --quiet
end
end ^ /dev/null
if test "$branch" != master
if test ! -z "$branch"
git checkout "$branch" --quiet
git stash apply --quiet ^ /dev/null
end
git stash apply --quiet ^ /dev/null
popd
end