Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
174e51cb
Commit
174e51cb
authored
Mar 04, 2013
by
Salvatore Sanfilippo
Browse files
Merge pull request #967 from 0x20h/fix-git-diff
suppress external diff program when using git diff.
parents
d7838604
977035b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/mkreleasehdr.sh
View file @
174e51cb
#!/bin/sh
#!/bin/sh
GIT_SHA1
=
`
(
git show-ref
--head
--hash
=
8 2> /dev/null
||
echo
00000000
)
|
head
-n1
`
GIT_SHA1
=
`
(
git show-ref
--head
--hash
=
8 2> /dev/null
||
echo
00000000
)
|
head
-n1
`
GIT_DIRTY
=
`
git diff 2> /dev/null |
wc
-l
`
GIT_DIRTY
=
`
git diff
--no-ext-diff
2> /dev/null |
wc
-l
`
BUILD_ID
=
`
uname
-n
`
"-"
`
date
+%s
`
BUILD_ID
=
`
uname
-n
`
"-"
`
date
+%s
`
test
-f
release.h
||
touch
release.h
test
-f
release.h
||
touch
release.h
(
cat
release.h |
grep
SHA1 |
grep
$GIT_SHA1
)
&&
\
(
cat
release.h |
grep
SHA1 |
grep
$GIT_SHA1
)
&&
\
...
...
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