diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-03-12 13:48:07 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-03-12 13:48:54 -0400 |
| commit | b9b01b6ed0849f770200fb6ae2a3ac0ca2166877 (patch) | |
| tree | 17780350bfeaaf0e07a3881b9bdedd0877702152 | |
| parent | de69ee14d3ed094cd2bc4df603a03675c28d1b5b (diff) | |
Call git tools using "git cmd" instead of "git-cmd" syntax
Recent git doesn't install the git-* commands in path.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | new-version.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index ec7a5d9..46dbb41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,7 @@ EXTRA_DIST += ChangeLog ChangeLog: if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git-log --stat) | fmt --split-only > $@.tmp \ + (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ diff --git a/new-version.sh b/new-version.sh index c771aeb..55e6886 100644 --- a/new-version.sh +++ b/new-version.sh @@ -1,6 +1,6 @@ #!/bin/sh -if git-status -a > /dev/null; then +if git status -a > /dev/null; then echo 'Uncommited changes in repository' 1>&2 exit 1 fi @@ -92,7 +92,7 @@ if [ $version != $last ]; then echo $version_note echo - git-log --pretty=short $last.. | git-shortlog | cat + git log --pretty=short $last.. | git shortlog | cat # # previous changelogs @@ -104,15 +104,15 @@ if [ $version != $last ]; then mv README.tmp README fi -$test git-commit -m"Bump version to $version" \ +$test git commit -m"Bump version to $version" \ configure.in \ fontconfig/fontconfig.h \ README # tag the tree -$test git-tag -u 096c4dd3 -m "Version $version" $version +$test git tag -u 096c4dd3 -m "Version $version" $version # Make distributed change log -git-log --stat $last.. > ChangeLog-$version +git log --stat $last.. > ChangeLog-$version |