git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
040dfa01750cb9d2f05a914a6101c76d029f4125 blob 6169 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
 
#!/bin/sh

test_description='pre-commit and pre-merge-commit hooks'

. ./test-lib.sh

HOOKDIR="$(git rev-parse --git-dir)/hooks"
PRECOMMIT="$HOOKDIR/pre-commit"
PREMERGE="$HOOKDIR/pre-merge-commit"

# Prepare sample scripts that write their $0 to actual_hooks
test_expect_success 'sample script setup' '
	mkdir -p "$HOOKDIR" &&
	write_script "$HOOKDIR/success.sample" <<-\EOF &&
	echo $0 >>actual_hooks
	exit 0
	EOF
	write_script "$HOOKDIR/fail.sample" <<-\EOF &&
	echo $0 >>actual_hooks
	exit 1
	EOF
	write_script "$HOOKDIR/require-prefix.sample" <<-\EOF &&
	echo $0 >>actual_hooks
	test $GIT_PREFIX = "success/"
	EOF
	write_script "$HOOKDIR/check-author.sample" <<-\EOF
	echo $0 >>actual_hooks
	test "$GIT_AUTHOR_NAME" = "New Author" &&
	test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com"
	EOF
'

test_expect_success 'root commit' '
	echo "root" > file &&
	git add file &&
	git commit -m "zeroth" &&
	git checkout -b side &&
	echo "foo" > foo &&
	git add foo &&
	git commit -m "make it non-ff" &&
	git checkout master
'

test_expect_success 'with no hook' '
	test_when_finished "rm -f expected_hooks actual_hooks" &&
	touch expected_hooks actual_hooks &&
	echo "foo" >file &&
	git add file &&
	git commit -m "first" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with no hook (merge)' '
	test_when_finished "rm -f expected_hooks actual_hooks" &&
	touch expected_hooks actual_hooks &&
	git checkout side &&
	git merge -m "merge master" master &&
	git checkout master &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success '--no-verify with no hook' '
	test_when_finished "rm -f expected_hooks actual_hooks" &&
	touch expected_hooks actual_hooks &&
	echo "bar" >file &&
	git add file &&
	git commit --no-verify -m "bar" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with succeeding hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
	ln -s "success.sample" "$PRECOMMIT" &&
	touch actual_hooks &&
	echo "$PRECOMMIT" >expected_hooks &&
	echo "more" >>file &&
	git add file &&
	git commit -m "more" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with succeeding hook (merge)' '
	test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
	ln -s "success.sample" "$PREMERGE" &&
	touch actual_hooks &&
	echo "$PREMERGE" >expected_hooks &&
	git checkout side &&
	git merge -m "merge master" master &&
	git checkout master &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success '--no-verify with succeeding hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
	ln -s "success.sample" "$PRECOMMIT" &&
	touch expected_hooks actual_hooks &&
	echo "even more" >>file &&
	git add file &&
	git commit --no-verify -m "even more" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with failing hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
	ln -s "fail.sample" "$PRECOMMIT" &&
	touch actual_hooks &&
	echo "$PRECOMMIT" >expected_hooks &&
	echo "another" >>file &&
	git add file &&
	test_must_fail git commit -m "another" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success '--no-verify with failing hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
	ln -s "fail.sample" "$PRECOMMIT" &&
	touch expected_hooks actual_hooks &&
	echo "stuff" >>file &&
	git add file &&
	git commit --no-verify -m "stuff" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with failing hook (merge)' '
	test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" &&
	ln -s "fail.sample" "$PREMERGE" &&
	touch actual_hooks &&
	echo "$PREMERGE" >expected_hooks &&
	git checkout side &&
	test_must_fail git merge -m "merge master" master &&
	git checkout master &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success POSIXPERM 'with non-executable hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks; chmod +x \"$HOOKDIR/fail.sample\"" &&
	ln -s "fail.sample" "$PRECOMMIT" &&
	chmod -x "$HOOKDIR/fail.sample" &&
	touch expected_hooks actual_hooks &&
	echo "content" >>file &&
	git add file &&
	git commit -m "content" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success POSIXPERM '--no-verify with non-executable hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks; chmod +x \"$HOOKDIR/fail.sample\"" &&
	ln -s "fail.sample" "$PRECOMMIT" &&
	chmod -x "$HOOKDIR/fail.sample" &&
	touch expected_hooks actual_hooks &&
	echo "more content" >>file &&
	git add file &&
	git commit --no-verify -m "more content" &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with hook requiring GIT_PREFIX' '
	test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks success" &&
	ln -s "require-prefix.sample" "$PRECOMMIT" &&
	echo "$PRECOMMIT" >expected_hooks &&
	echo "more content" >>file &&
	git add file &&
	mkdir success &&
	(
		cd success &&
		git commit -m "hook requires GIT_PREFIX = success/"
	) &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'with failing hook requiring GIT_PREFIX' '
	test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks fail" &&
	ln -s "require-prefix.sample" "$PRECOMMIT" &&
	echo "$PRECOMMIT" >expected_hooks &&
	echo "more content" >>file &&
	git add file &&
	mkdir fail &&
	(
		cd fail &&
		test_must_fail git commit -m "hook must fail"
	) &&
	git checkout -- file &&
	test_cmp expected_hooks actual_hooks
'

test_expect_success 'check the author in hook' '
	test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" &&
	ln -s "check-author.sample" "$PRECOMMIT" &&
	cat >expected_hooks <<-EOF &&
	$PRECOMMIT
	$PRECOMMIT
	$PRECOMMIT
	EOF
	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
	(
		GIT_AUTHOR_NAME="New Author" &&
		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
		git commit --allow-empty -m "by new.author via env" &&
		git show -s
	) &&
	git commit --author="New Author <newauthor@example.com>" \
		--allow-empty -m "by new.author via command line" &&
	git show -s &&
	test_cmp expected_hooks actual_hooks
'

test_done
debug log:

solving 040dfa0175 ...
found 040dfa0175 in https://public-inbox.org/git/61b989ff16eadfd0508e10f71c9b318eb15ce2a7.1564695893.git.steadmon@google.com/
found 500bdd97c2 in https://public-inbox.org/git/f0476b2b1e1e1f1d528b94523e86f210ccbd7dab.1564695893.git.steadmon@google.com/
found 984889b39d in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 984889b39d3f8e9941a2aadc8cec833fe42176a2	t/t7503-pre-commit-hook.sh

applying [1/2] https://public-inbox.org/git/f0476b2b1e1e1f1d528b94523e86f210ccbd7dab.1564695893.git.steadmon@google.com/
diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh
index 984889b39d..500bdd97c2 100755


applying [2/2] https://public-inbox.org/git/61b989ff16eadfd0508e10f71c9b318eb15ce2a7.1564695893.git.steadmon@google.com/
diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
similarity index 78%
rename from t/t7503-pre-commit-hook.sh
rename to t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
index 500bdd97c2..040dfa0175 100755

Checking patch t/t7503-pre-commit-hook.sh...
Applied patch t/t7503-pre-commit-hook.sh cleanly.
Checking patch t/t7503-pre-commit-hook.sh => t/t7503-pre-commit-and-pre-merge-commit-hooks.sh...
Applied patch t/t7503-pre-commit-hook.sh => t/t7503-pre-commit-and-pre-merge-commit-hooks.sh cleanly.

index at:
100755 040dfa01750cb9d2f05a914a6101c76d029f4125	t/t7503-pre-commit-and-pre-merge-commit-hooks.sh

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git