mirror of
https://github.com/jorgebucaran/fisher
synced 2024-09-10 15:07:40 +02:00
Fix regression causing update to fail in some plugins.
This commit is contained in:
parent
ba126dbba2
commit
6989dc7c7f
1 changed files with 7 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue