diff options
| author | Luc Verhaegen <libv@skynet.be> | 2009-10-13 16:50:19 +0200 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2009-10-13 16:50:19 +0200 |
| commit | e03ed978d64538cb31c6a79dfa6c79090e96f18e (patch) | |
| tree | a00af36bba61fe5ec22ccd43a2a7f297059bb653 /git_version.sh | |
| parent | abc3e20196ef650245ec82e5d80c75819fb1708e (diff) | |
Git: fix up git related code.
"git-whatever", for some reason i still do not fully see, changed
to "git whatever"
Diffstat (limited to 'git_version.sh')
| -rwxr-xr-x | git_version.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/git_version.sh b/git_version.sh index f1901eb..32f7146 100755 --- a/git_version.sh +++ b/git_version.sh @@ -13,7 +13,7 @@ echo "#ifndef HAVE_GIT_VERSION_H" echo "#define HAVE_GIT_VERSION_H 1" echo "" -git_tools=`which git-whatchanged` +git_tools=`which git` if test "$git_tools" != ""; then if [ -e .git/index ]; then echo "/* This is a git repository */" @@ -21,13 +21,13 @@ if test "$git_tools" != ""; then echo "" # SHA-ID - git_shaid=`git-whatchanged | head -n1 | sed s/^commit\ //` + git_shaid=`git whatchanged | head -n1 | sed s/^commit\ //` echo "/* Git SHA ID of last commit */" echo "#define GIT_SHAID \"${git_shaid:0:8}..\"" echo "" - # Branch -- use git-status instead of git-branch - git_branch=`git-status | grep "# On branch" | sed s/#\ On\ branch\ //` + # Branch -- use git-status instead of git branch + git_branch=`git status | grep "# On branch" | sed s/#\ On\ branch\ //` if test "$git_branch" = ""; then git_branch="master" fi @@ -36,9 +36,9 @@ if test "$git_tools" != ""; then echo "" # Any uncommitted changes we should know about? - git_uncommitted=`git-status | grep "Changed but not updated"` + git_uncommitted=`git status | grep "Changed but not updated"` if test "$git_uncommitted" = ""; then - git_uncommitted=`git-status | grep "Updated but not checked in"` + git_uncommitted=`git status | grep "Updated but not checked in"` fi if test "$git_uncommitted" != ""; then @@ -59,4 +59,3 @@ fi echo "" echo "#endif /* HAVE_GIT_VERSION_H */" - |