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
3adc42c1
Commit
3adc42c1
authored
Jul 09, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Print diff instead of status when conflicted
parent
d0a81caf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
scripts/ee_specific_check/ee_specific_check.rb
scripts/ee_specific_check/ee_specific_check.rb
+3
-2
No files found.
scripts/ee_specific_check/ee_specific_check.rb
View file @
3adc42c1
...
...
@@ -159,6 +159,7 @@ module EESpecificCheck
if
status
.
porcelain
==
''
status
.
head
else
diff
=
run_git_command
(
"diff"
)
run_git_command
(
"rebase --abort"
)
say
<<~
MESSAGE
...
...
@@ -182,9 +183,9 @@ module EESpecificCheck
💥 If you would like to help, or have any questions, please
💥 contact @godfat
⚠️ Git
status
:
⚠️ Git
diff
:
#{
status
.
porcelain
}
#{
diff
}
MESSAGE
exit
(
255
)
...
...
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