better handling of discarding files

test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+three

test/integration/discardFileChanges/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/conflict_second

test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD

@@ -0,0 +1 @@
+38b645bf2388b21695d22d7f673d87971a78e4ad

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

test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+c64dd6aea3efd197ed630dedc1ffb538d35c3fdb

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

test/integration/discardFileChanges/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

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

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

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

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

test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84

@@ -0,0 +1,2 @@
+x
��A
+�@@Q�s����cR���U����)x|{�n?~���P�K�ܡG�tO�K�̔ʔ�kv�Et��W�`�a��������Z@B��㍠#BG=&�O�P��I�*�

test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb

@@ -0,0 +1,2 @@
+x
��A
+�0@Q�9E���L�d"BW=F&��`l)<�=���_�����Ʈj�TZ�ȹ���=��" �E)�Za��]�Æ�J�1���E<���j�ڜH.ћ��u��b��r�o��K/e�7�
������@

test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da

@@ -0,0 +1 @@
+x
��Aj�0E��)f_F�$[PJ!�c$}Ձ��r�:7��=�╭������;@�9K.1[N��m�A��6%D�4N��]v�J�PR�~�FW��O>"�0�Vc�!M��y�F�l;�/�u���)�~él��l�����ҧ����ǔ����M���E=�S�X��Jו�V�A��,����{E�VJK�

test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict

@@ -0,0 +1 @@
+38b645bf2388b21695d22d7f673d87971a78e4ad

test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second

@@ -0,0 +1 @@
+c64dd6aea3efd197ed630dedc1ffb538d35c3fdb

test/integration/discardFileChanges/expected/both-added.txt

@@ -0,0 +1 @@
+blah2

test/integration/discardFileChanges/expected/both-modded.txt

@@ -0,0 +1 @@
+mod2

test/integration/discardFileChanges/expected/change-delete.txt

@@ -0,0 +1 @@
+change-delete

test/integration/discardFileChanges/expected/changed-them-added-us.txt

@@ -0,0 +1 @@
+test

test/integration/discardFileChanges/expected/delete-change.txt

@@ -0,0 +1 @@
+delete-change

test/integration/discardFileChanges/expected/deleted-staged.txt

@@ -0,0 +1 @@
+del

test/integration/discardFileChanges/expected/deleted-them.txt

@@ -0,0 +1 @@
+modded

test/integration/discardFileChanges/expected/deleted.txt

@@ -0,0 +1 @@
+del

test/integration/discardFileChanges/expected/double-modded.txt

@@ -0,0 +1 @@
+double-modded

test/integration/discardFileChanges/expected/modded-staged.txt

@@ -0,0 +1 @@
+mod

test/integration/discardFileChanges/expected/modded.txt

@@ -0,0 +1 @@
+mod

test/integration/discardFileChanges/expected/renamed.txt

@@ -0,0 +1 @@
+renamed\nhaha

test/integration/discardFileChanges/setup.sh

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+# common stuff
+echo test > both-deleted.txt
+git checkout -b conflict && git add both-deleted.txt
+echo bothmodded > both-modded.txt && git add both-modded.txt
+echo haha > deleted-them.txt && git add deleted-them.txt
+echo haha2 > deleted-us.txt && git add deleted-us.txt
+echo mod > modded.txt & git add modded.txt
+echo mod > modded-staged.txt & git add modded-staged.txt
+echo del > deleted.txt && git add deleted.txt
+echo del > deleted-staged.txt && git add deleted-staged.txt
+echo change-delete > change-delete.txt && git add change-delete.txt
+echo delete-change > delete-change.txt && git add delete-change.txt
+echo double-modded > double-modded.txt && git add double-modded.txt
+echo "renamed\nhaha" > renamed.txt && git add renamed.txt
+git commit -m one
+
+# stuff on other branch
+git branch conflict_second && git mv both-deleted.txt added-them-changed-us.txt
+git commit -m "both-deleted.txt renamed in added-them-changed-us.txt"
+echo blah > both-added.txt && git add both-added.txt
+echo mod1 > both-modded.txt && git add both-modded.txt
+rm deleted-them.txt && git add deleted-them.txt
+echo modded > deleted-us.txt && git add deleted-us.txt
+git commit -m "two"
+
+# stuff on our branch
+git checkout conflict_second
+git mv both-deleted.txt changed-them-added-us.txt
+git commit -m "both-deleted.txt renamed in changed-them-added-us.txt"
+echo mod2 > both-modded.txt && git add both-modded.txt
+echo blah2 > both-added.txt && git add both-added.txt
+echo modded > deleted-them.txt && git add deleted-them.txt
+rm deleted-us.txt && git add deleted-us.txt
+git commit -m "three"
+git reset --hard conflict_second
+git merge conflict
+
+echo "new" > new.txt
+echo "new staged" > new-staged.txt && git add new-staged.txt
+echo mod2 > modded.txt
+echo mod2 > modded-staged.txt && git add modded-staged.txt
+rm deleted.txt
+rm deleted-staged.txt && git add deleted-staged.txt
+echo change-delete2 > change-delete.txt && git add change-delete.txt
+rm change-delete.txt
+rm delete-change.txt && git add delete-change.txt
+echo "changed" > delete-change.txt
+echo "change1" > double-modded.txt && git add double-modded.txt
+echo "change2" > double-modded.txt
+echo before > added-changed.txt && git add added-changed.txt
+echo after > added-changed.txt
+rm renamed.txt && git add renamed.txt
+echo "renamed\nhaha" > renamed2.txt && git add renamed2.txt

test/integration/discardFileChanges/test.json

@@ -0,0 +1 @@
+{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 2 }