github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-23 06:34:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #84 from oh-my-fish/stash-is-bad

Browse Source 
Stash does not support --git-dir
This commit is contained in:
Bruno 2015-10-02 21:34:12 +01:00
commit 2040eedc15
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,9 @@ function omf.repo.pull
if not command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" diff --quiet
echo (omf::em)"Stashing your changes:"(omf::off)
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" status --short --untracked-files
command git -C "$repo_dir" status --short --untracked-files
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" stash save --include-untracked --quiet
command git -C "$repo_dir" stash save --include-untracked --quiet
set stashed true
end
@ -31,7 +31,7 @@ function omf.repo.pull
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" reset --hard $initial_revision
test "$stashed" = true; and command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" stash pop
test "$stashed" = true; and command git -C "$repo_dir" stash pop
end
if test "$initial_branch" != master
@ -39,10 +39,10 @@ function omf.repo.pull
end
if test "$stashed" = true
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" stash pop --quiet
command git -C "$repo_dir" stash pop --quiet
echo (omf::em)"Restored your changes:"(omf::off)
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" status --short --untracked-files
command git -C "$repo_dir" status --short --untracked-files
end
return 0