Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
975ee23a
Commit
975ee23a
authored
May 07, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show git status if it failed to be clean
This way it would be much easier to debug
parent
7032fc65
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
scripts/ee_specific_check/ee_specific_check.rb
scripts/ee_specific_check/ee_specific_check.rb
+10
-2
No files found.
scripts/ee_specific_check/ee_specific_check.rb
View file @
975ee23a
...
...
@@ -104,8 +104,12 @@ module EESpecificCheck
head_commit_sha
else
say
<<~
MESSAGE
💥
WE HAVE CONFLICTS
! This shouldn't happen. Please create an issue
💥
Git status not clean
! This shouldn't happen. Please create an issue
💥 and ping @godfat to investigate.
⚠️ Git status:
#{
status
}
MESSAGE
run_git_command
(
"rebase --abort"
)
...
...
@@ -122,8 +126,12 @@ module EESpecificCheck
run_git_command
(
"rev-parse HEAD"
)
end
def
status
run_git_command
(
"status --porcelain"
)
end
def
status_clean?
run_git_command
(
"status --porcelain"
)
==
''
status
==
''
end
def
remove_remotes
...
...
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