diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-20 12:07:11 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-20 12:46:27 +1100 |
| commit | ad1468f66f8af1724a99bc4c1a653ac71c6cadcb (patch) | |
| tree | 1ec69ad08f0f07a6d9f881be034ee3400df4cc13 /test | |
| parent | 058bcddc53cff6360583cd575fe64da76b53f94b (diff) | |
better handling of discarding files
Diffstat (limited to 'test')
62 files changed, 128 insertions, 0 deletions
diff --git a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..2bdf67abb --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +three diff --git a/test/integration/discardFileChanges/expected/.git_keep/FETCH_HEAD b/test/integration/discardFileChanges/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/FETCH_HEAD diff --git a/test/integration/discardFileChanges/expected/.git_keep/HEAD b/test/integration/discardFileChanges/expected/.git_keep/HEAD new file mode 100644 index 000000000..52c2dc641 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD b/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD new file mode 100644 index 000000000..6d6a6623d --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD @@ -0,0 +1 @@ +38b645bf2388b21695d22d7f673d87971a78e4ad diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG new file mode 100644 index 000000000..d6189997a --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG @@ -0,0 +1,10 @@ +Merge branch 'conflict' into conflict_second + +# Conflicts: +# added-them-changed-us.txt +# both-added.txt +# both-deleted.txt +# both-modded.txt +# changed-them-added-us.txt +# deleted-them.txt +# deleted-us.txt diff --git a/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD b/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..07e446d60 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +c64dd6aea3efd197ed630dedc1ffb538d35c3fdb diff --git a/test/integration/discardFileChanges/expected/.git_keep/config b/test/integration/discardFileChanges/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/discardFileChanges/expected/.git_keep/description b/test/integration/discardFileChanges/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/discardFileChanges/expected/.git_keep/index b/test/integration/discardFileChanges/expected/.git_keep/index Binary files differnew file mode 100644 index 000000000..684535674 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/index diff --git a/test/integration/discardFileChanges/expected/.git_keep/info/exclude b/test/integration/discardFileChanges/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..84066dbf1 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD @@ -0,0 +1,7 @@ +0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one +0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt +eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two +38b645bf2388b21695d22d7f673d87971a78e4ad 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 checkout: moving from conflict to conflict_second +0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt +698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three +c64dd6aea3efd197ed630dedc1ffb538d35c3fdb c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 reset: moving to conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict new file mode 100644 index 000000000..4827c7871 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one +0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt +eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second new file mode 100644 index 000000000..0e1748048 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 branch: Created from conflict +0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt +698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 b/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 new file mode 100644 index 000000000..3ad31c1dc --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 @@ -0,0 +1,2 @@ +xA +@ @Qs cRU )x|{n?~PKܡGtOK ̔ʔkvEtW`a Z @B㍠#B G=&OP I*
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 b/test/integration/discardFileChanges/expected/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 Binary files differnew file mode 100644 index 000000000..cd888e56c --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/15/fe7f43604da957ffb663b4db95b60d0af66469 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 b/test/integration/discardFileChanges/expected/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 Binary files differnew file mode 100644 index 000000000..43396deed --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/1c/9488b0e1b8abd1ec8645b3345bdac91290b464 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 b/test/integration/discardFileChanges/expected/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 Binary files differnew file mode 100644 index 000000000..0931fd1bd --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/26/80cfddbd9fa03c059ac60d2bec5e59a1c34281 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d b/test/integration/discardFileChanges/expected/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d Binary files differnew file mode 100644 index 000000000..4b382c69a --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/2c/e75e2a24f7d6841a504cf3616ef5a59edb3a2d diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 b/test/integration/discardFileChanges/expected/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 Binary files differnew file mode 100644 index 000000000..6e1003c13 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/30/07c9c07bf80aaa72b1f1f704e7fea622446678 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad b/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad Binary files differnew file mode 100644 index 000000000..45642dcb1 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f b/test/integration/discardFileChanges/expected/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f Binary files differnew file mode 100644 index 000000000..01335af9c --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/3f/7bd8f68987d4e16b8f6fa7f6b0738b42180d1f diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 b/test/integration/discardFileChanges/expected/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 Binary files differnew file mode 100644 index 000000000..0c3f6db60 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/47/966dcaa8ee736e89279b895faf8707de898e04 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 b/test/integration/discardFileChanges/expected/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 Binary files differnew file mode 100644 index 000000000..96d96c7fe --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/48/f9387742d3cc3017c1a7e292c9187e35321753 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f b/test/integration/discardFileChanges/expected/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f Binary files differnew file mode 100644 index 000000000..879dad0ba --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/4d/8452fc76beed0c7b15e40e45d06922bf746c5f diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b b/test/integration/discardFileChanges/expected/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b Binary files differnew file mode 100644 index 000000000..8c946f2fb --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/59/cf7b78af9aab84813bcb0bc8be27fdd9216b2b diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da b/test/integration/discardFileChanges/expected/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da Binary files differnew file mode 100644 index 000000000..a49384ff6 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/5a/d28e22767f979da2c198dc6c1003b25964e3da diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 b/test/integration/discardFileChanges/expected/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 Binary files differnew file mode 100644 index 000000000..4cb486fbd --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/5b/e4a414b32cf4204f889469942986d3d783da84 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 b/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 Binary files differnew file mode 100644 index 000000000..de9f05a03 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 b/test/integration/discardFileChanges/expected/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 Binary files differnew file mode 100644 index 000000000..d248b43e8 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/7a/22af9d1908d85e3c4b6d916a9b6c733c55c990 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 b/test/integration/discardFileChanges/expected/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 Binary files differnew file mode 100644 index 000000000..7bba19849 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/89/44a13fdfc597e4cf1d23797df51977680f8e77 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 b/test/integration/discardFileChanges/expected/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 Binary files differnew file mode 100644 index 000000000..20cd3d000 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/90/7b308167f0880fb2a5c0e1614bb0c7620f9dc3 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 b/test/integration/discardFileChanges/expected/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 Binary files differnew file mode 100644 index 000000000..b448be25d --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/90/be1f3056c4f471f977a28497b8d4b392c55a02 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/discardFileChanges/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 Binary files differnew file mode 100644 index 000000000..4667dcf6f --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 |