diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-15 00:57:35 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-15 00:57:35 +0000 |
commit | 1de930227b625def744d41b9e05abf429fc404c3 (patch) | |
tree | 08b34ccd4e1fe02633e38c1d7e1089c99415c94e /tools | |
parent | 216424a27ffd8ce5efe93d02ff29d13d3fe92d5d (diff) | |
download | rockbox-1de930227b625def744d41b9e05abf429fc404c3.tar.gz rockbox-1de930227b625def744d41b9e05abf429fc404c3.zip |
Attempt to make version.sh a little more resistant to producing spurious "modified" status on git repositories.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20933 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/version.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/version.sh b/tools/version.sh index 9f47afcfd2..332dbc1838 100755 --- a/tools/version.sh +++ b/tools/version.sh | |||
@@ -45,11 +45,10 @@ gitversion() { | |||
45 | # Is this a git-svn commit? | 45 | # Is this a git-svn commit? |
46 | if ! git log HEAD^.. --pretty=format:"%b" | grep -q "git-svn-id: svn" ; then | 46 | if ! git log HEAD^.. --pretty=format:"%b" | grep -q "git-svn-id: svn" ; then |
47 | mod="M" | 47 | mod="M" |
48 | fi | ||
49 | |||
50 | # Are there uncommitted changes? | 48 | # Are there uncommitted changes? |
51 | git update-index --refresh --unmerged > /dev/null | 49 | elif git diff --name-only HEAD | read dummy; then |
52 | if git diff-index --name-only HEAD | read dummy; then | 50 | mod="M" |
51 | elif git diff --name-only --cached HEAD | read dummy; then | ||
53 | mod="M" | 52 | mod="M" |
54 | fi | 53 | fi |
55 | 54 | ||