From 19b9b0b220be08025d4db9a1c85e21637bf8fd95 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 10 Jun 2010 04:59:52 -0400 Subject: [PATCH 1/4] Makefile: default pager on AIX to "more" AIX doesn't ship with "less" by default, and their "more" is more featureful than average, so the latter is a more sensible choice. People who really want less can set the compile-time option themselves, or users can set $PAGER. Signed-off-by: Jeff King Tested-by: Tor Arntsen Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d5d6565c86..b0cecaabb2 100644 --- a/Makefile +++ b/Makefile @@ -898,6 +898,7 @@ ifeq ($(uname_S),NetBSD) HAVE_PATHS_H = YesPlease endif ifeq ($(uname_S),AIX) + DEFAULT_PAGER = more NO_STRCASESTR=YesPlease NO_MEMMEM = YesPlease NO_MKDTEMP = YesPlease From 7d82b06d2be1b872a1debf79fadf0585afc70b69 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 8 Jun 2010 13:34:12 +0200 Subject: [PATCH 2/4] merge-recursive: demonstrate an incorrect conflict with submodule When one side of a merge turns a directory into a submodule, and the other side does not touch that directory (but has other non-conflicting changes), then a merge should succeed. But currently, it does not; it rather fails with a file/directory conflict. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- t/t3030-merge-recursive.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 9929f82021..d541544537 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -22,6 +22,7 @@ test_expect_success 'setup 1' ' git branch df-2 && git branch df-3 && git branch remove && + git branch submod && echo hello >>a && cp a d/e && @@ -236,6 +237,17 @@ test_expect_success 'setup 6' ' test_cmp expected actual ' +test_expect_success 'setup 7' ' + + git checkout submod && + git rm d/e && + test_tick && + git commit -m "remove d/e" && + git update-index --add --cacheinfo 160000 $c1 d && + test_tick && + git commit -m "make d/ a submodule" +' + test_expect_success 'merge-recursive simple' ' rm -fr [abcd] && @@ -551,4 +563,21 @@ test_expect_success 'merge removes empty directories' ' test_must_fail test -d d ' +test_expect_failure 'merge-recursive simple w/submodule' ' + + git checkout submod && + git merge remove +' + +test_expect_failure 'merge-recursive simple w/submodule result' ' + + git ls-files -s >actual && + ( + echo "100644 $o5 0 a" + echo "100644 $o0 0 c" + echo "160000 $c1 0 d" + ) >expected && + test_cmp expected actual +' + test_done From f4c2eb8b34571e645336484d2b444261a535faea Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 10 Jun 2010 04:59:52 -0400 Subject: [PATCH 3/4] Makefile: default pager on AIX to "more" AIX doesn't ship with "less" by default, and their "more" is more featureful than average, so the latter is a more sensible choice. People who really want less can set the compile-time option themselves, or users can set $PAGER. Signed-off-by: Jeff King Tested-by: Tor Arntsen Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 61ad6688a3..ed4c733c62 100644 --- a/Makefile +++ b/Makefile @@ -886,6 +886,7 @@ ifeq ($(uname_S),NetBSD) NO_MKSTEMPS = YesPlease endif ifeq ($(uname_S),AIX) + DEFAULT_PAGER = more NO_STRCASESTR=YesPlease NO_MEMMEM = YesPlease NO_MKDTEMP = YesPlease From 0d4dbcd35e89a549055e34daf410e4579571b984 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Thu, 10 Jun 2010 20:24:46 +0200 Subject: [PATCH 4/4] t/README: document --root option We've had this option since f423ef5 (tests: allow user to specify trash directory location, 2009-08-09). Make it easier to look up :-) Signed-off-by: Thomas Rast Acked-by: Jeff King Signed-off-by: Junio C Hamano --- t/README | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/t/README b/t/README index dcd3ebb5f2..0e4e8d8862 100644 --- a/t/README +++ b/t/README @@ -84,6 +84,12 @@ appropriately before running "make". implied by other options like --valgrind and GIT_TEST_INSTALLED. +--root=:: + Create "trash" directories used to store all temporary data during + testing under , instead of the t/ directory. + Using this option with a RAM-based filesystem (such as tmpfs) + can massively speed up the test suite. + You can also set the GIT_TEST_INSTALLED environment variable to the bindir of an existing git installation to test that installation. You still need to have built this git sandbox, from which various