diff options
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 |