git/t/t2105-update-index-gitfile.sh

#!/bin/sh
#
# Copyright (c) 2010 Brad King
#

test_description='git update-index for gitlink to .git file.
'

. ./test-lib.sh

test_expect_success 'submodule with absolute .git file' '
	mkdir sub1 &&
	(cd sub1 &&
	 git init &&
	 REAL="$(pwd)/.real" &&
	 mv .git "$REAL" &&
	 echo "gitdir: $REAL" >.git &&
	 test_commit first)
'

test_expect_success 'add gitlink to absolute .git file' '
	git update-index --add -- sub1
'

test_expect_success 'submodule with relative .git file' '
	mkdir sub2 &&
	(cd sub2 &&
	 git init &&
	 mv .git .real &&
	 echo "gitdir: .real" >.git &&
	 test_commit first)
'

test_expect_success 'add gitlink to relative .git file' '
	git update-index --add -- sub2
'

test_done
Test update-index for a gitlink to a .git file Check that update-index recognizes a submodule that uses a .git file. Currently it works when the .git file specifies an absolute path, but not when it specifies a relative path. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-01-09 03:36:40 +00:00			`#!/bin/sh`
			`#`
			`# Copyright (c) 2010 Brad King`
			`#`

			`test_description='git update-index for gitlink to .git file.`
			`'`

			`. ./test-lib.sh`

			`test_expect_success 'submodule with absolute .git file' '`
			`mkdir sub1 &&`
			`(cd sub1 &&`
			`git init &&`
			`REAL="$(pwd)/.real" &&`
t2105 (gitfile): add missing && Make sure early failures are not masked by later successes. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-09-07 01:49:10 +00:00			`mv .git "$REAL" &&`
Test update-index for a gitlink to a .git file Check that update-index recognizes a submodule that uses a .git file. Currently it works when the .git file specifies an absolute path, but not when it specifies a relative path. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-01-09 03:36:40 +00:00			`echo "gitdir: $REAL" >.git &&`
			`test_commit first)`
			`'`

			`test_expect_success 'add gitlink to absolute .git file' '`
			`git update-index --add -- sub1`
			`'`

			`test_expect_success 'submodule with relative .git file' '`
			`mkdir sub2 &&`
			`(cd sub2 &&`
			`git init &&`
			`mv .git .real &&`
			`echo "gitdir: .real" >.git &&`
			`test_commit first)`
			`'`

Handle relative paths in submodule .git files Commit 842abf0 (Teach resolve_gitlink_ref() about the .git file, 2008-02-20) taught resolve_gitlink_ref() to call read_gitfile_gently() to resolve .git files. In this commit teach read_gitfile_gently() to interpret a relative path in a .git file with respect to the file location. This change allows update-index to recognize a submodule that uses a relative path in its .git file. It previously failed because the relative path was wrongly interpreted with respect to the superproject directory. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-01-09 03:36:41 +00:00			`test_expect_success 'add gitlink to relative .git file' '`
Test update-index for a gitlink to a .git file Check that update-index recognizes a submodule that uses a .git file. Currently it works when the .git file specifies an absolute path, but not when it specifies a relative path. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2010-01-09 03:36:40 +00:00			`git update-index --add -- sub2`
			`'`

			`test_done`