add integration test for discarding old files

pkg/gui/commits_panel.go

@@ -231,6 +231,7 @@ func (gui *Gui) handleRewordCommit() error {
 		return gui.surfaceError(err)
 	}
 
+	// TODO: use the commit message panel here
 	return gui.prompt(promptOpts{
 		title:          gui.Tr.LcRewordCommit,
 		initialContent: message,

test/integration/discardOldFileChanges/expected/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+twoFiles

test/integration/discardOldFileChanges/expected/.git_keep/HEAD

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

test/integration/discardOldFileChanges/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+7880a9728615a4d196df39600a0c8c71b40d96d6

test/integration/discardOldFileChanges/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/discardOldFileChanges/expected/.git_keep/description

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

test/integration/discardOldFileChanges/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/discardOldFileChanges/expected/.git_keep/logs/HEAD

@@ -0,0 +1,9 @@
+0000000000000000000000000000000000000000 b7a702b642978f2a9b1af9c1c67b22127af78c92 CI <CI@example.com> 1641697108 +1100	commit (initial): file0
+b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI <CI@example.com> 1641697108 +1100	commit: twoFiles
+7880a9728615a4d196df39600a0c8c71b40d96d6 af6725ba23f43a286deff0747476d7874113df1e CI <CI@example.com> 1641697108 +1100	commit: file2
+af6725ba23f43a286deff0747476d7874113df1e af6725ba23f43a286deff0747476d7874113df1e CI <CI@example.com> 1641697111 +1100	rebase: updating HEAD
+af6725ba23f43a286deff0747476d7874113df1e b7a702b642978f2a9b1af9c1c67b22127af78c92 CI <CI@example.com> 1641697111 +1100	rebase -i (start): checkout b7a702b642978f2a9b1af9c1c67b22127af78c92
+b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI <CI@example.com> 1641697111 +1100	rebase -i: fast-forward
+7880a9728615a4d196df39600a0c8c71b40d96d6 d14505f281a54cda96fc5fb8cd4b4ee14bae6264 CI <CI@example.com> 1641697111 +1100	commit (amend): twoFiles
+d14505f281a54cda96fc5fb8cd4b4ee14bae6264 225ad83faa797c1831a2bc956a21e2d472f21443 CI <CI@example.com> 1641697111 +1100	rebase -i (pick): file2
+225ad83faa797c1831a2bc956a21e2d472f21443 225ad83faa797c1831a2bc956a21e2d472f21443 CI <CI@example.com> 1641697111 +1100	rebase -i (finish): returning to refs/heads/master

test/integration/discardOldFileChanges/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 b7a702b642978f2a9b1af9c1c67b22127af78c92 CI <CI@example.com> 1641697108 +1100	commit (initial): file0
+b7a702b642978f2a9b1af9c1c67b22127af78c92 7880a9728615a4d196df39600a0c8c71b40d96d6 CI <CI@example.com> 1641697108 +1100	commit: twoFiles
+7880a9728615a4d196df39600a0c8c71b40d96d6 af6725ba23f43a286deff0747476d7874113df1e CI <CI@example.com> 1641697108 +1100	commit: file2
+af6725ba23f43a286deff0747476d7874113df1e 225ad83faa797c1831a2bc956a21e2d472f21443 CI <CI@example.com> 1641697111 +1100	rebase -i (finish): refs/heads/master onto b7a702b642978f2a9b1af9c1c67b22127af78c92

test/integration/discardOldFileChanges/expected/.git_keep/objects/0a/91dcf3772f7fd7409b3df04eb6ef177219303a

@@ -0,0 +1 @@
+x
��±j1DSßW¨„]iO+™®\åVÚD>s'C>?jÒ‡é†÷¦n½
çWz»™Ãd9±’VÐc\3{Z3VeÈæ…SÆD­.Ùí>œ´È~-âC£ >EµÖ€i&*'&Ä 
í�‡ª%ªa›ZÔ¨*ÁG)LÃ"ÏqÛvw¹º÷Ëõl?ÒßöV·þá0Æ̈è^
–ÙÎÃþ‰/Ÿw×å˜üÉÍ™írÜ~

ìKò

test/integration/discardOldFileChanges/expected/.git_keep/objects/0c/db6daba7e25b6d6d10da326e0ab74401021370

@@ -0,0 +1,2 @@
+x
�ŽA
+Â0E]ç³$“¦™DD„®zŒi2Á‚iK�Ðã›�{y»ÏûðâZÊ\Á �ê.è%xJ�å<¡A×2¶é †Éô6Gµñ.KÎŽL?±é²íØx—$gM¶áy²ˆ]Ê(Š?õ¹î0ŒpƇ\¶—\âZî€Î¢„ˆpFÔZµµEUùSWó’ä€u�Âïöºþª Ï/1êÜZ@¼

test/integration/discardOldFileChanges/expected/.git_keep/objects/af/6725ba23f43a286deff0747476d7874113df1e

@@ -0,0 +1,3 @@
+x
�ÎA
+à @Ñ®=…ûB™‰qT(¥�UŽ1Ž#
Ä&=~s„nñekméÓp釪�,R‹ó^krÁåÌ©xrN*)…])Þì|è»Û#p
+C$ô<LTªKÀ QæÊidøÓ_Ûa§ÙÞ§ù©_nûª7ÙÚÃ"�H) D{E0§žS]ÿÌM]V̈‘9n

test/integration/discardOldFileChanges/expected/.git_keep/objects/b7/a702b642978f2a9b1af9c1c67b22127af78c92

@@ -0,0 +1,2 @@
+x
�ÍA
+Â0Fa×9Å왉cÒ
¡«#iþ`¡¡R"x|{·�Þ¼µ¶tÕSß
\b6³’åC*ð�«Vö¹ToPSõ.}úkÛiœè>NO|S{¯¸Ì[{�•`Qx ³³;ê1éø“»º¬`÷Ü7+ò

test/integration/discardOldFileChanges/expected/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -0,0 +1,2 @@
+x
+)JMU03c040031QHﾋﾌI5`ｰｱｺｲ燹ﾖｶwﾁ�w.ｽ��ﾓ[H
+矢y�5�来ﾐ(桍ｧ
^-ﾝW
(x9

test/integration/discardOldFileChanges/expected/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+225ad83faa797c1831a2bc956a21e2d472f21443

test/integration/discardOldFileChanges/expected/file0

@@ -0,0 +1 @@
+test0

test/integration/discardOldFileChanges/expected/file1

@@ -0,0 +1 @@
+test1

test/integration/discardOldFileChanges/expected/file2

@@ -0,0 +1 @@
+test2

test/integration/discardOldFileChanges/expected/file3

@@ -0,0 +1 @@
+test3

test/integration/discardOldFileChanges/recording.json

@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":635,"Mod":0,"Key":259,"Ch":0},{"Timestamp":899,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1227,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1571,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1971,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2322,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2731,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3707,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/discardOldFileChanges/setup.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+cd $1
+
+git init
+
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+echo test0 > file0
+git add .
+git commit -am file0
+
+echo test1 > file1
+echo testZ > fileZ
+git add .
+git commit -am twoFiles
+
+echo test2 > file2
+git add .
+git commit -am file2
+
+echo test3 > file3
+git add .

test/integration/discardOldFileChanges/test.json

@@ -0,0 +1,4 @@
+{
+  "description": "Discarding a single file from an old commit (does rebase in background to remove the file but retain the other one)",
+  "speed": 5
+}