Skip to main content

Browse the archive

Revision 3e8a00ae1d529e61f38f36fdb504902064cf1f5d authored by Benjamin Kramer on 27 April 2009, 13:59:49 UTC, committed by Junio C Hamano on 29 April 2009, 23:50:21 UTC 
daemon.c: fix segfault on OS X
 
On OS X (and maybe other unices), getaddrinfo(3) returns NULL
in the ai_canonname field if it's called with an IP address for
the hostname. We'll now use the IP address for the hostname if
ai_canonname was NULL, this also matches the behaviour on Linux.

steps to reproduce:
$ git daemon --export-all
$ git clone git://127.0.0.1/frotz
=> git daemon's fork (silently) segfaults.

Remove the pointless loop while at it. There is only one iteration
because of the break; on the last line and there are no continues.

Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 0c44c94
Raw File
t7606-merge-custom.sh 
#!/bin/sh

test_description='git merge

Testing a custom strategy.'

. ./test-lib.sh

cat >git-merge-theirs <<EOF
#!$SHELL_PATH
eval git read-tree --reset -u \\\$\$#
EOF
chmod +x git-merge-theirs
PATH=.:$PATH
export PATH

test_expect_success 'setup' '
	echo c0 >c0.c &&
	git add c0.c &&
	git commit -m c0 &&
	git tag c0 &&
	echo c1 >c1.c &&
	git add c1.c &&
	git commit -m c1 &&
	git tag c1 &&
	git reset --hard c0 &&
	echo c1c1 >c1.c &&
	echo c2 >c2.c &&
	git add c1.c c2.c &&
	git commit -m c2 &&
	git tag c2
'

test_expect_success 'merge c2 with a custom strategy' '
	git reset --hard c1 &&
	git merge -s theirs c2 &&
	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
	test "$(git rev-parse c2^{tree})" = "$(git rev-parse HEAD^{tree})" &&
	git diff --exit-code &&
	git diff --exit-code c2 HEAD &&
	git diff --exit-code c2 &&
	test -f c0.c &&
	grep c1c1 c1.c &&
	test -f c2.c
'

test_done
back to top