github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2025-02-09 07:17:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

omf.repo.pull: Simplify stashed flag using set -q

Browse Source
This commit is contained in:
Derek Stavis 2015-10-14 02:24:41 -03:00
parent c0060f50be
commit 8db6b24966
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/omf/cli/omf.repo.pull.fish
View File

@ -19,7 +19,7 @@ function omf.repo.pull
command git -C "$repo_dir" status --short --untracked-files command git -C "$repo_dir" status --short --untracked-files
command git -C "$repo_dir" stash save --include-untracked --quiet command git -C "$repo_dir" stash save --include-untracked --quiet
set stashed true set stashed
end end
if test "$initial_branch" != master if test "$initial_branch" != master
@ -31,14 +31,14 @@ function omf.repo.pull
if test $status -eq 2 #SIGINT if test $status -eq 2 #SIGINT
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" checkout $initial_branch command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" checkout $initial_branch
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" reset --hard $initial_revision command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" reset --hard $initial_revision
test "$stashed" = true; and command git -C "$repo_dir" stash pop set -q stashed; and command git -C "$repo_dir" stash pop
end end
if test "$initial_branch" != master if test "$initial_branch" != master
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" checkout $initial_branch --quiet command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" checkout $initial_branch --quiet
end end
if test "$stashed" = true if set -q stashed
command git -C "$repo_dir" stash pop --quiet command git -C "$repo_dir" stash pop --quiet
echo (omf::em)"Restored your changes:"(omf::off) echo (omf::em)"Restored your changes:"(omf::off)