diff options
| author | Paul Eggert | 2017-08-21 15:34:07 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-08-21 15:34:50 -0700 |
| commit | 891bc9822bdd9893ddf2d4fd65fd53a5da001beb (patch) | |
| tree | 32edbf675bde8ed4b92caf35f81fa477ad382e9e /build-aux/git-hooks/pre-commit | |
| parent | 80fccd4290ae134bd1b3d377f134bb9143b68b43 (diff) | |
| download | emacs-891bc9822bdd9893ddf2d4fd65fd53a5da001beb.tar.gz emacs-891bc9822bdd9893ddf2d4fd65fd53a5da001beb.zip | |
Port /bin/sh scripts to Solaris 10
Its /bin/sh builtin ‘test’ command does not support -e.
* autogen.sh, build-aux/git-hooks/pre-commit:
* build-aux/gitlog-to-emacslog, make-dist:
Use test -r, not test -e.
Diffstat (limited to 'build-aux/git-hooks/pre-commit')
| -rwxr-xr-x | build-aux/git-hooks/pre-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit index 548bf933f0c..0fa5837f602 100755 --- a/build-aux/git-hooks/pre-commit +++ b/build-aux/git-hooks/pre-commit | |||
| @@ -28,7 +28,7 @@ exec >&2 | |||
| 28 | # When doing a two-way merge, ignore problems that came from the other | 28 | # When doing a two-way merge, ignore problems that came from the other |
| 29 | # side of the merge. | 29 | # side of the merge. |
| 30 | head=HEAD | 30 | head=HEAD |
| 31 | if test -e "$GIT_DIR"/MERGE_HEAD; then | 31 | if test -r "$GIT_DIR"/MERGE_HEAD; then |
| 32 | merge_heads=`cat "$GIT_DIR"/MERGE_HEAD` || exit | 32 | merge_heads=`cat "$GIT_DIR"/MERGE_HEAD` || exit |
| 33 | for merge_head in $merge_heads; do | 33 | for merge_head in $merge_heads; do |
| 34 | case $head in | 34 | case $head in |