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
8db6b249
Commit
8db6b249
authored
Oct 14, 2015
by
Derek Stavis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
omf.repo.pull: Simplify stashed flag using set -q
parent
c0060f50
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
pkg/omf/cli/omf.repo.pull.fish
pkg/omf/cli/omf.repo.pull.fish
+3
-3
No files found.
pkg/omf/cli/omf.repo.pull.fish
View file @
8db6b249
...
...
@@ -19,7 +19,7 @@ function omf.repo.pull
command git -C "$repo_dir" status --short --untracked-files
command git -C "$repo_dir" stash save --include-untracked --quiet
set stashed
true
set stashed
end
if test "$initial_branch" != master
...
...
@@ -31,14 +31,14 @@ 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 -C "$repo_dir" stash pop
set -q stashed
; and command git -C "$repo_dir" stash pop
end
if test "$initial_branch" != master
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" checkout $initial_branch --quiet
end
if
test "$stashed" = true
if
set -q stashed
command git -C "$repo_dir" stash pop --quiet
echo (omf::em)"Restored your changes:"(omf::off)
...
...
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