mirror of
https://github.com/libgit2/libgit2.git
synced 2026-01-25 02:56:17 +00:00
revert tests: always use core.autocrlf=false in tests
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
xĄŹ]j!…űě*.yoĐŃ™{…RňŇ
„l@˝NF¨ZÔ´Űď$Ů@ˇo‡ŹĂů 5ç4@+z-FP¤śó2{ŤŢH¶n"łz<C582>Z‹R.<Ł´J|ąË€‰Ť‘ëäµ2Čš:V’fRÚ ń´Xžťaánc«
>řÇ5†ËVsŻŢâNďę”Shµ×uCÍď 4Yk‹Ż’¤;݇ŽřŹqŽß±
8„ZÖĎF*W›+×ŘB\¶Ôˇ=,žuľwż‡ödŢ
|
||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
xĄŽ]J1„}Î)š}wéIw~D|ń˛H:vŔl–LÔë;ę|)Šú ޤ·¶M ćPLeYťuY}‰’Ô©+šmXĹ2g0‡.<2E>{z›,U…5’_Ľ'¬•ň!Ę‚5i!agŇÇĽöŻĺ+Ť—ko{żÁ“éŹ{i›Śľ÷:ĎŇŰ3,×u
H1"š#=ŽNýG…yÓONűÖîď
|
||||
Z¶y2ćrÝvżh‡ż(Ka¤bdµěV[‚u•ŮFrRŮWő(1ÉŮ|_c&
|
||||
@@ -0,0 +1 @@
|
||||
x¥OIj1ôY¯h|<7C>é–[3„<>K>`üIÝbæ +h”äû™8y@À§*ª –Üj]œÑFWBÂìÏD2¡ §(4Q˜#N(,²ckÞc×Û€0«³âÔSqLè1Ë”‚õ6”ä]Ê,ž$`2ñc,Û|Å.p]ZÝÚ
žuWØk]so[+ã”[}bbf´|†'dD³«ûСD˜‹~jpüêGc®ËºA¿ü–üûÔÉ|ki`ö
|
||||
@@ -1 +1 @@
|
||||
e34ef1afe54eb526fd92eec66084125f340f1d65
|
||||
75ec9929465623f17ff3ad68c0438ea56faba815
|
||||
|
||||
@@ -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" \
|
||||
|
||||
Reference in New Issue
Block a user