mirror of
https://github.com/oh-my-fish/oh-my-fish
synced 2024-11-15 12:12:45 +00:00
64 lines
1.6 KiB
Fish
64 lines
1.6 KiB
Fish
function omf.repo.pull
|
|
|
|
if test (count $argv) -eq 0
|
|
echo (omf::err)"omf.repo.pull takes a repository path as an argument."(omf::off) 1>&2
|
|
return $OMF_MISSING_ARG
|
|
end
|
|
|
|
set -l repo_dir $argv[1]
|
|
|
|
function __omf.repo.git -V repo_dir
|
|
command git -C "$repo_dir" $argv
|
|
end
|
|
|
|
set -l remote origin
|
|
if test (__omf.repo.git config --get remote.upstream.url)
|
|
set remote upstream
|
|
end
|
|
|
|
set initial_branch (__omf.repo.git symbolic-ref -q --short HEAD);
|
|
or return 1
|
|
set initial_revision (__omf.repo.git rev-parse -q --verify HEAD);
|
|
or return 1
|
|
|
|
# the refspec ensures that '$remote/master' gets updated
|
|
set -l refspec "refs/heads/master:refs/remotes/$remote/master"
|
|
__omf.repo.git fetch --quiet $remote $refspec;
|
|
or return 1
|
|
|
|
if test (__omf.repo.git rev-list --count master...FETCH_HEAD) -eq 0
|
|
return 2
|
|
end
|
|
|
|
if not __omf.repo.git diff --quiet
|
|
echo (omf::em)"Stashing your changes:"(omf::off)
|
|
__omf.repo.git status --short --untracked-files
|
|
__omf.repo.git stash save --include-untracked --quiet;
|
|
and set stashed
|
|
end
|
|
|
|
if test "$initial_branch" != master
|
|
__omf.repo.git checkout master --quiet
|
|
end
|
|
|
|
if not __omf.repo.git merge --ff-only --quiet FETCH_HEAD
|
|
__omf.repo.git checkout $initial_branch
|
|
__omf.repo.git reset --hard $initial_revision
|
|
set -q stashed; and __omf.repo.git stash pop
|
|
return 1
|
|
end
|
|
|
|
if test "$initial_branch" != master
|
|
__omf.repo.git checkout $initial_branch --quiet
|
|
end
|
|
|
|
if set -q stashed
|
|
__omf.repo.git stash pop --quiet
|
|
|
|
echo (omf::em)"Restored your changes:"(omf::off)
|
|
__omf.repo.git status --short --untracked-files
|
|
end
|
|
|
|
return 0
|
|
end
|