{"thread":{"id":"7737","subject":"[PATCH] Remove case-sensitive file in t3030-merge-recursive.","startedAt":"2007-04-19T04:51:06Z","lastAt":"2007-04-19T04:51:06Z","messageCount":1,"participants":["Brian Gernhardt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"39862","messageId":"20070419045106.GA17430@Hermes.local","threadId":"7737","inReplyTo":null,"subject":"[PATCH] Remove case-sensitive file in t3030-merge-recursive.","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2007-04-19T04:51:06Z","receivedAt":"2007-04-19T04:51:06Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"Rename \"A\" to the unused \"c\"\n\nSigned-off-by: Brian Gernhardt <benji@silverinsanity.com>\n---\n\nI know, I know, OS X's default settings for the filesystem are broken.\nBut they are what they are.  And it's not really that hard to use\nsomething other than \"a\" and \"A\"...\n\nThis patch allows it to pass everything except 15 and 16 on my system.\nThose appear to be unrelated to the case issue.  But I don't know if\nit's actual breakage in merge-recursive or a glitch with the test.\n\n> * expecting success: \n> \n> \trm -fr [abcd] &&\n> \tgit reset --hard &&\n> \tgit checkout -f \"$c4\" &&\n> \n> \tgit-merge-recursive \"$c0\" -- \"$c4\" \"$c1\"\n> \tstatus=$?\n> \tcase \"$status\" in\n> \t1)\n> \t\t: happy\n> \t\t;;\n> \t*)\n> \t\techo >&2 \"why status $status!!!\"\n> \t\tfalse\n> \t\t;;\n> \tesac\n> \n> HEAD is now at b7f3e7f... master modifies a and d/e\n> HEAD is now at 833bf24... df-2 makes a/c\n> fatal: failed to unlink a in preparation to update: Operation not permitted\n> Merging 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 with b7f3e7f677ef7001dcb4b810583c9259a210141d\n> Merging:\n> 833bf24 df-2 makes a/c\n> b7f3e7f master modifies a and d/e\n> found 1 common ancestor(s):\n> 88eeecf initial\n> CONFLICT (delete/modify): a deleted in 833bf240c9e2636a0e5eb3dd8f735d2a92181f22 and modified in b7f3e7f677ef7001dcb4b810583c9259a210141d. Version b7f3e7f677ef7001dcb4b810583c9259a210141d of a left in tree.\n> why status 128!!!\n> * FAIL 15: merge-recursive d/f conflict the other way\n> \n> * expecting success: \n> \n> \tgit ls-files -s >actual &&\n> \t(\n> \t\techo \"100644 $o0 1\ta\"\n> \t\techo \"100644 $o1 3\ta\"\n> \t\techo \"100644 $o4 0\ta/c\"\n> \t\techo \"100644 $o0 0\tb\"\n> \t\techo \"100644 $o0 0\tc\"\n> \t\techo \"100644 $o1 0\td/e\"\n> \t) >expected &&\n> \tgit diff -u expected actual\n> \n> \n> diff --git a/expected b/actual\n> index 6934f86..25439ca 100644\n> --- a/expected\n> +++ b/actual\n> @@ -1,6 +1,4 @@\n> -100644 ce013625030ba8dba906f756967f9e9ca394464a 1\ta\n> -100644 317e9677c3bcffd006f9fc84bbb0a54ef1676197 3\ta\n>  100644 72fb9054a42fd63d9c608b1a98a40614d7215bfb 0\ta/c\n>  100644 ce013625030ba8dba906f756967f9e9ca394464a 0\tb\n>  100644 ce013625030ba8dba906f756967f9e9ca394464a 0\tc\n> -100644 317e9677c3bcffd006f9fc84bbb0a54ef1676197 0\td/e\n> +100644 ce013625030ba8dba906f756967f9e9ca394464a 0\td/e\n> * FAIL 16: merge-recursive d/f conflict result the other way\n\n t/t3030-merge-recursive.sh |  104 ++++++++++++++++++++++----------------------\n 1 files changed, 52 insertions(+), 52 deletions(-)\n\ndiff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh\nindex aef92b9..86ee2b0 100755\n--- a/t/t3030-merge-recursive.sh\n+++ b/t/t3030-merge-recursive.sh\n@@ -9,12 +9,12 @@ test_expect_success 'setup 1' '\n \techo hello >a &&\n \to0=$(git hash-object a) &&\n \tcp a b &&\n-\tcp a A &&\n+\tcp a c &&\n \tmkdir d &&\n \tcp a d/e &&\n \n \ttest_tick &&\n-\tgit add a b A d/e &&\n+\tgit add a b c d/e &&\n \tgit commit -m initial &&\n \tc0=$(git rev-parse --verify HEAD) &&\n \tgit branch side &&\n@@ -34,13 +34,13 @@ test_expect_success 'setup 1' '\n \tc1=$(git rev-parse --verify HEAD) &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o1\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o1\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o1 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -48,17 +48,17 @@ test_expect_success 'setup 1' '\n \n test_expect_success 'setup 2' '\n \n-\trm -rf [Aabd] &&\n+\trm -rf [abcd] &&\n \tgit checkout side &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual &&\n@@ -73,13 +73,13 @@ test_expect_success 'setup 2' '\n \tc2=$(git rev-parse --verify HEAD) &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o2\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o2 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -87,17 +87,17 @@ test_expect_success 'setup 2' '\n \n test_expect_success 'setup 3' '\n \n-\trm -rf [Aabd] &&\n+\trm -rf [abcd] &&\n \tgit checkout df-1 &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual &&\n@@ -110,13 +110,13 @@ test_expect_success 'setup 3' '\n \tc3=$(git rev-parse --verify HEAD) &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o3\tb/c\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o3 0\tb/c\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -124,17 +124,17 @@ test_expect_success 'setup 3' '\n \n test_expect_success 'setup 4' '\n \n-\trm -rf [Aabd] &&\n+\trm -rf [abcd] &&\n \tgit checkout df-2 &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual &&\n@@ -147,13 +147,13 @@ test_expect_success 'setup 4' '\n \tc4=$(git rev-parse --verify HEAD) &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o4\ta/c\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o4 0\ta/c\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -161,17 +161,17 @@ test_expect_success 'setup 4' '\n \n test_expect_success 'setup 5' '\n \n-\trm -rf [Aabd] &&\n+\trm -rf [abcd] &&\n \tgit checkout remove &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual &&\n@@ -188,11 +188,11 @@ test_expect_success 'setup 5' '\n \tc5=$(git rev-parse --verify HEAD) &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o5\ta\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o5 0\ta\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -201,17 +201,17 @@ test_expect_success 'setup 5' '\n \n test_expect_success 'setup 6' '\n \n-\trm -rf [Aabd] &&\n+\trm -rf [abcd] &&\n \tgit checkout df-3 &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o0\td/e\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o0 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual &&\n@@ -224,13 +224,13 @@ test_expect_success 'setup 6' '\n \tc6=$(git rev-parse --verify HEAD) &&\n \t( git ls-tree -r HEAD ; git ls-files -s ) >actual &&\n \t(\n-\t\techo \"100644 blob $o0\tA\"\n \t\techo \"100644 blob $o0\ta\"\n \t\techo \"100644 blob $o0\tb\"\n+\t\techo \"100644 blob $o0\tc\"\n \t\techo \"100644 blob $o6\td\"\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o6 0\td\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -238,7 +238,7 @@ test_expect_success 'setup 6' '\n \n test_expect_success 'merge-recursive simple' '\n \n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit checkout -f \"$c2\" &&\n \n \tgit-merge-recursive \"$c0\" -- \"$c2\" \"$c1\"\n@@ -258,11 +258,11 @@ test_expect_success 'merge-recursive result' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 1\ta\"\n \t\techo \"100644 $o2 2\ta\"\n \t\techo \"100644 $o1 3\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -271,7 +271,7 @@ test_expect_success 'merge-recursive result' '\n \n test_expect_success 'merge-recursive remove conflict' '\n \n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit checkout -f \"$c1\" &&\n \n \tgit-merge-recursive \"$c0\" -- \"$c1\" \"$c5\"\n@@ -291,10 +291,10 @@ test_expect_success 'merge-recursive remove conflict' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 1\ta\"\n \t\techo \"100644 $o1 2\ta\"\n \t\techo \"100644 $o5 3\ta\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -302,7 +302,7 @@ test_expect_success 'merge-recursive remove conflict' '\n '\n \n test_expect_success 'merge-recursive d/f simple' '\n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit reset --hard &&\n \tgit checkout -f \"$c1\" &&\n \n@@ -313,9 +313,9 @@ test_expect_success 'merge-recursive result' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o1 0\ta\"\n \t\techo \"100644 $o3 0\tb/c\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -324,7 +324,7 @@ test_expect_success 'merge-recursive result' '\n \n test_expect_success 'merge-recursive d/f conflict' '\n \n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit reset --hard &&\n \tgit checkout -f \"$c1\" &&\n \n@@ -345,11 +345,11 @@ test_expect_success 'merge-recursive d/f conflict result' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 1\ta\"\n \t\techo \"100644 $o1 2\ta\"\n \t\techo \"100644 $o4 0\ta/c\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -358,7 +358,7 @@ test_expect_success 'merge-recursive d/f conflict result' '\n \n test_expect_success 'merge-recursive d/f conflict the other way' '\n \n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit reset --hard &&\n \tgit checkout -f \"$c4\" &&\n \n@@ -379,11 +379,11 @@ test_expect_success 'merge-recursive d/f conflict result the other way' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o0 1\ta\"\n \t\techo \"100644 $o1 3\ta\"\n \t\techo \"100644 $o4 0\ta/c\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -392,7 +392,7 @@ test_expect_success 'merge-recursive d/f conflict result the other way' '\n \n test_expect_success 'merge-recursive d/f conflict' '\n \n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit reset --hard &&\n \tgit checkout -f \"$c1\" &&\n \n@@ -413,9 +413,9 @@ test_expect_success 'merge-recursive d/f conflict result' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o1 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o6 3\td\"\n \t\techo \"100644 $o0 1\td/e\"\n \t\techo \"100644 $o1 2\td/e\"\n@@ -426,7 +426,7 @@ test_expect_success 'merge-recursive d/f conflict result' '\n \n test_expect_success 'merge-recursive d/f conflict' '\n \n-\trm -fr [Aabd] &&\n+\trm -fr [abcd] &&\n \tgit reset --hard &&\n \tgit checkout -f \"$c6\" &&\n \n@@ -447,9 +447,9 @@ test_expect_success 'merge-recursive d/f conflict result' '\n \n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n \t\techo \"100644 $o1 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o6 2\td\"\n \t\techo \"100644 $o0 1\td/e\"\n \t\techo \"100644 $o1 3\td/e\"\n@@ -471,13 +471,13 @@ test_expect_success 'reset and bind merge' '\n \tgit read-tree --prefix=M/ master &&\n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n-\t\techo \"100644 $o0 0\tM/A\"\n \t\techo \"100644 $o1 0\tM/a\"\n \t\techo \"100644 $o0 0\tM/b\"\n+\t\techo \"100644 $o0 0\tM/c\"\n \t\techo \"100644 $o1 0\tM/d/e\"\n \t\techo \"100644 $o1 0\ta\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual &&\n@@ -485,17 +485,17 @@ test_expect_success 'reset and bind merge' '\n \tgit read-tree --prefix=a1/ master &&\n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n-\t\techo \"100644 $o0 0\tM/A\"\n \t\techo \"100644 $o1 0\tM/a\"\n \t\techo \"100644 $o0 0\tM/b\"\n+\t\techo \"100644 $o0 0\tM/c\"\n \t\techo \"100644 $o1 0\tM/d/e\"\n \t\techo \"100644 $o1 0\ta\"\n-\t\techo \"100644 $o0 0\ta1/A\"\n \t\techo \"100644 $o1 0\ta1/a\"\n \t\techo \"100644 $o0 0\ta1/b\"\n+\t\techo \"100644 $o0 0\ta1/c\"\n \t\techo \"100644 $o1 0\ta1/d/e\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n@@ -503,21 +503,21 @@ test_expect_success 'reset and bind merge' '\n \tgit read-tree --prefix=z/ master &&\n \tgit ls-files -s >actual &&\n \t(\n-\t\techo \"100644 $o0 0\tA\"\n-\t\techo \"100644 $o0 0\tM/A\"\n \t\techo \"100644 $o1 0\tM/a\"\n \t\techo \"100644 $o0 0\tM/b\"\n+\t\techo \"100644 $o0 0\tM/c\"\n \t\techo \"100644 $o1 0\tM/d/e\"\n \t\techo \"100644 $o1 0\ta\"\n-\t\techo \"100644 $o0 0\ta1/A\"\n \t\techo \"100644 $o1 0\ta1/a\"\n \t\techo \"100644 $o0 0\ta1/b\"\n+\t\techo \"100644 $o0 0\ta1/c\"\n \t\techo \"100644 $o1 0\ta1/d/e\"\n \t\techo \"100644 $o0 0\tb\"\n+\t\techo \"100644 $o0 0\tc\"\n \t\techo \"100644 $o1 0\td/e\"\n-\t\techo \"100644 $o0 0\tz/A\"\n \t\techo \"100644 $o1 0\tz/a\"\n \t\techo \"100644 $o0 0\tz/b\"\n+\t\techo \"100644 $o0 0\tz/c\"\n \t\techo \"100644 $o1 0\tz/d/e\"\n \t) >expected &&\n \tgit diff -u expected actual\n-- \n1.5.1.1.107.g7a159\n"}]}