Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
O
oh-my-fish
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
oh-my-fish
Commits
2040eedc
Commit
2040eedc
authored
Oct 02, 2015
by
Bruno
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #84 from oh-my-fish/stash-is-bad
Stash does not support --git-dir
parents
f0ea67b8
9cc8ee5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
pkg/omf/cli/omf.repo.pull.fish
pkg/omf/cli/omf.repo.pull.fish
+5
-5
No files found.
pkg/omf/cli/omf.repo.pull.fish
View file @
2040eedc
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment