mirror of
https://github.com/jorgebucaran/fisher
synced 2024-10-09 09:36:53 +02:00
Fix regression causing update to fail in some plugins.
This commit is contained in:
parent
9be9b5bce0
commit
08811f3f8e
1 changed files with 7 additions and 8 deletions
|
@ -7,22 +7,21 @@ function __fisher_path_update -a path
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
if test "$branch" != master
|
git stash --quiet ^ /dev/null
|
||||||
git stash --quiet ^ /dev/null
|
git checkout master --quiet ^ /dev/null
|
||||||
git checkout master --quiet ^ /dev/null
|
|
||||||
end
|
|
||||||
|
|
||||||
if not git pull --rebase origin master --quiet ^ /dev/null
|
if not git pull --rebase origin master --quiet
|
||||||
git rebase --abort --quiet
|
git rebase --abort --quiet
|
||||||
git fetch origin master --quiet
|
git fetch origin master --quiet
|
||||||
git reset --hard FETCH_HEAD --quiet
|
git reset --hard FETCH_HEAD --quiet
|
||||||
git clean -d --force --quiet
|
git clean -d --force --quiet
|
||||||
|
end ^ /dev/null
|
||||||
|
|
||||||
|
if test ! -z "$branch"
|
||||||
|
git checkout "$branch" --quiet
|
||||||
end
|
end
|
||||||
|
|
||||||
if test "$branch" != master
|
git stash apply --quiet ^ /dev/null
|
||||||
git checkout "$branch" --quiet
|
|
||||||
git stash apply --quiet ^ /dev/null
|
|
||||||
end
|
|
||||||
|
|
||||||
popd
|
popd
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue