From 53ca45ee25b712eaac367fdc37be40bee9f40711 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 27 Oct 2014 17:27:25 -0400 Subject: [PATCH] revert tests: always use core.autocrlf=false in tests --- .../00/c97c9299419874a7bfc4d853d462c568e1be2d | Bin 0 -> 137 bytes .../10/10c8f4711d60d04bad16197a0f4b0d4d19c542 | Bin 0 -> 53 bytes .../5c/f1d643f100d8112834e540264546ba2c159976 | Bin 86 -> 0 bytes .../75/ec9929465623f17ff3ad68c0438ea56faba815 | Bin 0 -> 163 bytes .../8b/e77695228eadd004606af0508462457961ca4a | Bin 0 -> 52 bytes .../97/e52d5e81f541080cd6b92829fb85bc4d81d90b | Bin 0 -> 163 bytes .../aa/7e281435d1fe6740d712f4bcc6fe89c425bedc | Bin 0 -> 53 bytes .../b6/9d88e177455579896e2be495046e2a51456a9a | Bin 197 -> 0 bytes .../ca/f99de3a49827117bb66721010eac461b06a80c | Bin 33 -> 0 bytes .../de/03538407ed18914ff05657eeff70425c0f304d | Bin 212 -> 0 bytes .../e5/f831f064adf9224d8c3ce556959d9d61b3c0a9 | Bin 0 -> 186 bytes tests/resources/revert/.gitted/refs/heads/two | Bin 41 -> 41 bytes tests/revert/workdir.c | 14 ++++++-------- 13 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 tests/resources/revert/.gitted/objects/00/c97c9299419874a7bfc4d853d462c568e1be2d create mode 100644 tests/resources/revert/.gitted/objects/10/10c8f4711d60d04bad16197a0f4b0d4d19c542 delete mode 100644 tests/resources/revert/.gitted/objects/5c/f1d643f100d8112834e540264546ba2c159976 create mode 100644 tests/resources/revert/.gitted/objects/75/ec9929465623f17ff3ad68c0438ea56faba815 create mode 100644 tests/resources/revert/.gitted/objects/8b/e77695228eadd004606af0508462457961ca4a create mode 100644 tests/resources/revert/.gitted/objects/97/e52d5e81f541080cd6b92829fb85bc4d81d90b create mode 100644 tests/resources/revert/.gitted/objects/aa/7e281435d1fe6740d712f4bcc6fe89c425bedc delete mode 100644 tests/resources/revert/.gitted/objects/b6/9d88e177455579896e2be495046e2a51456a9a delete mode 100644 tests/resources/revert/.gitted/objects/ca/f99de3a49827117bb66721010eac461b06a80c delete mode 100644 tests/resources/revert/.gitted/objects/de/03538407ed18914ff05657eeff70425c0f304d create mode 100644 tests/resources/revert/.gitted/objects/e5/f831f064adf9224d8c3ce556959d9d61b3c0a9 diff --git a/tests/resources/revert/.gitted/objects/00/c97c9299419874a7bfc4d853d462c568e1be2d b/tests/resources/revert/.gitted/objects/00/c97c9299419874a7bfc4d853d462c568e1be2d new file mode 100644 index 0000000000000000000000000000000000000000..b4e9635c677d5a00791ff24780fa6598f6d3fc3e GIT binary patch literal 137 zcmV;40CxX)0i}&G4#F@D0Gaa&e*k1hZc8Opu`sanfizCkNTimM0N*FPf$em|o!6XG z1Dc0JD9V=y!@Ff%bxNXyJg)hnqeVNhI|HREl|m58*5_wv;8FE5kw LdU*!`OP&$x6T}v? literal 0 HcmV?d00001 diff --git a/tests/resources/revert/.gitted/objects/5c/f1d643f100d8112834e540264546ba2c159976 b/tests/resources/revert/.gitted/objects/5c/f1d643f100d8112834e540264546ba2c159976 deleted file mode 100644 index dbbf711b5b1bad52430f7c5f7fea334ffd0fcf65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0ZYosPf{>4vS6@*00j?MM;9(z2;g$d%t=+q&r8L}u!8`Fg2bZKyb^`{ sG=&ty6cYpE6g@pXh2qTI0-zD8DVZhs%pk@dBGf3t?ZD0g0M(;Nc2L$P#Q*>R diff --git a/tests/resources/revert/.gitted/objects/75/ec9929465623f17ff3ad68c0438ea56faba815 b/tests/resources/revert/.gitted/objects/75/ec9929465623f17ff3ad68c0438ea56faba815 new file mode 100644 index 0000000000000000000000000000000000000000..a3609c7de1bbd9464efcbb3a431312cd10e98429 GIT binary patch literal 163 zcmV;U09^lg0i}+?4FVw$0DV)%HlSI!g@eQxKXzaPE4##dAcn(e`JOfSo6KV}xz)N1 zaMQdST@~U@=Q$+rTvQf8q=117dW;kt`8frfnbtlfW5+_?Q5KBqUk;FV@^?qw4 zNfPXB%E-y^YusChi@doDT<@)}?Ey#K?2pcM$-S+uj6-hq1ePojp$iuFNQh>$+vw0g R66W$5ok3+8<_j?2OU@pCPPPC5 literal 0 HcmV?d00001 diff --git a/tests/resources/revert/.gitted/objects/8b/e77695228eadd004606af0508462457961ca4a b/tests/resources/revert/.gitted/objects/8b/e77695228eadd004606af0508462457961ca4a new file mode 100644 index 0000000000000000000000000000000000000000..951917ce3d470596314d20641ff9b41b853625f1 GIT binary patch literal 52 zcmV-40L%Y)0V^p=O;s>9V=y!@Ff%bxNXyJg)hnqeVQ~A;5t3&0TCr(ob5HNGKI1jY Kd*lE)+z;#ea~4_v literal 0 HcmV?d00001 diff --git a/tests/resources/revert/.gitted/objects/97/e52d5e81f541080cd6b92829fb85bc4d81d90b b/tests/resources/revert/.gitted/objects/97/e52d5e81f541080cd6b92829fb85bc4d81d90b new file mode 100644 index 0000000000000000000000000000000000000000..416ae0f13cb7e733aaff4d3ad87fcf5b69078157 GIT binary patch literal 163 zcmV;U09^lg0i}+~4Z<)G0C~HLZ2;tB<3mD-4-Ft1u-9uP568$c&_1CCexrGehFY!5 z0B!7HbY_UrvGxkhlvQEtP-dre!9-*W`#`9t#F@l1c3uZaNx@OjA)pH0VRWewW*TdE$eIH> zR+45?+92`5v{;^XcJxwbykVL(T7?G+ApGiwLih zq!c^dhmQD<2yu?zu?;wcTGr1LMk-ebn=9AY4?JpWm%ndS$&C;)Tt|)Z3tM!GG~7g*B32yeF)c z@*&ECHE9+hVQ13Ey!HXFmuqi(zrm9p>5qG9n~c8qI?vMEGb|L>bqz=k9x)=C zBR!5z{YQm)(@z}}PW#sG?+RMBc{1j5-F6tiXotTUC`)0aVy$Gg>{eTXb(Psha#Gn> O^(ZmP*?a?E5Mw4WNnknv diff --git a/tests/resources/revert/.gitted/objects/e5/f831f064adf9224d8c3ce556959d9d61b3c0a9 b/tests/resources/revert/.gitted/objects/e5/f831f064adf9224d8c3ce556959d9d61b3c0a9 new file mode 100644 index 0000000000000000000000000000000000000000..665f1a1a2ae49506c9d6592dc0e98e09be1533fd GIT binary patch literal 186 zcmV;r07d_J0i{n#Y6CG4^jWWHe2?jtTQd@bkV`&b`~gYbV&)(#Xq4ppnK*esz^5vz zpqAWfT?d@eA4XRNLc;6|&qOkzAg3raQJ5nZPADuCvSVxBW7pe&FsrlT)KhUx=rPNb zg7r3(8o-KLQdHly9-XQ_*@W$lGlb9;JlIU)T8ivkNf* diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c index 0121429d8..6a7b335c4 100644 --- a/tests/revert/workdir.c +++ b/tests/revert/workdir.c @@ -303,8 +303,8 @@ void test_revert_workdir__again_after_edit(void) /* * revert the same commit twice (when the first reverts cleanly): * - * git reset --hard e34ef1a - * git revert 71eb9c2 + * git reset --hard 75ec9929465623f17ff3ad68c0438ea56faba815 + * git revert 97e52d5e81f541080cd6b92829fb85bc4d81d90b */ void test_revert_workdir__again_after_edit_two(void) { @@ -314,8 +314,6 @@ void test_revert_workdir__again_after_edit_two(void) git_commit *head_commit, *revert_commit; struct merge_index_entry merge_index_entries[] = { - { 0100644, "1ff0c423042b46cb1d617b81efb715defbe8054d", 0, ".gitattributes" }, - { 0100644, "1bc915c5cb7185a9438de28a7b1a7dfe8c01ee7f", 0, ".gitignore" }, { 0100644, "a8c86221b400b836010567cc3593db6e96c1a83a", 1, "file.txt" }, { 0100644, "46ff0854663aeb2182b9838c8da68e33ac23bc1e", 2, "file.txt" }, { 0100644, "21a96a98ed84d45866e1de6e266fd3a61a4ae9dc", 3, "file.txt" }, @@ -324,23 +322,23 @@ void test_revert_workdir__again_after_edit_two(void) cl_git_pass(git_repository_config(&config, repo)); cl_git_pass(git_config_set_bool(config, "core.autocrlf", 0)); - cl_git_pass(git_oid_fromstr(&head_commit_oid, "e34ef1afe54eb526fd92eec66084125f340f1d65")); + cl_git_pass(git_oid_fromstr(&head_commit_oid, "75ec9929465623f17ff3ad68c0438ea56faba815")); cl_git_pass(git_commit_lookup(&head_commit, repo, &head_commit_oid)); cl_git_pass(git_reset(repo, (git_object *)head_commit, GIT_RESET_HARD, NULL, NULL, NULL)); - cl_git_pass(git_oid_fromstr(&revert_commit_oid, "71eb9c2b53dbbf3c45fb28b27c850db4b7fb8011")); + cl_git_pass(git_oid_fromstr(&revert_commit_oid, "97e52d5e81f541080cd6b92829fb85bc4d81d90b")); cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_commit_oid)); cl_git_pass(git_revert(repo, revert_commit, NULL)); - cl_assert(merge_test_index(repo_index, merge_index_entries, 5)); + cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); cl_git_pass(git_futils_readbuffer(&diff_buf, "revert/file.txt")); cl_assert(strcmp(diff_buf.ptr, "a\n" \ "<<<<<<< HEAD\n" \ "=======\n" \ "a\n" \ - ">>>>>>> parent of 71eb9c2... revert me\n" \ + ">>>>>>> parent of 97e52d5... Revert me\n" \ "a\n" \ "a\n" \ "a\n" \