From abbd598992c774e6f4cbbc5d98017b1e552c2676 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 20 Dec 2022 22:06:44 +1100 Subject: [PATCH 1/4] bump gocui --- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- vendor/github.com/jesseduffield/gocui/gui.go | 4 +--- vendor/github.com/rivo/uniseg/README.md | 7 +++++++ vendor/github.com/rivo/uniseg/doc.go | 6 +++--- vendor/github.com/rivo/uniseg/grapheme.go | 19 ++++++++++++++++++ .../x/sys/windows/syscall_windows.go | 1 + .../x/sys/windows/zsyscall_windows.go | 7 +++++++ vendor/modules.txt | 10 +++++----- 9 files changed, 58 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index e912c9bcb..c530a7231 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/integrii/flaggy v1.4.0 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d - github.com/jesseduffield/gocui v0.3.1-0.20221112081529-154bebde5bb5 + github.com/jesseduffield/gocui v0.3.1-0.20221203233251-eeb9b3fb2494 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e @@ -62,14 +62,14 @@ require ( github.com/onsi/ginkgo v1.10.3 // indirect github.com/onsi/gomega v1.7.1 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect - github.com/rivo/uniseg v0.4.2 // indirect + github.com/rivo/uniseg v0.4.3 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/xanzy/ssh-agent v0.2.1 // indirect golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8 // indirect golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c // indirect - golang.org/x/sys v0.2.0 // indirect - golang.org/x/term v0.2.0 // indirect - golang.org/x/text v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/term v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 61e8ebebf..c4663f0b8 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk= github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE= github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o= -github.com/jesseduffield/gocui v0.3.1-0.20221112081529-154bebde5bb5 h1:gjk12IHGGASij7/kaKEbOJ6jP3lWZzGvDrE9wxiDMoY= -github.com/jesseduffield/gocui v0.3.1-0.20221112081529-154bebde5bb5/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU= +github.com/jesseduffield/gocui v0.3.1-0.20221203233251-eeb9b3fb2494 h1:SH16ZF/+7S8ZyzDq+sXpOLULBs6lRo6bnYvuRAbhYbk= +github.com/jesseduffield/gocui v0.3.1-0.20221203233251-eeb9b3fb2494/go.mod h1:znJuCDnF2Ph40YZSlBwdX/4GEofnIoWLGdT4mK5zRAU= github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0= github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo= github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY= @@ -137,8 +137,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= -github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= +github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/samber/lo v1.31.0 h1:Sfa+/064Tdo4SvlohQUQzBhgSer9v/coGvKQI/XLWAM= @@ -200,16 +200,16 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/vendor/github.com/jesseduffield/gocui/gui.go b/vendor/github.com/jesseduffield/gocui/gui.go index 39a38af88..d48d5b262 100644 --- a/vendor/github.com/jesseduffield/gocui/gui.go +++ b/vendor/github.com/jesseduffield/gocui/gui.go @@ -255,9 +255,7 @@ func NewGui(mode OutputMode, supportOverlaps bool, playMode PlayMode, headless b // Close finalizes the library. It should be called after a successful // initialization and when gocui is not needed anymore. func (g *Gui) Close() { - go func() { - g.stop <- struct{}{} - }() + close(g.stop) Screen.Fini() } diff --git a/vendor/github.com/rivo/uniseg/README.md b/vendor/github.com/rivo/uniseg/README.md index 7e3d12e79..25e934687 100644 --- a/vendor/github.com/rivo/uniseg/README.md +++ b/vendor/github.com/rivo/uniseg/README.md @@ -133,6 +133,13 @@ Similarly, use - [`FirstSentence`](https://pkg.go.dev/github.com/rivo/uniseg#FirstSentence) or [`FirstSentenceInString`](https://pkg.go.dev/github.com/rivo/uniseg#FirstSentenceInString) for sentence segmentation only, and - [`FirstLineSegment`](https://pkg.go.dev/github.com/rivo/uniseg#FirstLineSegment) or [`FirstLineSegmentInString`](https://pkg.go.dev/github.com/rivo/uniseg#FirstLineSegmentInString) for line breaking / word wrapping (although using [`Step`](https://pkg.go.dev/github.com/rivo/uniseg#Step) or [`StepString`](https://pkg.go.dev/github.com/rivo/uniseg#StepString) is preferred as it will observe grapheme cluster boundaries). +Finally, if you need to reverse a string while preserving grapheme clusters, use [`ReverseString`](https://pkg.go.dev/github.com/rivo/uniseg#ReverseString): + +```go +fmt.Println(uniseg.ReverseString("🇩🇪🏳️‍🌈")) +// 🏳️‍🌈🇩🇪 +``` + ## Documentation Refer to https://pkg.go.dev/github.com/rivo/uniseg for the package's documentation. diff --git a/vendor/github.com/rivo/uniseg/doc.go b/vendor/github.com/rivo/uniseg/doc.go index 0fc2d8b43..11224ae22 100644 --- a/vendor/github.com/rivo/uniseg/doc.go +++ b/vendor/github.com/rivo/uniseg/doc.go @@ -70,10 +70,10 @@ broken. Monospace width, as referred to in this package, is the width of a string in a monospace font. This is commonly used in terminal user interfaces or text displays or editors that don't support proportional fonts. A width of 1 -corresponds to a single character cell. The C function [wcwidth()] and its +corresponds to a single character cell. The C function [wcswidth()] and its implementation in other programming languages is in widespread use for the same purpose. However, there is no standard for the calculation of such widths, and -this package differs from wcwidth() in a number of ways, presumably to generate +this package differs from wcswidth() in a number of ways, presumably to generate more visually pleasing results. To start, we assume that every code point has a width of 1, with the following @@ -103,6 +103,6 @@ Note that whether these widths appear correct depends on your application's render engine, to which extent it conforms to the Unicode Standard, and its choice of font. -[wcwidth()]: https://man7.org/linux/man-pages/man3/wcwidth.3.html +[wcswidth()]: https://man7.org/linux/man-pages/man3/wcswidth.3.html */ package uniseg diff --git a/vendor/github.com/rivo/uniseg/grapheme.go b/vendor/github.com/rivo/uniseg/grapheme.go index 997abbefd..d5d4c09e5 100644 --- a/vendor/github.com/rivo/uniseg/grapheme.go +++ b/vendor/github.com/rivo/uniseg/grapheme.go @@ -163,6 +163,25 @@ func GraphemeClusterCount(s string) (n int) { return } +// ReverseString reverses the given string while observing grapheme cluster +// boundaries. +func ReverseString(s string) string { + str := []byte(s) + reversed := make([]byte, len(str)) + state := -1 + index := len(str) + for len(str) > 0 { + var cluster []byte + cluster, str, _, state = FirstGraphemeCluster(str, state) + index -= len(cluster) + copy(reversed[index:], cluster) + if index <= len(str)/2 { + break + } + } + return string(reversed) +} + // The number of bits the grapheme property must be shifted to make place for // grapheme states. const shiftGraphemePropState = 4 diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index 7a6ba43a7..a49853e9d 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -367,6 +367,7 @@ func NewCallbackCDecl(fn interface{}) uintptr { //sys IsWindowUnicode(hwnd HWND) (isUnicode bool) = user32.IsWindowUnicode //sys IsWindowVisible(hwnd HWND) (isVisible bool) = user32.IsWindowVisible //sys GetGUIThreadInfo(thread uint32, info *GUIThreadInfo) (err error) = user32.GetGUIThreadInfo +//sys GetLargePageMinimum() (size uintptr) // Volume Management Functions //sys DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) = DefineDosDeviceW diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go index 96ba8559c..ac60052e4 100644 --- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go +++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go @@ -252,6 +252,7 @@ var ( procGetFileType = modkernel32.NewProc("GetFileType") procGetFinalPathNameByHandleW = modkernel32.NewProc("GetFinalPathNameByHandleW") procGetFullPathNameW = modkernel32.NewProc("GetFullPathNameW") + procGetLargePageMinimum = modkernel32.NewProc("GetLargePageMinimum") procGetLastError = modkernel32.NewProc("GetLastError") procGetLogicalDriveStringsW = modkernel32.NewProc("GetLogicalDriveStringsW") procGetLogicalDrives = modkernel32.NewProc("GetLogicalDrives") @@ -2180,6 +2181,12 @@ func GetFullPathName(path *uint16, buflen uint32, buf *uint16, fname **uint16) ( return } +func GetLargePageMinimum() (size uintptr) { + r0, _, _ := syscall.Syscall(procGetLargePageMinimum.Addr(), 0, 0, 0, 0) + size = uintptr(r0) + return +} + func GetLastError() (lasterr error) { r0, _, _ := syscall.Syscall(procGetLastError.Addr(), 0, 0, 0, 0) if r0 != 0 { diff --git a/vendor/modules.txt b/vendor/modules.txt index 89161b6a6..05e4fb96d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -172,7 +172,7 @@ github.com/jesseduffield/go-git/v5/utils/merkletrie/filesystem github.com/jesseduffield/go-git/v5/utils/merkletrie/index github.com/jesseduffield/go-git/v5/utils/merkletrie/internal/frame github.com/jesseduffield/go-git/v5/utils/merkletrie/noder -# github.com/jesseduffield/gocui v0.3.1-0.20221112081529-154bebde5bb5 +# github.com/jesseduffield/gocui v0.3.1-0.20221203233251-eeb9b3fb2494 ## explicit; go 1.12 github.com/jesseduffield/gocui # github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 @@ -233,7 +233,7 @@ github.com/petermattis/goid # github.com/pmezard/go-difflib v1.0.0 ## explicit github.com/pmezard/go-difflib/difflib -# github.com/rivo/uniseg v0.4.2 +# github.com/rivo/uniseg v0.4.3 ## explicit; go 1.18 github.com/rivo/uniseg # github.com/sahilm/fuzzy v0.1.0 @@ -295,17 +295,17 @@ golang.org/x/exp/slices golang.org/x/net/context golang.org/x/net/internal/socks golang.org/x/net/proxy -# golang.org/x/sys v0.2.0 +# golang.org/x/sys v0.3.0 ## explicit; go 1.17 golang.org/x/sys/cpu golang.org/x/sys/internal/unsafeheader golang.org/x/sys/plan9 golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/term v0.2.0 +# golang.org/x/term v0.3.0 ## explicit; go 1.17 golang.org/x/term -# golang.org/x/text v0.4.0 +# golang.org/x/text v0.5.0 ## explicit; go 1.17 golang.org/x/text/encoding golang.org/x/text/encoding/internal/identifier From b40190bd945abf98446a618b503dd6e985242784 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 20 Dec 2022 22:18:26 +1100 Subject: [PATCH 2/4] add multi-line commit integration test --- pkg/integration/components/assert.go | 11 ++++++ .../tests/commit/commit_multiline.go | 34 ++++++++++++++++++ pkg/integration/tests/tests.go | 1 + .../expected/repo/.git_keep/index | Bin 425 -> 0 bytes .../expected/repo/.git_keep/logs/HEAD | 5 --- .../repo/.git_keep/logs/refs/heads/master | 5 --- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../17/6069f0ded1db43eecb3b629a6077dba6c68295 | 2 -- .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../2b/173c861df433fa43ffad13f80c8b312c5c8bce | Bin 103 -> 0 bytes .../2f/6174050380438f14b16658a356e762435ca591 | Bin 128 -> 0 bytes .../30/a1ca3481fdec3245b02aeacfb72ddfe2a433be | Bin 154 -> 0 bytes .../37/128a3020849daa0847462d14c384cc74c42ae0 | Bin 149 -> 0 bytes .../39/33a268c502712421b7bfa04888319d6f108574 | Bin 149 -> 0 bytes .../4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f | Bin 21 -> 0 bytes .../57/4013716a7f007a27b647b90cdbc78d006d792b | 2 -- .../9f/1b5440546da24daad7014ccf3e1f4d81f9414b | Bin 148 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 | Bin 21 -> 0 bytes .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../commitMultiline/expected/repo/myfile1 | 1 - .../commitMultiline/expected/repo/myfile2 | 1 - .../commitMultiline/expected/repo/myfile3 | 1 - .../commitMultiline/expected/repo/myfile4 | 1 - .../commitMultiline/expected/repo/myfile5 | 1 - .../commitMultiline/recording.json | 1 - test/integration/commitMultiline/setup.sh | 24 ------------- test/integration/commitMultiline/test.json | 4 --- .../expected/repo/.git_keep/COMMIT_EDITMSG | 0 .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 0 .../expected/repo/.git_keep/config | 4 +++ .../expected/repo/.git_keep/description | 0 .../expected/repo/.git_keep/index | Bin 0 -> 137 bytes .../expected/repo/.git_keep/info/exclude | 0 .../expected/repo/.git_keep/logs/HEAD | 1 + .../repo/.git_keep/logs/refs/heads/master | 1 + .../0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 | Bin 0 -> 51 bytes .../ad/a5661567ddf0a64f589cad3cd0cffd7e79af99 | Bin 0 -> 30 bytes .../f5/b4b9b810f0c3d13754db99d24b04de451f8cec | Bin 0 -> 128 bytes .../expected/repo/.git_keep/refs/heads/master | 1 + .../commit_multiline/expected/repo/myfile | 1 + 44 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 pkg/integration/tests/commit/commit_multiline.go delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/index delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/17/6069f0ded1db43eecb3b629a6077dba6c68295 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/37/128a3020849daa0847462d14c384cc74c42ae0 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/commitMultiline/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/commitMultiline/expected/repo/myfile1 delete mode 100644 test/integration/commitMultiline/expected/repo/myfile2 delete mode 100644 test/integration/commitMultiline/expected/repo/myfile3 delete mode 100644 test/integration/commitMultiline/expected/repo/myfile4 delete mode 100644 test/integration/commitMultiline/expected/repo/myfile5 delete mode 100644 test/integration/commitMultiline/recording.json delete mode 100644 test/integration/commitMultiline/setup.sh delete mode 100644 test/integration/commitMultiline/test.json rename test/{integration/commitMultiline => integration_new/commit/commit_multiline}/expected/repo/.git_keep/COMMIT_EDITMSG (100%) rename test/{integration/commitMultiline => integration_new/commit/commit_multiline}/expected/repo/.git_keep/FETCH_HEAD (100%) rename test/{integration/commitMultiline => integration_new/commit/commit_multiline}/expected/repo/.git_keep/HEAD (100%) rename test/{integration/commitMultiline => integration_new/commit/commit_multiline}/expected/repo/.git_keep/config (74%) rename test/{integration/commitMultiline => integration_new/commit/commit_multiline}/expected/repo/.git_keep/description (100%) create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/index rename test/{integration/commitMultiline => integration_new/commit/commit_multiline}/expected/repo/.git_keep/info/exclude (100%) create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/ad/a5661567ddf0a64f589cad3cd0cffd7e79af99 create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/f5/b4b9b810f0c3d13754db99d24b04de451f8cec create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/refs/heads/master create mode 100644 test/integration_new/commit/commit_multiline/expected/repo/myfile diff --git a/pkg/integration/components/assert.go b/pkg/integration/components/assert.go index c911dbefa..3ce842ebf 100644 --- a/pkg/integration/components/assert.go +++ b/pkg/integration/components/assert.go @@ -2,6 +2,7 @@ package components import ( "fmt" + "regexp" "strings" "time" @@ -56,6 +57,16 @@ func NotContains(target string) *matcher { }} } +func MatchesRegexp(regexStr string) *matcher { + return &matcher{testFn: func(value string) (bool, string) { + matched, err := regexp.MatchString(regexStr, value) + if err != nil { + return false, fmt.Sprintf("Unexpected error parsing regular expression '%s': %s", regexStr, err.Error()) + } + return matched, fmt.Sprintf("Expected '%s' to match regular expression '%s'", value, regexStr) + }} +} + func Equals(target string) *matcher { return &matcher{testFn: func(value string) (bool, string) { return target == value, fmt.Sprintf("Expected '%s' to equal '%s'", value, target) diff --git a/pkg/integration/tests/commit/commit_multiline.go b/pkg/integration/tests/commit/commit_multiline.go new file mode 100644 index 000000000..f6472dd33 --- /dev/null +++ b/pkg/integration/tests/commit/commit_multiline.go @@ -0,0 +1,34 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CommitMultiline = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Commit with a multi-line commit message", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFile("myfile", "myfile content") + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + assert.CommitCount(0) + + input.PrimaryAction() + input.PressKeys(keys.Files.CommitChanges) + + input.Type("first line") + input.PressKeys(keys.Universal.AppendNewline) + input.PressKeys(keys.Universal.AppendNewline) + input.Type("third line") + input.Confirm() + + assert.CommitCount(1) + assert.MatchHeadCommitMessage(Equals("first line")) + + input.SwitchToCommitsWindow() + assert.MatchMainViewContent(MatchesRegexp("first line\n\\s*\n\\s*third line")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 9e48ed0fc..e1a23bb14 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -36,6 +36,7 @@ var tests = []*components.IntegrationTest{ cherry_pick.CherryPick, cherry_pick.CherryPickConflicts, commit.Commit, + commit.CommitMultiline, commit.NewBranch, commit.Staged, commit.Unstaged, diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/index b/test/integration/commitMultiline/expected/repo/.git_keep/index deleted file mode 100644 index a08b4116ed82b32096ee3fb2e1be7b23fe2eb599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmZ?q402{*U|<4b)+EtqW&D8}f-ss9D8>|R&(6TmxP*a$@heb`2oSR^-ShabYU+(I z5us5$`A!!Cyjr@iGO*`Xre)@&8Uhu7^b5rE=D}#FIdbUcNbvkHYEasD?&YdQ;Z^-D zue9e|sKd-Lf|?`PaPud~91smPM<3ms``NtOXUd+v;XkEtNL|3oUt`x1X_z_2P;-Q4 zEK>)W1EQhkIG~$z$>ivR@P9_f%3h_vIBoGIDfZUu5STe8P;-P=7_))Q0nt!%0@2O! zH_4Z}x=U01mLlh)SBpN~-`)0+A7+jz(43GUS63h<$zZBrz-6%Tlu6^?H%6`-v|gRx gu6zH{661a4-2Q_5a=%XHJ)>KEYI;eh3X8;a0Nc-oga7~l diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/logs/HEAD b/test/integration/commitMultiline/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 88b99d1ab..000000000 --- a/test/integration/commitMultiline/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 176069f0ded1db43eecb3b629a6077dba6c68295 CI 1645602422 +1100 commit (initial): myfile1 -176069f0ded1db43eecb3b629a6077dba6c68295 9f1b5440546da24daad7014ccf3e1f4d81f9414b CI 1645602422 +1100 commit: myfile2 -9f1b5440546da24daad7014ccf3e1f4d81f9414b 3933a268c502712421b7bfa04888319d6f108574 CI 1645602422 +1100 commit: myfile3 -3933a268c502712421b7bfa04888319d6f108574 37128a3020849daa0847462d14c384cc74c42ae0 CI 1645602422 +1100 commit: myfile4 -37128a3020849daa0847462d14c384cc74c42ae0 574013716a7f007a27b647b90cdbc78d006d792b CI 1645602427 +1100 commit: first line diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/commitMultiline/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 88b99d1ab..000000000 --- a/test/integration/commitMultiline/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 176069f0ded1db43eecb3b629a6077dba6c68295 CI 1645602422 +1100 commit (initial): myfile1 -176069f0ded1db43eecb3b629a6077dba6c68295 9f1b5440546da24daad7014ccf3e1f4d81f9414b CI 1645602422 +1100 commit: myfile2 -9f1b5440546da24daad7014ccf3e1f4d81f9414b 3933a268c502712421b7bfa04888319d6f108574 CI 1645602422 +1100 commit: myfile3 -3933a268c502712421b7bfa04888319d6f108574 37128a3020849daa0847462d14c384cc74c42ae0 CI 1645602422 +1100 commit: myfile4 -37128a3020849daa0847462d14c384cc74c42ae0 574013716a7f007a27b647b90cdbc78d006d792b CI 1645602427 +1100 commit: first line diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/commitMultiline/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f98100d24e67455a3cfa8497adaccc7a422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;s>7Fl8__FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL J8UTCqE3ZN5G4lWb diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba89b96ad2e268134913bd913a0bc46d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7F<>w>FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL i8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR{Q5NjxpS$UUzB diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/commitMultiline/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be deleted file mode 100644 index aca754d63288ea16d4cd69754eac3b0cba133abe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0V^p=O;s>7H)Sw1FfcPQQOK=K%gjkNWLUcA@n6-{8($(qqj>V2E(CbB zbYDeLV#FZ9^TVh?Y2Ue*s}_Y<^|!pzo^PR!qQsctem1Z6nX+eZ_)jSuQWx;@*VuJL z8byf-!zGiW55oT$9V>g4{^GR7m!#NRuR~Cjm@@dA~0be5qjz~(zwAwV@rvkzqe2DI?TY7wY9lh zOmynIs&!Q`5HR=%d-=aM<0+48QhZhi7TJBfwC1$5+a3RBHMF-DK+ zAr&EVAd}zyx$brt?R6OM`pIou^itM#vna#@N9*hv5x^YunCkkcZrZobi<0>PFtRse DAMi_! diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/39/33a268c502712421b7bfa04888319d6f108574 deleted file mode 100644 index 4195b00e1096723a64cb6d9c0a23e72ca2ec816d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaA93c@fD06pgwxeJm_HfahXLQj3hX0wY0V@rvkzqe2DG%(Czcx`Rz z7DhbvUBvnVL*SgCDu$qhL6s^5&5m;k;5i;-F&pjj>ULBp5z$3Vl{{9WIygXP4FZZa zgN_JT488kf-R(5n>onixLv4G?h1YhokT53a(R+IaaLyd|nCkLpZrWFurv&o@F&#SD Dq})TL diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/commitMultiline/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815cfa19b4d357807bedcbb2277b2e3ba8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb{;fo08o?%QUCw| diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b b/test/integration/commitMultiline/expected/repo/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b deleted file mode 100644 index d675c1840..000000000 --- a/test/integration/commitMultiline/expected/repo/.git_keep/objects/57/4013716a7f007a27b647b90cdbc78d006d792b +++ /dev/null @@ -1,2 +0,0 @@ -xK -0 D)/YVbJ)dc(B 7 t5c뚫E.Z=E7%Ԍ,0IQEj}pB.1H|$@Buދ{~x=ɾ>ki :`NzL]9_!? \ No newline at end of file diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b b/test/integration/commitMultiline/expected/repo/.git_keep/objects/9f/1b5440546da24daad7014ccf3e1f4d81f9414b deleted file mode 100644 index 9ea933b39bf38475d9bc5ace7c9fda421a30164d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAJ3c@fDKwak)*$Xl=NhbzGgsyswd?r|EOeqoc_T~s~AMe3St=6?` z^!C&b5gnYd7$#pJXOZIB3;Pn;@RgV|QG`MkS?%GF*9aZM5Fks&9IX*a(L^R67@W&7 za2lnbRCxDiJM_Hh+q^vF6Y9RnCAE6j$aZ2NOQg?;0BX=N)#XoJ)o)ohA@u{{XgWsx CE<|zw diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/commitMultiline/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2fecf1c45a132dfe3a8758952f3c8d968..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb}lpN08nuUO8@`> diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/commitMultiline/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/refs/heads/master b/test/integration/commitMultiline/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index c44ada3dd..000000000 --- a/test/integration/commitMultiline/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -574013716a7f007a27b647b90cdbc78d006d792b diff --git a/test/integration/commitMultiline/expected/repo/myfile1 b/test/integration/commitMultiline/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/commitMultiline/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/commitMultiline/expected/repo/myfile2 b/test/integration/commitMultiline/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/commitMultiline/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/commitMultiline/expected/repo/myfile3 b/test/integration/commitMultiline/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/commitMultiline/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/commitMultiline/expected/repo/myfile4 b/test/integration/commitMultiline/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/commitMultiline/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/commitMultiline/expected/repo/myfile5 b/test/integration/commitMultiline/expected/repo/myfile5 deleted file mode 100644 index 4f346f1ad..000000000 --- a/test/integration/commitMultiline/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test5 diff --git a/test/integration/commitMultiline/recording.json b/test/integration/commitMultiline/recording.json deleted file mode 100644 index bb0d16af6..000000000 --- a/test/integration/commitMultiline/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":931,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1467,"Mod":0,"Key":256,"Ch":99},{"Timestamp":2035,"Mod":0,"Key":256,"Ch":102},{"Timestamp":2090,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2162,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2259,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2314,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2411,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2546,"Mod":0,"Key":256,"Ch":108},{"Timestamp":2578,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2627,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2691,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3358,"Mod":4,"Key":13,"Ch":13},{"Timestamp":3577,"Mod":4,"Key":13,"Ch":13},{"Timestamp":3810,"Mod":0,"Key":256,"Ch":116},{"Timestamp":3874,"Mod":0,"Key":256,"Ch":104},{"Timestamp":3914,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3986,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4107,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4195,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4291,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4322,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4370,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4426,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4603,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5267,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/commitMultiline/setup.sh b/test/integration/commitMultiline/setup.sh deleted file mode 100644 index c6c6a9271..000000000 --- a/test/integration/commitMultiline/setup.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" -echo test5 > myfile5 diff --git a/test/integration/commitMultiline/test.json b/test/integration/commitMultiline/test.json deleted file mode 100644 index 5ac0bb1f5..000000000 --- a/test/integration/commitMultiline/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "stage a file and commit the change with a multiline commit message", - "speed": 15 -} diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/COMMIT_EDITMSG similarity index 100% rename from test/integration/commitMultiline/expected/repo/.git_keep/COMMIT_EDITMSG rename to test/integration_new/commit/commit_multiline/expected/repo/.git_keep/COMMIT_EDITMSG diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/commitMultiline/expected/repo/.git_keep/FETCH_HEAD rename to test/integration_new/commit/commit_multiline/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/HEAD b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/HEAD similarity index 100% rename from test/integration/commitMultiline/expected/repo/.git_keep/HEAD rename to test/integration_new/commit/commit_multiline/expected/repo/.git_keep/HEAD diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/config b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/config similarity index 74% rename from test/integration/commitMultiline/expected/repo/.git_keep/config rename to test/integration_new/commit/commit_multiline/expected/repo/.git_keep/config index 8ae104545..1723dc5b9 100644 --- a/test/integration/commitMultiline/expected/repo/.git_keep/config +++ b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/config @@ -8,3 +8,7 @@ [user] email = CI@example.com name = CI +[commit] + gpgSign = false +[protocol "file"] + allow = always diff --git a/test/integration/commitMultiline/expected/repo/.git_keep/description b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/description similarity index 100% rename from test/integration/commitMultiline/expected/repo/.git_keep/description rename to test/integration_new/commit/commit_multiline/expected/repo/.git_keep/description diff --git a/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/index b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..0d114f768726e8ddbdf38681466b4c355c6f7fe6 GIT binary patch literal 137 zcmZ?q402{*U|<4b#^i-F+5{O3a$z(h0|OU(PY@piL*o*l^jDx75g_JUyEIKS{qBcl z{tUVNRX>5kdkCDR50M;an8JdH0FxzN 1671534726 +1100 commit (initial): first line diff --git a/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..b5d6fc0c7 --- /dev/null +++ b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 f5b4b9b810f0c3d13754db99d24b04de451f8cec CI 1671534726 +1100 commit (initial): first line diff --git a/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 new file mode 100644 index 0000000000000000000000000000000000000000..79af4f45f798b3b47d9f64165886623304a60f87 GIT binary patch literal 51 zcmV-30L=e*0V^p=O;s>9VK6i>Ff%bx$gNDv%t>WfyEIKS{qBcl{t$ Date: Tue, 20 Dec 2022 22:31:59 +1100 Subject: [PATCH 3/4] add commit revert integration test --- pkg/integration/components/assert.go | 17 ++++++++ pkg/integration/tests/commit/revert.go | 37 ++++++++++++++++++ pkg/integration/tests/tests.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 ----- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 279 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 ---- .../expected/repo/.git_keep/logs/HEAD | 5 --- .../repo/.git_keep/logs/refs/heads/master | 5 --- .../17/27eeb6864e52a8967a1a494099359dbdfcc235 | Bin 147 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 | Bin 50 -> 0 bytes .../38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da | Bin 21 -> 0 bytes .../3a/1ee58e5736049ad5b9266715d3642614816c1f | 2 - .../7e/03c9a9538a907c936de5c9a2154707b9ee541c | 4 -- .../9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c | Bin 101 -> 0 bytes .../9e/aae8f342ca71c060b760870a715a6303905935 | Bin 118 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../ab/15072795e72a2061bc40060494c3ca2138b297 | Bin 196 -> 0 bytes .../b7/81ffd3aa940dde39f73c9149b67e2b128de085 | 2 - .../d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 | 2 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../commitsRevert/expected/repo/file0 | 1 - .../commitsRevert/expected/repo/file2 | 1 - test/integration/commitsRevert/recording.json | 1 - test/integration/commitsRevert/setup.sh | 22 ----------- test/integration/commitsRevert/test.json | 1 - 30 files changed, 55 insertions(+), 67 deletions(-) create mode 100644 pkg/integration/tests/commit/revert.go delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/config delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/description delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/index delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 delete mode 100644 test/integration/commitsRevert/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/commitsRevert/expected/repo/file0 delete mode 100644 test/integration/commitsRevert/expected/repo/file2 delete mode 100644 test/integration/commitsRevert/recording.json delete mode 100644 test/integration/commitsRevert/setup.sh delete mode 100644 test/integration/commitsRevert/test.json diff --git a/pkg/integration/components/assert.go b/pkg/integration/components/assert.go index 3ce842ebf..65e3e6ec9 100644 --- a/pkg/integration/components/assert.go +++ b/pkg/integration/components/assert.go @@ -2,6 +2,7 @@ package components import ( "fmt" + "os" "regexp" "strings" "time" @@ -259,3 +260,19 @@ func (self *Assert) assertWithRetries(test func() (bool, string)) { func (self *Assert) Fail(message string) { self.gui.Fail(message) } + +// This does _not_ check the files panel, it actually checks the filesystem +func (self *Assert) FileSystemPathPresent(path string) { + self.assertWithRetries(func() (bool, string) { + _, err := os.Stat(path) + return err == nil, fmt.Sprintf("Expected path '%s' to exist, but it does not", path) + }) +} + +// This does _not_ check the files panel, it actually checks the filesystem +func (self *Assert) FileSystemPathNotPresent(path string) { + self.assertWithRetries(func() (bool, string) { + _, err := os.Stat(path) + return os.IsNotExist(err), fmt.Sprintf("Expected path '%s' to not exist, but it does", path) + }) +} diff --git a/pkg/integration/tests/commit/revert.go b/pkg/integration/tests/commit/revert.go new file mode 100644 index 000000000..c42c7af53 --- /dev/null +++ b/pkg/integration/tests/commit/revert.go @@ -0,0 +1,37 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Revert = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reverts a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFile("myfile", "myfile content") + shell.GitAddAll() + shell.Commit("first commit") + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + assert.CommitCount(1) + + input.SwitchToCommitsWindow() + + input.PressKeys(keys.Commits.RevertCommit) + assert.InConfirm() + assert.MatchCurrentViewTitle(Equals("Revert commit")) + assert.MatchCurrentViewContent(MatchesRegexp("Are you sure you want to revert \\w+?")) + input.Confirm() + + assert.CommitCount(2) + assert.MatchHeadCommitMessage(Contains("Revert \"first commit\"")) + input.PreviousItem() + assert.MatchMainViewContent(Contains("-myfile content")) + assert.FileSystemPathNotPresent("myfile") + + input.Wait(10) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index e1a23bb14..bad90f0cc 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -37,6 +37,7 @@ var tests = []*components.IntegrationTest{ cherry_pick.CherryPickConflicts, commit.Commit, commit.CommitMultiline, + commit.Revert, commit.NewBranch, commit.Staged, commit.Unstaged, diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/commitsRevert/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index a04a59a53..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -revert commit diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/FETCH_HEAD b/test/integration/commitsRevert/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/HEAD b/test/integration/commitsRevert/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/config b/test/integration/commitsRevert/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[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/commitsRevert/expected/repo/.git_keep/description b/test/integration/commitsRevert/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/index b/test/integration/commitsRevert/expected/repo/.git_keep/index deleted file mode 100644 index fabd517d85e3c8692aa194062825870606c948d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmZ?q402{*U|<5_#1F+sb(T&n1ku{&3Wkgf46ICQ?2QZzjY}997{3D5hyXF0g^1Oa z1^=|Ry$e3{zH{l#M|-E5-eO=)%gjkN07^43fb{F}1~`MwTesF1YEBcnITAcSj2e{o zoqM@zQFv8<%PZ~q7U~dljKJoE1i88b8IlY}3I<$Oa!>oh%~)n#-Kmx?dO1Z+q%lW6 z$Tbw?csr2Qh75)V24*HEFv@^o>7K`bRa0+#i3pA2$#=RC;MLN76`R 1643148217 +1100 commit (initial): file0 -9eaae8f342ca71c060b760870a715a6303905935 1727eeb6864e52a8967a1a494099359dbdfcc235 CI 1643148217 +1100 commit: file1 -1727eeb6864e52a8967a1a494099359dbdfcc235 b781ffd3aa940dde39f73c9149b67e2b128de085 CI 1643148217 +1100 commit: file2 -b781ffd3aa940dde39f73c9149b67e2b128de085 ab15072795e72a2061bc40060494c3ca2138b297 CI 1643148219 +1100 revert: Revert "file1" -ab15072795e72a2061bc40060494c3ca2138b297 7e03c9a9538a907c936de5c9a2154707b9ee541c CI 1643148227 +1100 commit (amend): revert commit diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/commitsRevert/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d82a2c6a4..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 9eaae8f342ca71c060b760870a715a6303905935 CI 1643148217 +1100 commit (initial): file0 -9eaae8f342ca71c060b760870a715a6303905935 1727eeb6864e52a8967a1a494099359dbdfcc235 CI 1643148217 +1100 commit: file1 -1727eeb6864e52a8967a1a494099359dbdfcc235 b781ffd3aa940dde39f73c9149b67e2b128de085 CI 1643148217 +1100 commit: file2 -b781ffd3aa940dde39f73c9149b67e2b128de085 ab15072795e72a2061bc40060494c3ca2138b297 CI 1643148219 +1100 revert: Revert "file1" -ab15072795e72a2061bc40060494c3ca2138b297 7e03c9a9538a907c936de5c9a2154707b9ee541c CI 1643148227 +1100 commit (amend): revert commit diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/17/27eeb6864e52a8967a1a494099359dbdfcc235 deleted file mode 100644 index 59a43062417fc529602610bcd28cbe4aee322cab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0ga9^3d1lA06Y5?-U~&tY&nKf3Yqc@MUiPBX+m(J&u^a4@s1l#w{@MH z#}Y2>F!K{+RxPSfL`A|xTu04PQk}>G0ml+KqTA)Lck{(Wtg94*N=5~SF*9@-PD;WA zR3H^fPCo6m9ljs@y&s~ZE#08nZNMgRZ+ diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67fdecb0f0cffca7ff27b2ae5c031e4d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U I033l4YT~68jQ{`u diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/commitsRevert/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d7a8ed6841ce407bd6bb15235c8fa15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb|y2)08mZ`J^%m! diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f b/test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f deleted file mode 100644 index 2d68564f5..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/objects/3a/1ee58e5736049ad5b9266715d3642614816c1f +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H -$x~5(;rբW-9 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c b/test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c deleted file mode 100644 index fea4aa6be..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/objects/7e/03c9a9538a907c936de5c9a2154707b9ee541c +++ /dev/null @@ -1,4 +0,0 @@ -x}K -1]$O'AY1`!DmQxym6@IytDf:M҄Xl -ȡ-"4)c[Z1Y -PMHX%TV縮y;Χ3 * pDRt?5O_|3< \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06dda15fe1901a7942e7954b700b36bfa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmV-r0Gj`J0V^p=O;xb8WH2-^Ff%bxNXyJgHDIt1vAVM0pVqc_!H3>=F1`6^?^M%U zND2%YmhO4{S2gv2WLwJR>kD diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/9e/aae8f342ca71c060b760870a715a6303905935 deleted file mode 100644 index dfcaf39be7ad3008ab5b768e9c6dafa58fbf03d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmV-+0Ez#20gcT;3c@fDMq$@E#q0%{NynrC5uvLdBWeC%p&_M2@c8x!ZXX}KrPaE2 z64gsT01^yvK7|l+lDl^?3&3M4TG*ysY=8z;YvQNB+draXN^O YRy`~^A08nuUMF0Q* diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/ab/15072795e72a2061bc40060494c3ca2138b297 deleted file mode 100644 index 28a9eaf41b29f9aa55aca000b0a6cd7fc406e9bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmV;#06YJ90gaAJYC|y$0K4`nM7D)s`6F9UN+GLkOD`bXGI@}f7aX_r_ZA_d9s0}#lns#VQij)BMcd-VmEggdYe#E#@?G3;b2=+&pr9d z7`RYUSJ36AHb*0$^Rf*%o#Ewle$#JR?^iw6ZG8o#;P5_K{m@y;kSr(fj}-p-ugO6=84y diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 deleted file mode 100644 index c32d4b681..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/objects/b7/81ffd3aa940dde39f73c9149b67e2b128de085 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] & "tcL [Jo /I8Z֊r@ " F"9Pp).9JAk;44?}_VGQ_Q'=\9 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/commitsRevert/expected/repo/.git_keep/refs/heads/master b/test/integration/commitsRevert/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 7edf473fd..000000000 --- a/test/integration/commitsRevert/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -7e03c9a9538a907c936de5c9a2154707b9ee541c diff --git a/test/integration/commitsRevert/expected/repo/file0 b/test/integration/commitsRevert/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/commitsRevert/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/commitsRevert/expected/repo/file2 b/test/integration/commitsRevert/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/commitsRevert/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/commitsRevert/recording.json b/test/integration/commitsRevert/recording.json deleted file mode 100644 index 80125e840..000000000 --- a/test/integration/commitsRevert/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":614,"Mod":0,"Key":259,"Ch":0},{"Timestamp":749,"Mod":0,"Key":259,"Ch":0},{"Timestamp":980,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1219,"Mod":0,"Key":256,"Ch":116},{"Timestamp":1854,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2469,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2725,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3892,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5421,"Mod":2,"Key":21,"Ch":21},{"Timestamp":5854,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6197,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6469,"Mod":2,"Key":21,"Ch":21},{"Timestamp":6781,"Mod":2,"Key":21,"Ch":21},{"Timestamp":7078,"Mod":2,"Key":21,"Ch":21},{"Timestamp":7907,"Mod":0,"Key":256,"Ch":114},{"Timestamp":7989,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8148,"Mod":0,"Key":256,"Ch":118},{"Timestamp":8285,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8356,"Mod":0,"Key":256,"Ch":114},{"Timestamp":8493,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8700,"Mod":0,"Key":256,"Ch":102},{"Timestamp":9125,"Mod":0,"Key":127,"Ch":127},{"Timestamp":9189,"Mod":0,"Key":256,"Ch":99},{"Timestamp":9317,"Mod":0,"Key":256,"Ch":111},{"Timestamp":9509,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9637,"Mod":0,"Key":256,"Ch":109},{"Timestamp":9685,"Mod":0,"Key":256,"Ch":105},{"Timestamp":9781,"Mod":0,"Key":256,"Ch":116},{"Timestamp":9918,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11110,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/commitsRevert/setup.sh b/test/integration/commitsRevert/setup.sh deleted file mode 100644 index 4e35cf543..000000000 --- a/test/integration/commitsRevert/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -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 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 diff --git a/test/integration/commitsRevert/test.json b/test/integration/commitsRevert/test.json deleted file mode 100644 index d760dcc6c..000000000 --- a/test/integration/commitsRevert/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Reverting a commit. Note here that our snapshot test fails if the commit SHA is included in the message hence the renaming of the revert commit after creating it", "speed": 20 } From e3c67385359ba03ce4c95f9ec3275d7524f69020 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 20 Dec 2022 22:40:14 +1100 Subject: [PATCH 4/4] remove snapshot approach for new integration tests --- pkg/integration/README.md | 12 +- pkg/integration/clients/cli.go | 25 +- pkg/integration/clients/go_test.go | 2 +- pkg/integration/clients/tui.go | 14 +- pkg/integration/components/runner.go | 31 +- pkg/integration/components/snapshot.go | 372 ------------------ .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../basic/expected/repo/.git_keep/FETCH_HEAD | 0 .../bisect/basic/expected/repo/.git_keep/HEAD | 1 - .../basic/expected/repo/.git_keep/config | 12 - .../basic/expected/repo/.git_keep/description | 1 - .../basic/expected/repo/.git_keep/index | Bin 866 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../basic/expected/repo/.git_keep/logs/HEAD | 13 - .../repo/.git_keep/logs/refs/heads/master | 10 - .../06/47fe4b7302efbfb235b8f0681b592cc3389d36 | Bin 30 -> 0 bytes .../08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c | Bin 212 -> 0 bytes .../0c/e746de5bee98147a370a19b4568b448fdedfcc | Bin 147 -> 0 bytes .../0f/77bf7bd7dd91550c927549af82d5b7c6f8a0d7 | 4 - .../17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c | Bin 30 -> 0 bytes .../18/197bb6052becf371aca9ab58d8352cebd3bc29 | 2 - .../30/ad007c4cb09b175810e069b1b2b02ab0140857 | Bin 30 -> 0 bytes .../31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 | Bin 186 -> 0 bytes .../35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 | Bin 133 -> 0 bytes .../37/6048ba8da4b619088a7f4a5df3f528fde41f1a | 2 - .../3b/f868a389d0073e715e848f0ee33d71064539ca | Bin 30 -> 0 bytes .../47/d78ad7a27fc7fe483389512ebf7ea34c5514bc | Bin 30 -> 0 bytes .../48/3fcff024ff52df164dddea9ab5032370d14228 | Bin 148 -> 0 bytes .../50/d561270fcfcdc9afc85f6136f937c529accaaa | Bin 30 -> 0 bytes .../55/3197193920043fb04f3e39e825916990955204 | Bin 55 -> 0 bytes .../67/0ea6605e6780007c543b3d034bcf49c898290d | Bin 147 -> 0 bytes .../68/5d0baa299ec29ff2c7a1ca9268abdd374adef2 | Bin 147 -> 0 bytes .../8d/49129429cacbb6694f0290b3219e91a6f364cd | Bin 30 -> 0 bytes .../a0/2c4b36b68df7081152282cf1aabcab7b24e69b | Bin 81 -> 0 bytes .../a8/3ada2a0a285982aaa96baeddb70135532ed004 | Bin 149 -> 0 bytes .../a8/9b19d40efb59f1f77b5a6b59ed1a9898545d0d | 2 - .../b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 | 1 - .../bf/2b038a7c59d4db31a492793086fafec802ec2f | Bin 30 -> 0 bytes .../c2/55cf4ef7fd5661a9d68b717243a978e42b05ac | Bin 30 -> 0 bytes .../cf/b438e7991d830d830d58744b99cff451a9d07e | Bin 265 -> 0 bytes .../d4/308139592744ccc7fa9ab0931812da9fdfcc1d | Bin 148 -> 0 bytes .../e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 | Bin 160 -> 0 bytes .../e6/db1f58c2bb5ead41049a8ef3910360eead21e2 | Bin 108 -> 0 bytes .../f2/c01a881661486f147e47f5be82914c5d0c0030 | Bin 30 -> 0 bytes .../f3/f9cf9d8f02f35f955b868d277913fc45d724db | Bin 148 -> 0 bytes .../basic/expected/repo/.git_keep/packed-refs | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../bisect/basic/expected/repo/file01.txt | 1 - .../bisect/basic/expected/repo/file02.txt | 1 - .../bisect/basic/expected/repo/file03.txt | 1 - .../bisect/basic/expected/repo/file04.txt | 1 - .../bisect/basic/expected/repo/file05.txt | 1 - .../bisect/basic/expected/repo/file06.txt | 1 - .../bisect/basic/expected/repo/file07.txt | 1 - .../bisect/basic/expected/repo/file08.txt | 1 - .../bisect/basic/expected/repo/file09.txt | 1 - .../bisect/basic/expected/repo/file10.txt | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 15 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../repo/.git_keep/logs/refs/heads/other | 11 - .../06/47fe4b7302efbfb235b8f0681b592cc3389d36 | Bin 30 -> 0 bytes .../08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c | Bin 212 -> 0 bytes .../0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 | Bin 148 -> 0 bytes .../17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c | Bin 30 -> 0 bytes .../30/ad007c4cb09b175810e069b1b2b02ab0140857 | Bin 30 -> 0 bytes .../31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 | Bin 186 -> 0 bytes .../35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 | Bin 133 -> 0 bytes .../37/6048ba8da4b619088a7f4a5df3f528fde41f1a | 2 - .../3a/899150d167edb02f0ef2ab43bf446d23d90310 | Bin 146 -> 0 bytes .../3b/f868a389d0073e715e848f0ee33d71064539ca | Bin 30 -> 0 bytes .../41/bffcc8f25d268518574e91483a55e66124574c | Bin 148 -> 0 bytes .../47/d78ad7a27fc7fe483389512ebf7ea34c5514bc | Bin 30 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../50/d561270fcfcdc9afc85f6136f937c529accaaa | Bin 30 -> 0 bytes .../55/3197193920043fb04f3e39e825916990955204 | Bin 55 -> 0 bytes .../5c/9b8a0a95c49c1674753ad827246ce05965e7fe | 6 - .../5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d | 3 - .../7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 | Bin 148 -> 0 bytes .../8d/49129429cacbb6694f0290b3219e91a6f364cd | Bin 30 -> 0 bytes .../9c/dece2525ed2b34f940b168a2f628984468a8c6 | Bin 148 -> 0 bytes .../a0/2c4b36b68df7081152282cf1aabcab7b24e69b | Bin 81 -> 0 bytes .../b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 | 1 - .../bf/2b038a7c59d4db31a492793086fafec802ec2f | Bin 30 -> 0 bytes .../c2/55cf4ef7fd5661a9d68b717243a978e42b05ac | Bin 30 -> 0 bytes .../cf/b438e7991d830d830d58744b99cff451a9d07e | Bin 265 -> 0 bytes .../d4/779d400f252d1de4e76ef79e3b4d554fffadb5 | Bin 148 -> 0 bytes .../df/f71e43e297a66eb7ec85b7b95ece827751cdbd | Bin 148 -> 0 bytes .../e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 | Bin 160 -> 0 bytes .../e4/fca3fab85b7a477a2de101e917fe43538e0302 | Bin 148 -> 0 bytes .../e6/db1f58c2bb5ead41049a8ef3910360eead21e2 | Bin 108 -> 0 bytes .../e7/39ef9112312917b4fc678e40e2372cc8fda25f | Bin 147 -> 0 bytes .../f2/c01a881661486f147e47f5be82914c5d0c0030 | Bin 30 -> 0 bytes .../expected/repo/.git_keep/packed-refs | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/heads/other | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../repo/.git_keep/commit-template.txt | 0 .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 305 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 0 .../expected/repo/.git_keep/logs/HEAD | 7 - .../expected/repo/.git_keep/logs/refs/heads/@ | 1 - .../repo/.git_keep/logs/refs/heads/master | 4 - .../repo/.git_keep/logs/refs/heads/new-branch | 1 - .../06/47fe4b7302efbfb235b8f0681b592cc3389d36 | Bin 30 -> 0 bytes .../18/565748bda3ca01a67a92f340705af5a11384ae | 3 - .../3b/f868a389d0073e715e848f0ee33d71064539ca | Bin 30 -> 0 bytes .../47/d78ad7a27fc7fe483389512ebf7ea34c5514bc | Bin 30 -> 0 bytes .../55/3197193920043fb04f3e39e825916990955204 | Bin 55 -> 0 bytes .../6d/69ac71e12a83769fca195d0a714435e1f4661a | 3 - .../95/efd4ea6ed74b904cd8eeeaa6245ec462372f67 | Bin 117 -> 0 bytes .../a0/2c4b36b68df7081152282cf1aabcab7b24e69b | Bin 81 -> 0 bytes .../cf/c66e0e89b1dc11a927cc453dbee025ff03cf83 | 3 - .../e6/db1f58c2bb5ead41049a8ef3910360eead21e2 | Bin 108 -> 0 bytes .../expected/repo/.git_keep/refs/heads/@ | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/new-branch | 1 - .../checkout_by_name/expected/repo/file01.txt | 1 - .../checkout_by_name/expected/repo/file02.txt | 1 - .../checkout_by_name/expected/repo/file03.txt | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../delete/expected/repo/.git_keep/FETCH_HEAD | 0 .../delete/expected/repo/.git_keep/HEAD | 1 - .../delete/expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../delete/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../delete/expected/repo/.git_keep/logs/HEAD | 3 - .../repo/.git_keep/logs/refs/heads/branch-one | 1 - .../repo/.git_keep/logs/refs/heads/branch-two | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../a7/222d091ed91af493b7173e4b09dd2de085031d | Bin 117 -> 0 bytes .../repo/.git_keep/refs/heads/branch-one | 1 - .../repo/.git_keep/refs/heads/branch-two | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../rebase/expected/repo/.git_keep/FETCH_HEAD | 0 .../rebase/expected/repo/.git_keep/HEAD | 1 - .../rebase/expected/repo/.git_keep/MERGE_MSG | 4 - .../rebase/expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/REBASE_HEAD | 1 - .../rebase/expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../rebase/expected/repo/.git_keep/index | Bin 212 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../rebase/expected/repo/.git_keep/logs/HEAD | 13 - .../logs/refs/heads/first-change-branch | 3 - .../.git_keep/logs/refs/heads/original-branch | 4 - .../logs/refs/heads/second-change-branch | 3 - .../00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 | Bin 49 -> 0 bytes .../02/27353d56e56df9e9f94559f90b86ce7aa1ca5c | 2 - .../11/0d6e0b946c9d9b9b5e44c29d98692e925c368c | Bin 48 -> 0 bytes .../16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 | Bin 46 -> 0 bytes .../1f/332f64cb03c06913491af20cd407158776bd55 | Bin 49 -> 0 bytes .../3a/ac30738b0dda38d964abe6c2386603f9309a65 | Bin 43 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../4c/16472189d1db34cb67b99439725202216e26d9 | Bin 41 -> 0 bytes .../4c/66ef64d685d244db41efda29deffb381c46c3d | Bin 148 -> 0 bytes .../55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 | Bin 170 -> 0 bytes .../70/2b646c08ba47b2ac5729deed77188ef1647b4d | 2 - .../ab/1329d5c536f369c741c65fab7cca4ab27dc22e | Bin 85 -> 0 bytes .../b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 | Bin 150 -> 0 bytes .../d7/149d98e6da25303f9a8cdff131da4b0723a412 | Bin 147 -> 0 bytes .../f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 | Bin 154 -> 0 bytes .../.git_keep/refs/heads/first-change-branch | 1 - .../repo/.git_keep/refs/heads/original-branch | 1 - .../.git_keep/refs/heads/second-change-branch | 1 - .../branch/rebase/expected/repo/file | 6 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 212 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 16 - .../logs/refs/heads/first-change-branch | 5 - .../.git_keep/logs/refs/heads/original-branch | 4 - .../logs/refs/heads/second-change-branch | 3 - .../00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 | Bin 49 -> 0 bytes .../11/0d6e0b946c9d9b9b5e44c29d98692e925c368c | Bin 48 -> 0 bytes .../16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 | Bin 46 -> 0 bytes .../1f/332f64cb03c06913491af20cd407158776bd55 | Bin 49 -> 0 bytes .../32/28c73cfc742264f3101966a81d6a0a70488e36 | Bin 167 -> 0 bytes .../39/129f24587bdc648e1fdb6f0b089c0846f54d45 | 2 - .../3a/ac30738b0dda38d964abe6c2386603f9309a65 | Bin 43 -> 0 bytes .../3f/c37a0e51435e01769aa25e6fe7179add2642a6 | Bin 154 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../4c/16472189d1db34cb67b99439725202216e26d9 | Bin 41 -> 0 bytes .../55/87edfe46cfc076fb9ff4db76d196965838669a | 2 - .../7b/e86fe92edea93469924da2c241943adddd27cc | Bin 85 -> 0 bytes .../7c/0af051757503c84800076fd34851ea8b81e415 | Bin 147 -> 0 bytes .../99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 | Bin 152 -> 0 bytes .../9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc | Bin 146 -> 0 bytes .../ab/5816052b05d45683d9fd3aa85203995b66cd65 | Bin 117 -> 0 bytes .../b5/6a14235fe8b10e5cca38d8b8009899d60b6499 | Bin 149 -> 0 bytes .../c0/66f8c513a34cd0c63e54c3b418a50491686cff | Bin 151 -> 0 bytes .../.git_keep/refs/heads/first-change-branch | 1 - .../repo/.git_keep/refs/heads/original-branch | 1 - .../.git_keep/refs/heads/second-change-branch | 1 - .../branch/rebase_and_drop/expected/repo/file | 6 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../reset/expected/repo/.git_keep/FETCH_HEAD | 0 .../branch/reset/expected/repo/.git_keep/HEAD | 1 - .../reset/expected/repo/.git_keep/ORIG_HEAD | 1 - .../reset/expected/repo/.git_keep/config | 14 - .../reset/expected/repo/.git_keep/description | 1 - .../reset/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../reset/expected/repo/.git_keep/logs/HEAD | 6 - .../.git_keep/logs/refs/heads/current-branch | 3 - .../.git_keep/logs/refs/heads/other-branch | 2 - .../0e/9962fc70276ff33de86f77f20ed4482273711a | Bin 155 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../ba/d42488b30daac9e329ccb76a758d78c484a463 | Bin 156 -> 0 bytes .../bc/64902742511e6be6e8d4f6aa90f113ab03f232 | Bin 120 -> 0 bytes .../repo/.git_keep/refs/heads/current-branch | 1 - .../repo/.git_keep/refs/heads/other-branch | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../suggestions/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 - .../expected/repo/.git_keep/description | 1 - .../suggestions/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 8 - .../logs/refs/heads/branch-to-checkout | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../repo/.git_keep/logs/refs/heads/new-branch | 1 - .../.git_keep/logs/refs/heads/new-branch-2 | 1 - .../.git_keep/logs/refs/heads/new-branch-3 | 1 - .../logs/refs/heads/other-new-branch-2 | 1 - .../logs/refs/heads/other-new-branch-3 | 1 - .../16/82dc1949e1937af44b5270fec5c1ac9256c6a1 | Bin 125 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../.git_keep/refs/heads/branch-to-checkout | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/new-branch | 1 - .../repo/.git_keep/refs/heads/new-branch-2 | 1 - .../repo/.git_keep/refs/heads/new-branch-3 | 1 - .../.git_keep/refs/heads/other-new-branch-2 | 1 - .../.git_keep/refs/heads/other-new-branch-3 | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../cherry_pick/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../cherry_pick/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 14 - .../.git_keep/logs/refs/heads/first-branch | 4 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../.git_keep/logs/refs/heads/second-branch | 3 - .../19/7a799a14b2ca7478cfe339e7c83f7cdea4918b | Bin 147 -> 0 bytes .../19/8998809e08270eebeb746d6aed45df9faee6a2 | 2 - .../2b/10745f8823e1d49edc446ea1440d7730a6625b | Bin 146 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../5b/06c6c8d51ba89367991cc7b40dda5d827bb95a | 2 - .../5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f | Bin 151 -> 0 bytes .../9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e | Bin 150 -> 0 bytes .../c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e | Bin 145 -> 0 bytes .../repo/.git_keep/refs/heads/first-branch | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/second-branch | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 15 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 231 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 15 - .../logs/refs/heads/first-change-branch | 3 - .../.git_keep/logs/refs/heads/original-branch | 4 - .../logs/refs/heads/second-change-branch | 3 - .../00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 | Bin 49 -> 0 bytes .../10/91767dde559ffdc97b64f1536955253b931e50 | 3 - .../11/0d6e0b946c9d9b9b5e44c29d98692e925c368c | Bin 48 -> 0 bytes .../16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 | Bin 46 -> 0 bytes .../1f/332f64cb03c06913491af20cd407158776bd55 | Bin 49 -> 0 bytes .../1f/9963859d30c1bfe620e9121f3d689a07a35519 | Bin 147 -> 0 bytes .../2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb | Bin 85 -> 0 bytes .../3a/ac30738b0dda38d964abe6c2386603f9309a65 | Bin 43 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../4c/16472189d1db34cb67b99439725202216e26d9 | Bin 41 -> 0 bytes .../94/8965327ab8404a12fb80d9490ded95969431d1 | Bin 169 -> 0 bytes .../97/7cb37e46b9a00e19e6f99c5c179a30b990ca3d | Bin 151 -> 0 bytes .../ad/9b1c669fdc039038e54fc497f3e888cc4654e0 | Bin 145 -> 0 bytes .../cc/c8b929484ac23c527c54d1a109f20b16f5a006 | 2 - .../da/e6bc03641275886fa12a2a00c01edd6e975d99 | 3 - .../dd/df38b00920854961ad30512b3b174141e877b4 | 2 - .../e0/10d664020f79e46ef7f8bf2a1508fe0864109c | 2 - .../.git_keep/refs/heads/first-change-branch | 1 - .../repo/.git_keep/refs/heads/original-branch | 1 - .../.git_keep/refs/heads/second-change-branch | 1 - .../cherry_pick_conflicts/expected/repo/file | 6 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../commit/expected/repo/.git_keep/FETCH_HEAD | 0 .../commit/expected/repo/.git_keep/HEAD | 1 - .../commit/expected/repo/.git_keep/config | 10 - .../expected/repo/.git_keep/description | 1 - .../commit/expected/repo/.git_keep/index | Bin 209 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../commit/expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../3a/e2df795236e3c84cb1faa242d3268838603515 | Bin 76 -> 0 bytes .../94/4b9ea58bef8f6352c3a081a1d0037125bcaabc | Bin 124 -> 0 bytes .../97/04090f88911a4083ef7d5907e38b9f45e43b16 | Bin 31 -> 0 bytes .../ad/a5661567ddf0a64f589cad3cd0cffd7e79af99 | Bin 30 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../commit/commit/expected/repo/myfile | 1 - .../commit/commit/expected/repo/myfile2 | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 3 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 14 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 | Bin 51 -> 0 bytes .../ad/a5661567ddf0a64f589cad3cd0cffd7e79af99 | Bin 30 -> 0 bytes .../f5/b4b9b810f0c3d13754db99d24b04de451f8cec | Bin 128 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../commit_multiline/expected/repo/myfile | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../new_branch/expected/repo/.git_keep/HEAD | 1 - .../new_branch/expected/repo/.git_keep/config | 10 - .../expected/repo/.git_keep/description | 1 - .../new_branch/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 4 - .../repo/.git_keep/logs/refs/heads/master | 3 - .../.git_keep/logs/refs/heads/my-branch-name | 1 - .../0a/f36e404e6fec1c3a4d887e30622238e5ea0b2b | Bin 147 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../4e/72cd440eec154569568bff8d4c955052ae246c | Bin 118 -> 0 bytes .../56/3414ba32c967cfbe21a17fe892d6118c1c58e8 | 2 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../repo/.git_keep/refs/heads/my-branch-name | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../staged/expected/repo/.git_keep/FETCH_HEAD | 0 .../staged/expected/repo/.git_keep/HEAD | 1 - .../staged/expected/repo/.git_keep/MERGE_RR | 0 .../staged/expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../staged/expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../staged/expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../2c/32ecbb77ddbbb0584ceae9316e290da7733327 | Bin 51 -> 0 bytes .../45/e15f2c1a4f47adeba3dbfc075e46a574f9b1fa | Bin 48 -> 0 bytes .../a0/a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 | 2 - .../a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 | Bin 34 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../commit/staged/expected/repo/myfile | 2 - .../commit/staged/expected/repo/myfile2 | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/MERGE_RR | 0 .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../2c/32ecbb77ddbbb0584ceae9316e290da7733327 | Bin 51 -> 0 bytes .../45/e15f2c1a4f47adeba3dbfc075e46a574f9b1fa | Bin 48 -> 0 bytes .../4a/33e6274dd3bc702442966e6774e7688bb7af64 | Bin 129 -> 0 bytes .../a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 | Bin 34 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../staged_without_hooks/expected/repo/myfile | 2 - .../expected/repo/myfile2 | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../unstaged/expected/repo/.git_keep/HEAD | 1 - .../unstaged/expected/repo/.git_keep/MERGE_RR | 0 .../unstaged/expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../unstaged/expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../00/e2463e8a06d3191bd825531e5dbf26bac22d6b | Bin 31 -> 0 bytes .../10/9e5843c76c640d7075c2897b5720f1714df776 | 2 - .../e7/bcdb57454dacf229e5be8122bb27bb56d78dba | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../commit/unstaged/expected/repo/myfile | 2 - .../commit/unstaged/expected/repo/myfile2 | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/MERGE_RR | 0 .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../00/e2463e8a06d3191bd825531e5dbf26bac22d6b | Bin 31 -> 0 bytes .../e7/bcdb57454dacf229e5be8122bb27bb56d78dba | 1 - .../eb/c03af0e92eb50f1ab1dec0697880ed9da9b02d | Bin 129 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/myfile | 2 - .../expected/repo/myfile2 | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 14 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 225 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 2 - .../repo/.git_keep/logs/refs/heads/master | 2 - .../06/47fe4b7302efbfb235b8f0681b592cc3389d36 | Bin 30 -> 0 bytes .../47/d78ad7a27fc7fe483389512ebf7ea34c5514bc | Bin 30 -> 0 bytes .../4f/a4f5e427373ac4ac0a6e11ff97293649959859 | Bin 117 -> 0 bytes .../55/3197193920043fb04f3e39e825916990955204 | Bin 55 -> 0 bytes .../a0/2c4b36b68df7081152282cf1aabcab7b24e69b | Bin 81 -> 0 bytes .../dd/b8365ff4c367dbd7d49b965ab4b43c865b99cf | 2 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/file01.txt | 1 - .../expected/repo/file02.txt | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../basic/expected/repo/.git_keep/FETCH_HEAD | 0 .../basic/expected/repo/.git_keep/HEAD | 1 - .../basic/expected/repo/.git_keep/config | 10 - .../basic/expected/repo/.git_keep/description | 1 - .../basic/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../basic/expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../fe/47c0cf0521f8864cd0531ddf35d2f741c14abf | Bin 118 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../basic/expected/repo/myfile | 0 .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../form_prompts/expected/repo/.git_keep/HEAD | 1 - .../repo/.git_keep/commit-template.txt | 0 .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 0 .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../46/87e94a43ed02b2ba08f3e6160ee22b92e64413 | 3 - .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../form_prompts/expected/repo/my file | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 4 - .../.git_keep/logs/refs/heads/feature/foo | 1 - .../repo/.git_keep/logs/refs/heads/master | 3 - .../16/919871d6b442beac07e1573c557ca433cff356 | Bin 147 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../af/550d3777f20bf024ad55c9c796e7e85ef32ccb | Bin 146 -> 0 bytes .../d5/0975554a574b9c66e109927fdb4edfb6bbadb3 | 3 - .../repo/.git_keep/refs/heads/feature/foo | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/output.txt | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 6 - .../.git_keep/logs/refs/heads/feature/bar | 2 - .../.git_keep/logs/refs/heads/feature/foo | 2 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../08/3b75d86104b3a7d89d9c355719b2aa9113cab9 | 3 - .../44/531ed59352b290ebe5d6bebeada267dff76fd5 | Bin 116 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../b3/518a56dbbd6df36eff0613aea30ab8e6659b26 | Bin 146 -> 0 bytes .../repo/.git_keep/refs/heads/feature/bar | 1 - .../repo/.git_keep/refs/heads/feature/foo | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 10 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../b9/7a1d7c0e8dceef724220008962f8512a974ff0 | Bin 118 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../multiple_prompts/expected/repo/myfile | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 165 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 1 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../19/102815663d23f8b75a47e7a01965dcdc96468c | Bin 18 -> 0 bytes .../76/3788c33660f53eecaecce8dae27c34e647ac57 | Bin 121 -> 0 bytes .../87/a5800c820f9b267ff243860bceb24b04af76a2 | Bin 49 -> 0 bytes .../a9/63b9597d0f4f0b9995472e5eff3622b136a4b5 | Bin 45 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/dir/file | 1 - .../expected/repo/dir/untracked | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../amend_merge/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../amend_merge/expected/repo/.git_keep/index | Bin 305 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 - .../expected/repo/.git_keep/logs/HEAD | 12 - .../logs/refs/heads/development-branch | 4 - .../.git_keep/logs/refs/heads/feature-branch | 2 - .../34/9e7420fb0fcc3ff740eae5b9dc103a1261558e | Bin 128 -> 0 bytes .../3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 | Bin 123 -> 0 bytes .../3f/891fb57220f67735a13cb5a65d27c8ad388030 | Bin 57 -> 0 bytes .../47/d2739ba2c34690248c8f91b84bb54e8936899a | Bin 27 -> 0 bytes .../63/e06ef6d5baa80461d12e953ee7e75444180d8f | Bin 39 -> 0 bytes .../78/02c86c6ce62289e32aa13d0c85dc3f733195cb | 2 - .../7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 | Bin 36 -> 0 bytes .../7b/d422e3608d9bcfeef85748c90a5ec114fc2c17 | Bin 93 -> 0 bytes .../d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 | Bin 154 -> 0 bytes .../f5/17de66e2a158d4a1d85246611cae9ca23a938d | 2 - .../f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 | 2 - .../.git_keep/refs/heads/development-branch | 1 - .../repo/.git_keep/refs/heads/feature-branch | 1 - .../amend_merge/expected/repo/initial-file | 1 - .../expected/repo/new-feature-file | 1 - .../amend_merge/expected/repo/post-merge-file | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 30 -- .../one/expected/repo/.git_keep/FETCH_HEAD | 0 .../one/expected/repo/.git_keep/HEAD | 1 - .../one/expected/repo/.git_keep/ORIG_HEAD | 1 - .../one/expected/repo/.git_keep/REBASE_HEAD | 1 - .../one/expected/repo/.git_keep/config | 10 - .../one/expected/repo/.git_keep/description | 1 - .../one/expected/repo/.git_keep/index | Bin 460 -> 0 bytes .../one/expected/repo/.git_keep/info/exclude | 7 - .../one/expected/repo/.git_keep/logs/HEAD | 10 - .../repo/.git_keep/logs/refs/heads/master | 6 - .../06/47fe4b7302efbfb235b8f0681b592cc3389d36 | Bin 30 -> 0 bytes .../2e/2cd25ffdec58d32b5d549f8402bd054e22cc2a | 3 - .../35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 | Bin 133 -> 0 bytes .../3b/f868a389d0073e715e848f0ee33d71064539ca | Bin 30 -> 0 bytes .../47/d78ad7a27fc7fe483389512ebf7ea34c5514bc | Bin 30 -> 0 bytes .../55/3197193920043fb04f3e39e825916990955204 | Bin 55 -> 0 bytes .../8a/3839811a7a9f4c678090c9def892d1e7ad7e54 | Bin 147 -> 0 bytes .../90/fda12ce101e7d0d4594a879e5bbd1be3c857a8 | Bin 147 -> 0 bytes .../a0/2c4b36b68df7081152282cf1aabcab7b24e69b | Bin 81 -> 0 bytes .../ab/a3469fd6fc584a6af9c0073873005ffaaea56c | 3 - .../b8/5535ebf12659044c33386376121d76756ceb59 | Bin 222 -> 0 bytes .../c2/55cf4ef7fd5661a9d68b717243a978e42b05ac | Bin 30 -> 0 bytes .../cc/9defb8ae9134f1a9a6c28a0006dc8c8cd78347 | Bin 117 -> 0 bytes .../da/71be1afbb03f46e91ab5de17d69f148bb009f3 | 4 - .../e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 | Bin 160 -> 0 bytes .../e6/db1f58c2bb5ead41049a8ef3910360eead21e2 | Bin 108 -> 0 bytes .../e9/380a3c752e4b7c7e754fc402ce52302795a95a | Bin 134 -> 0 bytes .../f2/c01a881661486f147e47f5be82914c5d0c0030 | Bin 30 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../one/expected/repo/file01.txt | 1 - .../one/expected/repo/file02.txt | 1 - .../one/expected/repo/file03.txt | 1 - .../one/expected/repo/file05.txt | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../rename/expected/repo/.git_keep/FETCH_HEAD | 0 .../stash/rename/expected/repo/.git_keep/HEAD | 1 - .../rename/expected/repo/.git_keep/ORIG_HEAD | 1 - .../repo/.git_keep/commit-template.txt | 0 .../rename/expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../rename/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 0 .../rename/expected/repo/.git_keep/logs/HEAD | 3 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../expected/repo/.git_keep/logs/refs/stash | 2 - .../20/9b9fa9264fa15f128127817f080fd7372050cf | 3 - .../43/a4e12864cee1d7020a6d22772f0be34a24d257 | Bin 162 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../65/d11c8b2d3c173850f337661c9bf264d0406cf1 | 4 - .../71/2f414b554b56ba82d43e1f7a0fe33be7eecc95 | Bin 32 -> 0 bytes .../86/8a798775e91d6387f351add6c5abf06cdb3357 | Bin 51 -> 0 bytes .../a5/272a200897df5558c8cad683c1af14f7184124 | 3 - .../b2/3d362d3fa47c3b1f29c4dd41c419326415122c | Bin 51 -> 0 bytes .../dc/052e9e4df6fe8f66b7e110466e1db8ce104b8b | Bin 32 -> 0 bytes .../de/8f5ed6f8a58664edfbdecd20b75a6ea0633bf6 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../rename/expected/repo/.git_keep/refs/stash | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../stash/expected/repo/.git_keep/FETCH_HEAD | 0 .../stash/stash/expected/repo/.git_keep/HEAD | 1 - .../stash/expected/repo/.git_keep/ORIG_HEAD | 1 - .../stash/expected/repo/.git_keep/config | 12 - .../stash/expected/repo/.git_keep/description | 1 - .../stash/stash/expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../stash/expected/repo/.git_keep/logs/HEAD | 2 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../expected/repo/.git_keep/logs/refs/stash | 1 - .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../6b/584e8ece562ebffc15d38808cd6b98fc3d97ea | Bin 22 -> 0 bytes .../b4/ba8c398d35c204cc9ae06e120c6f0801fd3f32 | 1 - .../c8/6eeda485a49ca608cb2617bb027be66cd92bc3 | Bin 191 -> 0 bytes .../d9/1d06157bdc633d25f970b9cc54d0eb74fb850f | Bin 49 -> 0 bytes .../e6/ed7d5c2198fa4791de9c66e8000da607eaf9a3 | Bin 123 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../stash/expected/repo/.git_keep/refs/stash | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../expected/repo/.git_keep/config | 12 - .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 65 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 6 - .../expected/repo/.git_keep/logs/HEAD | 2 - .../repo/.git_keep/logs/refs/heads/master | 1 - .../expected/repo/.git_keep/logs/refs/stash | 1 - .../03/892119fb6b807d1c13c23f6baacdc4a170e694 | 1 - .../0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 | Bin 147 -> 0 bytes .../18/77c1658e50742642146b3bbb24c6b8635c7b64 | Bin 51 -> 0 bytes .../36/4ac39500dfec09956626a513736d7602b4d64a | Bin 123 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../6b/584e8ece562ebffc15d38808cd6b98fc3d97ea | Bin 22 -> 0 bytes .../8d/147cc9d3f9cf40d1723b9099b98ffdb3727f8b | Bin 167 -> 0 bytes .../dd/e611c48bd5d6df4157b99f524929851b07eca9 | Bin 51 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/stash | 1 - 656 files changed, 20 insertions(+), 1613 deletions(-) delete mode 100644 pkg/integration/components/snapshot.go delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/config delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/description delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/index delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/0c/e746de5bee98147a370a19b4568b448fdedfcc delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/0f/77bf7bd7dd91550c927549af82d5b7c6f8a0d7 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/18/197bb6052becf371aca9ab58d8352cebd3bc29 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/30/ad007c4cb09b175810e069b1b2b02ab0140857 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/48/3fcff024ff52df164dddea9ab5032370d14228 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/50/d561270fcfcdc9afc85f6136f937c529accaaa delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/67/0ea6605e6780007c543b3d034bcf49c898290d delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/68/5d0baa299ec29ff2c7a1ca9268abdd374adef2 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/3ada2a0a285982aaa96baeddb70135532ed004 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/9b19d40efb59f1f77b5a6b59ed1a9898545d0d delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/cf/b438e7991d830d830d58744b99cff451a9d07e delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/d4/308139592744ccc7fa9ab0931812da9fdfcc1d delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/objects/f3/f9cf9d8f02f35f955b868d277913fc45d724db delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/packed-refs delete mode 100644 test/integration_new/bisect/basic/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/bisect/basic/expected/repo/file01.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file02.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file03.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file04.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file05.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file06.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file07.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file08.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file09.txt delete mode 100644 test/integration_new/bisect/basic/expected/repo/file10.txt delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/config delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/description delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/index delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/30/ad007c4cb09b175810e069b1b2b02ab0140857 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/41/bffcc8f25d268518574e91483a55e66124574c delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/50/d561270fcfcdc9afc85f6136f937c529accaaa delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/cf/b438e7991d830d830d58744b99cff451a9d07e delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/d4/779d400f252d1de4e76ef79e3b4d554fffadb5 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/df/f71e43e297a66eb7ec85b7b95ece827751cdbd delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/packed-refs delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/other delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/commit-template.txt delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/config delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/description delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/index delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/@ delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/new-branch delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/18/565748bda3ca01a67a92f340705af5a11384ae delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/6d/69ac71e12a83769fca195d0a714435e1f4661a delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/95/efd4ea6ed74b904cd8eeeaa6245ec462372f67 delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/cf/c66e0e89b1dc11a927cc453dbee025ff03cf83 delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/@ delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/new-branch delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/file01.txt delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/file02.txt delete mode 100644 test/integration_new/branch/checkout_by_name/expected/repo/file03.txt delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/config delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/description delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/index delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-one delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-two delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/objects/a7/222d091ed91af493b7173e4b09dd2de085031d delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/refs/heads/branch-one delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/refs/heads/branch-two delete mode 100644 test/integration_new/branch/delete/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/config delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/description delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/index delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/02/27353d56e56df9e9f94559f90b86ce7aa1ca5c delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/70/2b646c08ba47b2ac5729deed77188ef1647b4d delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/ab/1329d5c536f369c741c65fab7cca4ab27dc22e delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/objects/f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch delete mode 100644 test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch delete mode 100644 test/integration_new/branch/rebase/expected/repo/file delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/32/28c73cfc742264f3101966a81d6a0a70488e36 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/39/129f24587bdc648e1fdb6f0b089c0846f54d45 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch delete mode 100644 test/integration_new/branch/rebase_and_drop/expected/repo/file delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/config delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/description delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/index delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/ba/d42488b30daac9e329ccb76a758d78c484a463 delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch delete mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/config delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/description delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/index delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/branch-to-checkout delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-2 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-3 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-2 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-3 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/objects/16/82dc1949e1937af44b5270fec5c1ac9256c6a1 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/branch-to-checkout delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/new-branch delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/new-branch-2 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/new-branch-3 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/other-new-branch-2 delete mode 100644 test/integration_new/branch/suggestions/expected/repo/.git_keep/refs/heads/other-new-branch-3 delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/config delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/description delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/index delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918b delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/8998809e08270eebeb746d6aed45df9faee6a2 delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/2b/10745f8823e1d49edc446ea1440d7730a6625b delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5b/06c6c8d51ba89367991cc7b40dda5d827bb95a delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/index delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/10/91767dde559ffdc97b64f1536955253b931e50 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/9963859d30c1bfe620e9121f3d689a07a35519 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/94/8965327ab8404a12fb80d9490ded95969431d1 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/97/7cb37e46b9a00e19e6f99c5c179a30b990ca3d delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/ad/9b1c669fdc039038e54fc497f3e888cc4654e0 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/refs/heads/first-change-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/refs/heads/original-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/refs/heads/second-change-branch delete mode 100644 test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/file delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/objects/3a/e2df795236e3c84cb1faa242d3268838603515 delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/objects/94/4b9ea58bef8f6352c3a081a1d0037125bcaabc delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/objects/97/04090f88911a4083ef7d5907e38b9f45e43b16 delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/objects/ad/a5661567ddf0a64f589cad3cd0cffd7e79af99 delete mode 100644 test/integration_new/commit/commit/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/commit/expected/repo/myfile delete mode 100644 test/integration_new/commit/commit/expected/repo/myfile2 delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/ad/a5661567ddf0a64f589cad3cd0cffd7e79af99 delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/f5/b4b9b810f0c3d13754db99d24b04de451f8cec delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/commit_multiline/expected/repo/myfile delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/my-branch-name delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/0a/f36e404e6fec1c3a4d887e30622238e5ea0b2b delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/4e/72cd440eec154569568bff8d4c955052ae246c delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/56/3414ba32c967cfbe21a17fe892d6118c1c58e8 delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/new_branch/expected/repo/.git_keep/refs/heads/my-branch-name delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/MERGE_RR delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/objects/2c/32ecbb77ddbbb0584ceae9316e290da7733327 delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/objects/45/e15f2c1a4f47adeba3dbfc075e46a574f9b1fa delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/objects/a0/a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/objects/a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 delete mode 100644 test/integration_new/commit/staged/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/staged/expected/repo/myfile delete mode 100644 test/integration_new/commit/staged/expected/repo/myfile2 delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/MERGE_RR delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/2c/32ecbb77ddbbb0584ceae9316e290da7733327 delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/45/e15f2c1a4f47adeba3dbfc075e46a574f9b1fa delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/4a/33e6274dd3bc702442966e6774e7688bb7af64 delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/myfile delete mode 100644 test/integration_new/commit/staged_without_hooks/expected/repo/myfile2 delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/MERGE_RR delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/objects/00/e2463e8a06d3191bd825531e5dbf26bac22d6b delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/objects/10/9e5843c76c640d7075c2897b5720f1714df776 delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/objects/e7/bcdb57454dacf229e5be8122bb27bb56d78dba delete mode 100644 test/integration_new/commit/unstaged/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/unstaged/expected/repo/myfile delete mode 100644 test/integration_new/commit/unstaged/expected/repo/myfile2 delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/MERGE_RR delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/config delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/description delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/index delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/objects/00/e2463e8a06d3191bd825531e5dbf26bac22d6b delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/objects/e7/bcdb57454dacf229e5be8122bb27bb56d78dba delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/objects/eb/c03af0e92eb50f1ab1dec0697880ed9da9b02d delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/myfile delete mode 100644 test/integration_new/commit/unstaged_without_hooks/expected/repo/myfile2 delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/config delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/description delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/index delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/4f/a4f5e427373ac4ac0a6e11ff97293649959859 delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/dd/b8365ff4c367dbd7d49b965ab4b43c865b99cf delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/file01.txt delete mode 100644 test/integration_new/config/remote_named_star/expected/repo/file02.txt delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/config delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/description delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/index delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/objects/fe/47c0cf0521f8864cd0531ddf35d2f741c14abf delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/custom_commands/basic/expected/repo/myfile delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/commit-template.txt delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/config delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/description delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/index delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/46/87e94a43ed02b2ba08f3e6160ee22b92e64413 delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/custom_commands/form_prompts/expected/repo/my file delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/config delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/description delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/index delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/feature/foo delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/16/919871d6b442beac07e1573c557ca433cff356 delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/af/550d3777f20bf024ad55c9c796e7e85ef32ccb delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/d5/0975554a574b9c66e109927fdb4edfb6bbadb3 delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/refs/heads/feature/foo delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/custom_commands/menu_from_command/expected/repo/output.txt delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/config delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/description delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/index delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/bar delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/foo delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/08/3b75d86104b3a7d89d9c355719b2aa9113cab9 delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/44/531ed59352b290ebe5d6bebeada267dff76fd5 delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/b3/518a56dbbd6df36eff0613aea30ab8e6659b26 delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/bar delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/foo delete mode 100644 test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/config delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/description delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/index delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/objects/b9/7a1d7c0e8dceef724220008962f8512a974ff0 delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/custom_commands/multiple_prompts/expected/repo/myfile delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/config delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/description delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/index delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/19/102815663d23f8b75a47e7a01965dcdc96468c delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/76/3788c33660f53eecaecce8dae27c34e647ac57 delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/87/a5800c820f9b267ff243860bceb24b04af76a2 delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/a9/63b9597d0f4f0b9995472e5eff3622b136a4b5 delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/dir/file delete mode 100644 test/integration_new/file/dir_with_untracked_file/expected/repo/dir/untracked delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/description delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/63/e06ef6d5baa80461d12e953ee7e75444180d8f delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7b/d422e3608d9bcfeef85748c90a5ec114fc2c17 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/REBASE_HEAD delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/config delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/description delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/index delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/2e/2cd25ffdec58d32b5d549f8402bd054e22cc2a delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/8a/3839811a7a9f4c678090c9def892d1e7ad7e54 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/90/fda12ce101e7d0d4594a879e5bbd1be3c857a8 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/ab/a3469fd6fc584a6af9c0073873005ffaaea56c delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/b8/5535ebf12659044c33386376121d76756ceb59 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/cc/9defb8ae9134f1a9a6c28a0006dc8c8cd78347 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/da/71be1afbb03f46e91ab5de17d69f148bb009f3 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e9/380a3c752e4b7c7e754fc402ce52302795a95a delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/file01.txt delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/file02.txt delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/file03.txt delete mode 100644 test/integration_new/interactive_rebase/one/expected/repo/file05.txt delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/commit-template.txt delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/config delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/description delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/index delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/stash delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/20/9b9fa9264fa15f128127817f080fd7372050cf delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/43/a4e12864cee1d7020a6d22772f0be34a24d257 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/65/d11c8b2d3c173850f337661c9bf264d0406cf1 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/71/2f414b554b56ba82d43e1f7a0fe33be7eecc95 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/86/8a798775e91d6387f351add6c5abf06cdb3357 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/a5/272a200897df5558c8cad683c1af14f7184124 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/b2/3d362d3fa47c3b1f29c4dd41c419326415122c delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/dc/052e9e4df6fe8f66b7e110466e1db8ce104b8b delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/objects/de/8f5ed6f8a58664edfbdecd20b75a6ea0633bf6 delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/stash/rename/expected/repo/.git_keep/refs/stash delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/config delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/description delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/index delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/objects/b4/ba8c398d35c204cc9ae06e120c6f0801fd3f32 delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/objects/c8/6eeda485a49ca608cb2617bb027be66cd92bc3 delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/objects/d9/1d06157bdc633d25f970b9cc54d0eb74fb850f delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/objects/e6/ed7d5c2198fa4791de9c66e8000da607eaf9a3 delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/HEAD delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/config delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/description delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/index delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/18/77c1658e50742642146b3bbb24c6b8635c7b64 delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/36/4ac39500dfec09956626a513736d7602b4d64a delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/8d/147cc9d3f9cf40d1723b9099b98ffdb3727f8b delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/dd/e611c48bd5d6df4157b99f524929851b07eca9 delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/refs/stash diff --git a/pkg/integration/README.md b/pkg/integration/README.md index bb22efab5..c4d233d07 100644 --- a/pkg/integration/README.md +++ b/pkg/integration/README.md @@ -63,26 +63,22 @@ You can pass the KEY_PRESS_DELAY env var to the test runner in order to set a de ### Running tests in VSCode -If you've opened an integration test file in your editor you can run that file by bringing up the command panel with `cmd+shift+p` and typing 'run task', then selecting the test task you want to run +If you've opened an integration test file in your editor you can run that file by bringing up the command panel with `cmd+shift+p` and typing 'run task', then selecting the test task you want to run ![image](https://user-images.githubusercontent.com/8456633/201500427-b86e129f-5f35-4d55-b7bd-fff5d8e4a04e.png) ![image](https://user-images.githubusercontent.com/8456633/201500431-903deb8c-c210-4054-8514-ab7088c7a839.png) The test will run in a VSCode terminal: ![image](https://user-images.githubusercontent.com/8456633/201500446-b87abf11-9653-438f-8a9a-e0bf8abdb7ee.png) -### Snapshots - -At the moment (this is subject to change) each test has a snapshot repo created after running for the first time. These snapshots live in `test/integration_new`, in folders named 'expected' (alongside the 'actual' folders which contain the resulting repo from the last test run). Whenever you run a test, the resultant repo will be compared against the snapshot repo and if they're different, you'll be asked whether you want to update the snapshot. If you want to update a snapshot without being prompted you can pass MODE=update to the test runner. - ### Sandbox mode Say you want to do a manual test of how lazygit handles merge-conflicts, but you can't be bothered actually finding a way to create merge conflicts in a repo. To make your life easier, you can simply run a merge-conflicts test in sandbox mode, meaning the setup step is run for you, and then instead of the test driving the lazygit session, you're allowed to drive it yourself. -To run a test in sandbox mode you can press 's' on a test in the test TUI or in the test runner pass MODE=sandbox or the --sandbox argument. +To run a test in sandbox mode you can press 's' on a test in the test TUI or in the test runner pass the --sandbox argument. ## Migration process -At the time of writing, most tests are created under an old approach, where you would record yourself in a lazygit session and then the test would replay the keybindings with the same timestamps. This old approach is great for writing tests quickly, but is much harder to maintain. It has to rely entirely on snapshots to determining if a test passes or fails, and can't do assertions along the way. It's also harder to grok what's the intention behind certain actions that take place within the test (e.g. was the recorder intentionally switching to another panel or was that just a misclick?). +At the time of writing, most tests are created under an old approach, where you would record yourself in a lazygit session and then the test would replay the keybindings with the same timestamps. This old approach is great for writing tests quickly, but is much harder to maintain. It has to rely on snapshots to determining if a test passes or fails, and can't do assertions along the way. It's also harder to grok what's the intention behind certain actions that take place within the test (e.g. was the recorder intentionally switching to another panel or was that just a misclick?). At the moment, all the deprecated test code lives in pkg/integration/deprecated. Hopefully in the very near future we migrate everything across so that we don't need to maintain two systems. @@ -92,6 +88,6 @@ We should never write any new tests under the old method, and if a given test br go run pkg/integration/deprecated/cmd/tui/main.go ``` -The tests in the old format live in test/integration. In the old format, test definitions are co-located with the snapshots. The setup step is done in a `setup.sh` shell script and the `recording.json` file contains the recorded keypresses to be replayed during the test. +The tests in the old format live in test/integration. In the old format, test definitions are co-located with snapshots. The setup step is done in a `setup.sh` shell script and the `recording.json` file contains the recorded keypresses to be replayed during the test. If you have rewritten an integration test under the new pattern, be sure to delete the old integration test directory. diff --git a/pkg/integration/clients/cli.go b/pkg/integration/clients/cli.go index 73a02c432..5225f39d1 100644 --- a/pkg/integration/clients/cli.go +++ b/pkg/integration/clients/cli.go @@ -29,19 +29,12 @@ func RunCLI(testNames []string, slow bool, sandbox bool) { keyPressDelay = SLOW_KEY_PRESS_DELAY } - var mode components.Mode - if sandbox { - mode = components.SANDBOX - } else { - mode = getModeFromEnv() - } - err := components.RunTests( getTestsToRun(testNames), log.Printf, runCmdInTerminal, runAndPrintFatalError, - mode, + sandbox, keyPressDelay, 1, ) @@ -95,22 +88,6 @@ func runCmdInTerminal(cmd *exec.Cmd) error { return cmd.Run() } -func getModeFromEnv() components.Mode { - switch os.Getenv("MODE") { - case "", "ask": - return components.ASK_TO_UPDATE_SNAPSHOT - case "check": - return components.CHECK_SNAPSHOT - case "update": - return components.UPDATE_SNAPSHOT - case "sandbox": - return components.SANDBOX - default: - log.Fatalf("unknown test mode: %s, must be one of [ask, check, update, sandbox]", os.Getenv("MODE")) - panic("unreachable") - } -} - func tryConvert(numStr string, defaultVal int) int { num, err := strconv.Atoi(numStr) if err != nil { diff --git a/pkg/integration/clients/go_test.go b/pkg/integration/clients/go_test.go index 3e442feaf..201d9bbfa 100644 --- a/pkg/integration/clients/go_test.go +++ b/pkg/integration/clients/go_test.go @@ -46,7 +46,7 @@ func TestIntegration(t *testing.T) { assert.NoError(t, err) }) }, - components.CHECK_SNAPSHOT, + false, 0, // allowing two attempts at the test. If a test fails intermittently, // there may be a concurrency issue that we need to resolve. diff --git a/pkg/integration/clients/tui.go b/pkg/integration/clients/tui.go index 7a1ebf615..b077a22c1 100644 --- a/pkg/integration/clients/tui.go +++ b/pkg/integration/clients/tui.go @@ -82,7 +82,7 @@ func RunTUI() { return nil } - suspendAndRunTest(currentTest, components.SANDBOX, 0) + suspendAndRunTest(currentTest, true, 0) return nil }); err != nil { @@ -95,7 +95,7 @@ func RunTUI() { return nil } - suspendAndRunTest(currentTest, components.ASK_TO_UPDATE_SNAPSHOT, 0) + suspendAndRunTest(currentTest, false, 0) return nil }); err != nil { @@ -108,7 +108,7 @@ func RunTUI() { return nil } - suspendAndRunTest(currentTest, components.ASK_TO_UPDATE_SNAPSHOT, SLOW_KEY_PRESS_DELAY) + suspendAndRunTest(currentTest, false, SLOW_KEY_PRESS_DELAY) return nil }); err != nil { @@ -268,12 +268,12 @@ func (self *app) wrapEditor(f func(v *gocui.View, key gocui.Key, ch rune, mod go } } -func suspendAndRunTest(test *components.IntegrationTest, mode components.Mode, keyPressDelay int) { +func suspendAndRunTest(test *components.IntegrationTest, sandbox bool, keyPressDelay int) { if err := gocui.Screen.Suspend(); err != nil { panic(err) } - runTuiTest(test, mode, keyPressDelay) + runTuiTest(test, sandbox, keyPressDelay) fmt.Fprintf(os.Stdout, "\n%s", style.FgGreen.Sprint("press enter to return")) fmt.Scanln() // wait for enter press @@ -367,13 +367,13 @@ func quit(g *gocui.Gui, v *gocui.View) error { return gocui.ErrQuit } -func runTuiTest(test *components.IntegrationTest, mode components.Mode, keyPressDelay int) { +func runTuiTest(test *components.IntegrationTest, sandbox bool, keyPressDelay int) { err := components.RunTests( []*components.IntegrationTest{test}, log.Printf, runCmdInTerminal, runAndPrintError, - mode, + sandbox, keyPressDelay, 1, ) diff --git a/pkg/integration/components/runner.go b/pkg/integration/components/runner.go index 11b34db11..eab6f9576 100644 --- a/pkg/integration/components/runner.go +++ b/pkg/integration/components/runner.go @@ -18,29 +18,12 @@ const ( SANDBOX_ENV_VAR = "SANDBOX" ) -type Mode int - -const ( - // Default: if a snapshot test fails, the we'll be asked whether we want to update it - ASK_TO_UPDATE_SNAPSHOT Mode = iota - // fails the test if the snapshots don't match - CHECK_SNAPSHOT - // runs the test and updates the snapshot - UPDATE_SNAPSHOT - // This just makes use of the setup step of the test to get you into - // a lazygit session. Then you'll be able to do whatever you want. Useful - // when you want to test certain things without needing to manually set - // up the situation yourself. - // fails the test if the snapshots don't match - SANDBOX -) - func RunTests( tests []*IntegrationTest, logf func(format string, formatArgs ...interface{}), runCmd func(cmd *exec.Cmd) error, testWrapper func(test *IntegrationTest, f func() error), - mode Mode, + sandbox bool, keyPressDelay int, maxAttempts int, ) error { @@ -65,7 +48,7 @@ func RunTests( ) for i := 0; i < maxAttempts; i++ { - err := runTest(test, paths, projectRootDir, logf, runCmd, mode, keyPressDelay) + err := runTest(test, paths, projectRootDir, logf, runCmd, sandbox, keyPressDelay) if err != nil { if i == maxAttempts-1 { return err @@ -89,7 +72,7 @@ func runTest( projectRootDir string, logf func(format string, formatArgs ...interface{}), runCmd func(cmd *exec.Cmd) error, - mode Mode, + sandbox bool, keyPressDelay int, ) error { if test.Skip() { @@ -103,7 +86,7 @@ func runTest( return err } - cmd, err := getLazygitCommand(test, paths, projectRootDir, mode, keyPressDelay) + cmd, err := getLazygitCommand(test, paths, projectRootDir, sandbox, keyPressDelay) if err != nil { return err } @@ -113,7 +96,7 @@ func runTest( return err } - return HandleSnapshots(paths, logf, test, mode) + return nil } func prepareTestDir( @@ -151,7 +134,7 @@ func createFixture(test *IntegrationTest, paths Paths) error { return nil } -func getLazygitCommand(test *IntegrationTest, paths Paths, rootDir string, mode Mode, keyPressDelay int) (*exec.Cmd, error) { +func getLazygitCommand(test *IntegrationTest, paths Paths, rootDir string, sandbox bool, keyPressDelay int) (*exec.Cmd, error) { osCommand := oscommands.NewDummyOSCommand() templateConfigDir := filepath.Join(rootDir, "test", "default_test_config") @@ -170,7 +153,7 @@ func getLazygitCommand(test *IntegrationTest, paths Paths, rootDir string, mode cmdObj := osCommand.Cmd.New(cmdStr) cmdObj.AddEnvVars(fmt.Sprintf("%s=%s", TEST_NAME_ENV_VAR, test.Name())) - if mode == SANDBOX { + if sandbox { cmdObj.AddEnvVars(fmt.Sprintf("%s=%s", "SANDBOX", "true")) } diff --git a/pkg/integration/components/snapshot.go b/pkg/integration/components/snapshot.go deleted file mode 100644 index 116db930f..000000000 --- a/pkg/integration/components/snapshot.go +++ /dev/null @@ -1,372 +0,0 @@ -package components - -import ( - "errors" - "fmt" - "io/ioutil" - "os" - "path/filepath" - "strings" - - "github.com/jesseduffield/generics/slices" - "github.com/jesseduffield/lazygit/pkg/commands/oscommands" - "github.com/stretchr/testify/assert" -) - -// This creates and compares integration test snapshots. - -type ( - logf func(format string, formatArgs ...interface{}) -) - -func HandleSnapshots(paths Paths, logf logf, test *IntegrationTest, mode Mode) error { - return NewSnapshotter(paths, logf, test, mode). - handleSnapshots() -} - -type Snapshotter struct { - paths Paths - logf logf - test *IntegrationTest - mode Mode -} - -func NewSnapshotter( - paths Paths, - logf logf, - test *IntegrationTest, - mode Mode, -) *Snapshotter { - return &Snapshotter{ - paths: paths, - logf: logf, - test: test, - mode: mode, - } -} - -func (self *Snapshotter) handleSnapshots() error { - switch self.mode { - case UPDATE_SNAPSHOT: - return self.handleUpdate() - case CHECK_SNAPSHOT: - return self.handleCheck() - case ASK_TO_UPDATE_SNAPSHOT: - return self.handleAskToUpdate() - case SANDBOX: - self.logf("Sandbox session exited") - } - return nil -} - -func (self *Snapshotter) handleUpdate() error { - if err := self.updateSnapshot(); err != nil { - return err - } - self.logf("Test passed: %s", self.test.Name()) - return nil -} - -func (self *Snapshotter) handleCheck() error { - self.logf("Comparing snapshots") - if err := self.compareSnapshots(); err != nil { - return err - } - self.logf("Test passed: %s", self.test.Name()) - return nil -} - -func (self *Snapshotter) handleAskToUpdate() error { - if _, err := os.Stat(self.paths.Expected()); os.IsNotExist(err) { - if err := self.updateSnapshot(); err != nil { - return err - } - self.logf("No existing snapshot found for %s. Created snapshot.", self.test.Name()) - - return nil - } - - self.logf("Comparing snapshots...") - if err := self.compareSnapshots(); err != nil { - self.logf("%s", err) - - // prompt user whether to update the snapshot (Y/N) - if promptUserToUpdateSnapshot() { - if err := self.updateSnapshot(); err != nil { - return err - } - self.logf("Snapshot updated: %s", self.test.Name()) - } else { - return err - } - } - - self.logf("Test passed: %s", self.test.Name()) - return nil -} - -func (self *Snapshotter) updateSnapshot() error { - // create/update snapshot - err := oscommands.CopyDir(self.paths.Actual(), self.paths.Expected()) - if err != nil { - return err - } - - if err := renameSpecialPaths(self.paths.Expected()); err != nil { - return err - } - - return nil -} - -func (self *Snapshotter) compareSnapshots() error { - // there are a couple of reasons we're not generating the snapshot in expectedDir directly: - // Firstly we don't want to have to revert our .git file back to .git_keep. - // Secondly, the act of calling git commands like 'git status' actually changes the index - // for some reason, and we don't want to leave your lazygit working tree dirty as a result. - expectedDirCopy := filepath.Join(os.TempDir(), "expected_dir_test", self.test.Name()) - err := oscommands.CopyDir(self.paths.Expected(), expectedDirCopy) - if err != nil { - return err - } - - defer func() { - err := os.RemoveAll(expectedDirCopy) - if err != nil { - panic(err) - } - }() - - if err := restoreSpecialPaths(expectedDirCopy); err != nil { - return err - } - - err = validateSameRepos(expectedDirCopy, self.paths.Actual()) - if err != nil { - return err - } - - // iterate through each repo in the expected dir and comparet to the corresponding repo in the actual dir - expectedFiles, err := ioutil.ReadDir(expectedDirCopy) - if err != nil { - return err - } - - for _, f := range expectedFiles { - if !f.IsDir() { - return errors.New("unexpected file (as opposed to directory) in integration test 'expected' directory") - } - - // get corresponding file name from actual dir - actualRepoPath := filepath.Join(self.paths.Actual(), f.Name()) - expectedRepoPath := filepath.Join(expectedDirCopy, f.Name()) - - actualRepo, expectedRepo, err := generateSnapshots(actualRepoPath, expectedRepoPath) - if err != nil { - return err - } - - if expectedRepo != actualRepo { - // get the log file and print it - bytes, err := os.ReadFile(filepath.Join(self.paths.Config(), "development.log")) - if err != nil { - return err - } - self.logf("%s", string(bytes)) - - return errors.New(getDiff(f.Name(), expectedRepo, actualRepo)) - } - } - - return nil -} - -func promptUserToUpdateSnapshot() bool { - fmt.Println("Test failed. Update snapshot? (y/n)") - var input string - fmt.Scanln(&input) - return input == "y" -} - -func generateSnapshots(actualDir string, expectedDir string) (string, string, error) { - actual, err := generateSnapshot(actualDir) - if err != nil { - return "", "", err - } - - expected, err := generateSnapshot(expectedDir) - if err != nil { - return "", "", err - } - - return actual, expected, nil -} - -// note that we don't actually store this snapshot in the lazygit repo. -// Instead we store the whole expected git repo of our test, so that -// we can easily change what we want to compare without needing to regenerate -// snapshots for each test. -func generateSnapshot(dir string) (string, error) { - osCommand := oscommands.NewDummyOSCommand() - - _, err := os.Stat(filepath.Join(dir, ".git")) - if err != nil { - return "git directory not found", nil - } - - snapshot := "" - - cmdStrs := []string{ - `remote show -n origin`, // remote branches - // TODO: find a way to bring this back without breaking tests - // `ls-remote origin`, - `status`, // file tree - `log --pretty=%B|%an|%ae -p -1`, // log - `tag -n`, // tags - `stash list`, // stash - `submodule foreach 'git status'`, // submodule status - `submodule foreach 'git log --pretty=%B -p -1'`, // submodule log - `submodule foreach 'git tag -n'`, // submodule tags - `submodule foreach 'git stash list'`, // submodule stash - } - - for _, cmdStr := range cmdStrs { - // ignoring error for now. If there's an error it could be that there are no results - output, _ := osCommand.Cmd.New(fmt.Sprintf("git -C %s %s", dir, cmdStr)).RunWithOutput() - - snapshot += fmt.Sprintf("git %s:\n%s\n", cmdStr, output) - } - - snapshot += "files in repo:\n" - err = filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { - if err != nil { - return err - } - - if f.IsDir() { - if f.Name() == ".git" { - return filepath.SkipDir - } - return nil - } - - bytes, err := os.ReadFile(path) - if err != nil { - return err - } - - relativePath, err := filepath.Rel(dir, path) - if err != nil { - return err - } - snapshot += fmt.Sprintf("path: %s\ncontent:\n%s\n", relativePath, string(bytes)) - - return nil - }) - - if err != nil { - return "", err - } - - return snapshot, nil -} - -func getPathsToRename(dir string, needle string, contains string) []string { - pathsToRename := []string{} - - err := filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { - if err != nil { - return err - } - - if f.Name() == needle && (contains == "" || strings.Contains(path, contains)) { - pathsToRename = append(pathsToRename, path) - } - - return nil - }) - if err != nil { - panic(err) - } - - return pathsToRename -} - -var specialPathMappings = []struct{ original, new, contains string }{ - // git refuses to track .git or .gitmodules in subdirectories so we need to rename them - {".git", ".git_keep", ""}, - {".gitmodules", ".gitmodules_keep", ""}, - // we also need git to ignore the contents of our test gitignore files so that - // we actually commit files that are ignored within the test. - {".gitignore", "lg_ignore_file", ""}, - // this is the .git/info/exclude file. We're being a little more specific here - // so that we don't accidentally mess with some other file named 'exclude' in the test. - {"exclude", "lg_exclude_file", ".git/info/exclude"}, -} - -func renameSpecialPaths(dir string) error { - for _, specialPath := range specialPathMappings { - for _, path := range getPathsToRename(dir, specialPath.original, specialPath.contains) { - err := os.Rename(path, filepath.Join(filepath.Dir(path), specialPath.new)) - if err != nil { - return err - } - } - } - - return nil -} - -func restoreSpecialPaths(dir string) error { - for _, specialPath := range specialPathMappings { - for _, path := range getPathsToRename(dir, specialPath.new, specialPath.contains) { - err := os.Rename(path, filepath.Join(filepath.Dir(path), specialPath.original)) - if err != nil { - return err - } - } - } - - return nil -} - -// validates that the actual and expected dirs have the same repo names (doesn't actually check the contents of the repos) -func validateSameRepos(expectedDir string, actualDir string) error { - // iterate through each repo in the expected dir and compare to the corresponding repo in the actual dir - expectedFiles, err := ioutil.ReadDir(expectedDir) - if err != nil { - return err - } - - var actualFiles []os.FileInfo - actualFiles, err = ioutil.ReadDir(actualDir) - if err != nil { - return err - } - - expectedFileNames := slices.Map(expectedFiles, getFileName) - actualFileNames := slices.Map(actualFiles, getFileName) - if !slices.Equal(expectedFileNames, actualFileNames) { - return fmt.Errorf("expected and actual repo dirs do not match: expected: %s, actual: %s", expectedFileNames, actualFileNames) - } - - return nil -} - -func getFileName(f os.FileInfo) string { - return f.Name() -} - -func getDiff(prefix string, expected string, actual string) string { - mockT := &MockTestingT{} - assert.Equal(mockT, expected, actual, fmt.Sprintf("Unexpected %s. Expected:\n%s\nActual:\n%s\n", prefix, expected, actual)) - return mockT.err -} - -type MockTestingT struct { - err string -} - -func (self *MockTestingT) Errorf(format string, args ...interface{}) { - self.err += fmt.Sprintf(format, args...) -} diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/bisect/basic/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 7444ad06a..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -commit 10 diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/bisect/basic/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/HEAD b/test/integration_new/bisect/basic/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/config b/test/integration_new/bisect/basic/expected/repo/.git_keep/config deleted file mode 100644 index 8a748ce32..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/description b/test/integration_new/bisect/basic/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/index b/test/integration_new/bisect/basic/expected/repo/.git_keep/index deleted file mode 100644 index d7cd698470e6e19b1e1ca68ffc52885ce0709504..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 866 zcmZ?q402{*U|<4bu4HDPqkPv_U5C+(3=FKypF~+07#f!_Ffe`vsu2NVKKJWg*B8|v z|L0-c8K}3vZn00O$Q}l+w9K4T14F%%iV~n2FaVh&VD-TtMnlb$K{t=h{hxO+)BF9K zOm}?9kdD+jY%$jiYMv3gd4lUXeuK;d(NOdB(9N^{k+Hb*0=r#dTuVRSW7|SDSIbjS z^Ni8W6V~zh12PXpL(OwQH}BH{sSdG3k9?6j_pke!Ci=wkFc?71GeI-&I8*U9OQ3mR z8fxAnbn^~{p7;CyH!N}GweG?q=am&tv{~0c%`?R?uY3Y8*gPN&HSaOHdE%X=#|~Xx zaXEjo`TKjTG#HXLzOR9rXNF;3)$7+_^MEweyeH`98LVZf@!2q2JVM|>=EhAMv^I!v zghS0U$1tzX!v$;}kcOJ~6y3c2+RR-wkymaTE}2wm(Dv)!38pvtQ1dJ>%xj$C1vU>z zL(O}JZeGCEM0Ni2XHTv_5ua%G)BLFBnp3Nw=2>Ex*QyN(KOhY??>V}8y`Dl-G*6x0 zmg&zlVYA}AiOW8xoQ0TYXn<^9NRX>5FkwqE7#b)TaG57~?CM>zO_HOl-YfR=SB<|< c 1661160645 +1000 commit (initial): commit 01 -18197bb6052becf371aca9ab58d8352cebd3bc29 0ce746de5bee98147a370a19b4568b448fdedfcc CI 1661160645 +1000 commit: commit 02 -0ce746de5bee98147a370a19b4568b448fdedfcc d4308139592744ccc7fa9ab0931812da9fdfcc1d CI 1661160645 +1000 commit: commit 03 -d4308139592744ccc7fa9ab0931812da9fdfcc1d 0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 CI 1661160645 +1000 commit: commit 04 -0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 685d0baa299ec29ff2c7a1ca9268abdd374adef2 CI 1661160645 +1000 commit: commit 05 -685d0baa299ec29ff2c7a1ca9268abdd374adef2 483fcff024ff52df164dddea9ab5032370d14228 CI 1661160645 +1000 commit: commit 06 -483fcff024ff52df164dddea9ab5032370d14228 f3f9cf9d8f02f35f955b868d277913fc45d724db CI 1661160645 +1000 commit: commit 07 -f3f9cf9d8f02f35f955b868d277913fc45d724db a83ada2a0a285982aaa96baeddb70135532ed004 CI 1661160645 +1000 commit: commit 08 -a83ada2a0a285982aaa96baeddb70135532ed004 a89b19d40efb59f1f77b5a6b59ed1a9898545d0d CI 1661160645 +1000 commit: commit 09 -a89b19d40efb59f1f77b5a6b59ed1a9898545d0d 670ea6605e6780007c543b3d034bcf49c898290d CI 1661160645 +1000 commit: commit 10 -670ea6605e6780007c543b3d034bcf49c898290d 685d0baa299ec29ff2c7a1ca9268abdd374adef2 CI 1661160646 +1000 checkout: moving from master to 685d0baa299ec29ff2c7a1ca9268abdd374adef2 -685d0baa299ec29ff2c7a1ca9268abdd374adef2 0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 CI 1661160646 +1000 checkout: moving from 685d0baa299ec29ff2c7a1ca9268abdd374adef2 to 0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 -0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 670ea6605e6780007c543b3d034bcf49c898290d CI 1661160647 +1000 checkout: moving from 0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 to master diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/bisect/basic/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 86cbc642d..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 18197bb6052becf371aca9ab58d8352cebd3bc29 CI 1661160645 +1000 commit (initial): commit 01 -18197bb6052becf371aca9ab58d8352cebd3bc29 0ce746de5bee98147a370a19b4568b448fdedfcc CI 1661160645 +1000 commit: commit 02 -0ce746de5bee98147a370a19b4568b448fdedfcc d4308139592744ccc7fa9ab0931812da9fdfcc1d CI 1661160645 +1000 commit: commit 03 -d4308139592744ccc7fa9ab0931812da9fdfcc1d 0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 CI 1661160645 +1000 commit: commit 04 -0f77bf7bd7dd91550c927549af82d5b7c6f8a0d7 685d0baa299ec29ff2c7a1ca9268abdd374adef2 CI 1661160645 +1000 commit: commit 05 -685d0baa299ec29ff2c7a1ca9268abdd374adef2 483fcff024ff52df164dddea9ab5032370d14228 CI 1661160645 +1000 commit: commit 06 -483fcff024ff52df164dddea9ab5032370d14228 f3f9cf9d8f02f35f955b868d277913fc45d724db CI 1661160645 +1000 commit: commit 07 -f3f9cf9d8f02f35f955b868d277913fc45d724db a83ada2a0a285982aaa96baeddb70135532ed004 CI 1661160645 +1000 commit: commit 08 -a83ada2a0a285982aaa96baeddb70135532ed004 a89b19d40efb59f1f77b5a6b59ed1a9898545d0d CI 1661160645 +1000 commit: commit 09 -a89b19d40efb59f1f77b5a6b59ed1a9898545d0d 670ea6605e6780007c543b3d034bcf49c898290d CI 1661160645 +1000 commit: commit 10 diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 deleted file mode 100644 index a8a2b586df771ca14cecde7807a27ce30a6b580c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb+k8|g>J5cLD&o#S2XU diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c deleted file mode 100644 index f3e747107bb9d87ddf233fb1249f6677eb244de5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmV;_04x7^0V^p=O;s>5Gh;9`FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD z6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDElnvMO`1DucBQH9i|=i$@4N$lSPT OgVqKSj&J}0IcDi5lxa!; diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/0c/e746de5bee98147a370a19b4568b448fdedfcc b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/0c/e746de5bee98147a370a19b4568b448fdedfcc deleted file mode 100644 index c5d3bb6b19ec6abf5b0948158f33cb15ab9001fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeJorG@ArOgr0oH?skiUv86=t`S#!gybd!ky0rG_ z9x5IBX68Ad4iZVIOmhweAR!ji8JI;`vfyA;#jU*AYYz+5EJ7inn9eZ+D_53OrVٳszn$cbdV*#q_6fL~zҥ_B -#!>5;@ \ No newline at end of file diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c deleted file mode 100644 index 933e877a004be087db3ad361d41a016285123f23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJJ5vS2VYFfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD o6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDEln0K+a>>qpLC$N&HU diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 deleted file mode 100644 index 350af2800533c3104a701dce1729c5212dcef1f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0V^p=O;s>7HDWL{FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY n3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZZ^CcZiEHDN%H diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a deleted file mode 100644 index e8c48561b..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU00`040031QHI50+(apu}QƝzAVeVϻM;>dHGkG vq-|m \-O!2t@C,#_뾦>< ȪL7,q"OY 2,=v[} *s* 5>fG<ܸipdU`Uj"6\2Ҡ׿LoUYU\MT?f?͏j9 -IXUSe3Mج8o)gI \ No newline at end of file diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca deleted file mode 100644 index 07b07e91fc3473d2d2b21397ee9c3197bcd0bbe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJsk8|g>JETZrhXHOJJLlltP-*(v*qnIxH2Hhm4C6syf5j#-Q2-IqzQ2s=uW zYxPr*s?8aBkNdL0e1r3RyXr^!`qWcd`UQ{(kt~G>N3_$%4di(1Z N`-F<@0RUnl5mQh97fApB diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/67/0ea6605e6780007c543b3d034bcf49c898290d b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/67/0ea6605e6780007c543b3d034bcf49c898290d deleted file mode 100644 index 3ba98094c97fad577b670838dffab1a5fa893167..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlzKaCYue22tD-~n`VQ8v86=t`S#!gybZ$~W?ou* zbfCnCzL~)g8NFncqCPVv6wz3{hEj(b&Qgncs-$k!&0ZZ;Ql?ZqTFoIKTa`wcG$y?#khcemB zQIacDz$_-b+kHD=Sz%t*n|?ywpL$7Ky+ThDIdmh#nGn%*+NYZSssDUHHec|$JD^6@ BMg;%> diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd deleted file mode 100644 index 8d434f2041605e3a4058a78bd8bb3d5a1ad5f503..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJU diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b deleted file mode 100644 index 85866acd897b150150557b0a331c827562ca4fa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;s>AV=y!@Ff%bxNXyJgH89jGsVHG^zut9yQT_3M9>$%4di(1Z n`-F<@K~`l1R>kK2&%2oE{r*j+J3eGcN9r85m}>?A;$I(9i#8>| diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/3ada2a0a285982aaa96baeddb70135532ed004 b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/3ada2a0a285982aaa96baeddb70135532ed004 deleted file mode 100644 index da4e3e339e95a2fd020b4c4e3afa98a569702309..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gcW*3IZ_@Kw;~gVtPR`NoJCOh_IE%$j=N4uDdJ|Jic3a0Nck`ytd5q zV*qA8j7MZddt~d40;ME%ODC8Idgqf+JdM&0hDZA%F6p2b;_nP8&Ls DRWC!Q diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/9b19d40efb59f1f77b5a6b59ed1a9898545d0d b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/9b19d40efb59f1f77b5a6b59ed1a9898545d0d deleted file mode 100644 index 9d4aa4be5..000000000 --- a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/a8/9b19d40efb59f1f77b5a6b59ed1a9898545d0d +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]d&cLQ"dHGkG vq-|m \-O!2t@C,#_뾦>< ȪL7,q"OY 2,=v[} *s* 5>fG<ܸipdU`Uj"6\2Ҡ׿Lo4v5 \ No newline at end of file diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f deleted file mode 100644 index 17f75bca502e6b34e2f231b56e520976da3a5221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJ9F=8+@FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD z6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDElnvMO`1DucBQH9i|=i$@4N$lSPT zgVqKSj&NjE7GPETwVAtWBCp&wTr#QBpzYVc6HIUPkyTlORRvs4ROdf`_T>5#@rhF^|YnJ9i8FKbW)d{?)PP*=|<=2cEu;n>l3H4%oh?>5oL9rj>61lulrQTpZw>Et@#4$-aD(l CYeonF diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 deleted file mode 100644 index 37f59fe0fb0228d08de7eb36a278ec52c722aec2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0V^p=O;s?oG+;0^FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD O6;HHT*8l*@%}K*azEJT1 diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 deleted file mode 100644 index 8bcfafeb644d88961fada612e53598966fbe73ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(cC0V^p=O;s>7G+{6_FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY O3)x&PPXPdnMJ)ztA2U4w diff --git a/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 b/test/integration_new/bisect/basic/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 deleted file mode 100644 index 7e30b2e352ac316b3082ec42a9aabada4e057a17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJF}JwFa0Aa?-3d3o(VH)^i9o-crggIwy{W3!AlW?KQw>r>u(Bs|G7d(Thl{rQQNM z>k 1661161824 +1000 commit (initial): only commit on master -5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 checkout: moving from master to other -5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d e739ef9112312917b4fc678e40e2372cc8fda25f CI 1661161824 +1000 commit: commit 01 -e739ef9112312917b4fc678e40e2372cc8fda25f 0d4e099996a7c3dc58120cfe1ec34973b309d0e0 CI 1661161824 +1000 commit: commit 02 -0d4e099996a7c3dc58120cfe1ec34973b309d0e0 3a899150d167edb02f0ef2ab43bf446d23d90310 CI 1661161824 +1000 commit: commit 03 -3a899150d167edb02f0ef2ab43bf446d23d90310 7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 CI 1661161824 +1000 commit: commit 04 -7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 d4779d400f252d1de4e76ef79e3b4d554fffadb5 CI 1661161824 +1000 commit: commit 05 -d4779d400f252d1de4e76ef79e3b4d554fffadb5 41bffcc8f25d268518574e91483a55e66124574c CI 1661161824 +1000 commit: commit 06 -41bffcc8f25d268518574e91483a55e66124574c 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI 1661161824 +1000 commit: commit 07 -5c9b8a0a95c49c1674753ad827246ce05965e7fe 9cdece2525ed2b34f940b168a2f628984468a8c6 CI 1661161824 +1000 commit: commit 08 -9cdece2525ed2b34f940b168a2f628984468a8c6 e4fca3fab85b7a477a2de101e917fe43538e0302 CI 1661161824 +1000 commit: commit 09 -e4fca3fab85b7a477a2de101e917fe43538e0302 dff71e43e297a66eb7ec85b7b95ece827751cdbd CI 1661161824 +1000 commit: commit 10 -dff71e43e297a66eb7ec85b7b95ece827751cdbd 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 checkout: moving from other to master -5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI 1661161824 +1000 checkout: moving from master to 5c9b8a0a95c49c1674753ad827246ce05965e7fe -5c9b8a0a95c49c1674753ad827246ce05965e7fe 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161825 +1000 checkout: moving from 5c9b8a0a95c49c1674753ad827246ce05965e7fe to master diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 15063339e..000000000 --- a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 commit (initial): only commit on master diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index 01da9e7bf..000000000 --- a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1,11 +0,0 @@ -0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 branch: Created from HEAD -5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d e739ef9112312917b4fc678e40e2372cc8fda25f CI 1661161824 +1000 commit: commit 01 -e739ef9112312917b4fc678e40e2372cc8fda25f 0d4e099996a7c3dc58120cfe1ec34973b309d0e0 CI 1661161824 +1000 commit: commit 02 -0d4e099996a7c3dc58120cfe1ec34973b309d0e0 3a899150d167edb02f0ef2ab43bf446d23d90310 CI 1661161824 +1000 commit: commit 03 -3a899150d167edb02f0ef2ab43bf446d23d90310 7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 CI 1661161824 +1000 commit: commit 04 -7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 d4779d400f252d1de4e76ef79e3b4d554fffadb5 CI 1661161824 +1000 commit: commit 05 -d4779d400f252d1de4e76ef79e3b4d554fffadb5 41bffcc8f25d268518574e91483a55e66124574c CI 1661161824 +1000 commit: commit 06 -41bffcc8f25d268518574e91483a55e66124574c 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI 1661161824 +1000 commit: commit 07 -5c9b8a0a95c49c1674753ad827246ce05965e7fe 9cdece2525ed2b34f940b168a2f628984468a8c6 CI 1661161824 +1000 commit: commit 08 -9cdece2525ed2b34f940b168a2f628984468a8c6 e4fca3fab85b7a477a2de101e917fe43538e0302 CI 1661161824 +1000 commit: commit 09 -e4fca3fab85b7a477a2de101e917fe43538e0302 dff71e43e297a66eb7ec85b7b95ece827751cdbd CI 1661161824 +1000 commit: commit 10 diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 deleted file mode 100644 index a8a2b586df771ca14cecde7807a27ce30a6b580c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb+k8|g>J5cLD&o#S2XU diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c deleted file mode 100644 index f3e747107bb9d87ddf233fb1249f6677eb244de5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmV;_04x7^0V^p=O;s>5Gh;9`FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD z6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDElnvMO`1DucBQH9i|=i$@4N$lSPT OgVqKSj&J}0IcDi5lxa!; diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 deleted file mode 100644 index d3c3d523b38f79c010bcdf4d73b85239a0b01e71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0&iOwvgLB0^U^#$=qJU~MT8Jic9c0JopF_`1yV zqXQN`^vw*!lg1jja=x|XGvYv$NgIk(m6|F=<5Jx!o4q<%3dLGMq<~Z~)!39%w&;yQ zBGue(LPK-%?)PPbaf0(WUF{?D`m~cS^97I@kug(*BYN-MUiYbPfAXIPPwop`5<0P8 CDoBa| diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c deleted file mode 100644 index 933e877a004be087db3ad361d41a016285123f23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJJ5vS2VYFfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD o6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDEln0K+a>>qpLC$N&HU diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 deleted file mode 100644 index 350af2800533c3104a701dce1729c5212dcef1f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0V^p=O;s>7HDWL{FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY n3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZZ^CcZiEHDN%H diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a deleted file mode 100644 index e8c48561b..000000000 --- a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU00`040031QHI50+(apu}QƝzAVeVϻM;>dHGkG vq-|m \-O!2t@C,#_뾦>< ȪL7,q"OY 2,=v[} *s* 5>fG<ܸipdU`Uj"6\2Ҡ׿LoUYU\MT?f?͏j9 -IXUSe3Mج8o)gI \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 deleted file mode 100644 index 0aa17a3368304e87e7fdf8b6c7cd4324cf4fd7f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaAL3c@fH23_YAZ!gGuNtz~5MChu=$j?_4j4dUC$2SWP;4Ft(Ox|jJ zG?L&>?Ena_Bv}WabxH$bvBEY)kJSWW;~3p(fmVAw@M^@xfJHDyhrma>M* zEk-u8(rR?&-S5i=;|9? CWJcit diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc deleted file mode 100644 index c562d38cc74cf217a96352f3dc336a387371e749..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbsk8|g>J$%4di(1Z N`-F<@0RUnl5mQh97fApB diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe deleted file mode 100644 index e3947050d..000000000 --- a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe +++ /dev/null @@ -1,6 +0,0 @@ -xA -1 @Q=E4mf@D) - -.<[|Y[{t) -'+r\PRuAr>z_lyWZE:*.2!S -:a`4Fta1y''Yp(.f1O`9 \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d deleted file mode 100644 index bc33f27d9..000000000 --- a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]dC"BW=FNQtFnWM3.Tbja))# T8s -1.E˯v tw*jzg=]=ϹmO@ Њ2$ \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 deleted file mode 100644 index 0ba0a16ee06cbbb6992f073efcf4888e9b163205..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3IZ_kLB$kMArzfZNYo{JQl1 z7#4Fpj7`K+XdHvOTq+cwm=lyn46dq1M^!zAppDGRo4kf4PB~+MhVd+|fKw24Ts#%^ zJ~l@!10fiGkNdLOX||VXzR8FC`jk^$`qg5Lh!KJU diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 deleted file mode 100644 index cde6830222e5d92bbe4235f80dbd3558dee780a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDg<;n@MfQSZ(##|SB0^U^#$=qLU~MT8Jib|Y0Jo3t!LRGG zJemilL)*=K9mEhaMOEa;6*bLN39ZNt5@UjtW-HNcvfHb9RIWvWaEGiwIb|H=R$`8c z)Bw_Oz3(%f$l`06~e#A0dR``r4zK{mFmchvL2x>N+Ga C9!h=y diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b deleted file mode 100644 index 85866acd897b150150557b0a331c827562ca4fa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;s>AV=y!@Ff%bxNXyJgH89jGsVHG^zut9yQT_3M9>$%4di(1Z n`-F<@K~`l1R>kK2&%2oE{r*j+J3eGcN9r85m}>?A;$I(9i#8>| diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 deleted file mode 100644 index 7eacc86e0..000000000 --- a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU060a040031QHI50+(apu}QƝzAVeVϻM;>dHGkG vq-|m \-O!2t@C,#_뾦>< ȪL7,q"OY 2,=v[} *s* 5>fG<ܸipdU`Uj"6\2Ҡ׿Lo4v5 \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f deleted file mode 100644 index 17f75bca502e6b34e2f231b56e520976da3a5221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJ9F=8+@FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD z6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDElnvMO`1DucBQH9i|=i$@4N$lSPT zgVqKSj&NjE7GPETwVAtWBCp&wTr#QBpzYVc6HIUPkyTlORRvs4ROdf`_T>5#@rhH+yw3Zj*+lMPkXyIjgTmNH$Pz z#vukV4CtM{`+eD9yuo?AUG1au`n1!u%om`Ph!TlsI1(bdz3x-p{^UOogzgK83p(dH Cgh_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD O6;HHT*8l*@%}K*azEJT1 diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 deleted file mode 100644 index 96986d1b23d2ce708570d8324b14416fcc17af4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAL3c@fDMqTF=vlk?jPSP0=5xVLz@-sof*is^Re2aJh7au$xZ}H`& zwR;DYaOj&V7G+{6_FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY O3)x&PPXPdnMJ)ztA2U4w diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f deleted file mode 100644 index 205e4506cd441edd5f1745be772c6d24749a8891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@#q0%{NiwkmB0^U^Mv~5;U~DN7Jic9c0JopF_;qRR z(Sal#`lbrZf#ggQ#3ROF1)~KGqJw9lB!a^1F}gKx`s%JTg)|snrDP=o@C{o6(I9KG}OFwbn~o#WGwEyz;0I<*V51T*tU?()$$b7 zJY!_@LV{dffew{qFjg?&dUjhr;?VB6wT>*a`aVx&PI$Lg@sTy>K6UOD$)_ss)S8t# L359HWXBYqg$*o(+ diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/info/exclude deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d34fb4066..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 95efd4ea6ed74b904cd8eeeaa6245ec462372f67 CI 1665924398 +0900 commit (initial): commit 01 -95efd4ea6ed74b904cd8eeeaa6245ec462372f67 cfc66e0e89b1dc11a927cc453dbee025ff03cf83 CI 1665924398 +0900 commit: commit 02 -cfc66e0e89b1dc11a927cc453dbee025ff03cf83 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924398 +0900 commit: commit 03 -6d69ac71e12a83769fca195d0a714435e1f4661a 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924398 +0900 checkout: moving from master to @ -6d69ac71e12a83769fca195d0a714435e1f4661a 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924398 +0900 checkout: moving from @ to master -6d69ac71e12a83769fca195d0a714435e1f4661a 18565748bda3ca01a67a92f340705af5a11384ae CI 1665924398 +0900 commit: blah -18565748bda3ca01a67a92f340705af5a11384ae 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924403 +0900 checkout: moving from master to new-branch diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/@ b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/@ deleted file mode 100644 index 96ceab46c..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/@ +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924398 +0900 branch: Created from HEAD diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d04f9469b..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 95efd4ea6ed74b904cd8eeeaa6245ec462372f67 CI 1665924398 +0900 commit (initial): commit 01 -95efd4ea6ed74b904cd8eeeaa6245ec462372f67 cfc66e0e89b1dc11a927cc453dbee025ff03cf83 CI 1665924398 +0900 commit: commit 02 -cfc66e0e89b1dc11a927cc453dbee025ff03cf83 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924398 +0900 commit: commit 03 -6d69ac71e12a83769fca195d0a714435e1f4661a 18565748bda3ca01a67a92f340705af5a11384ae CI 1665924398 +0900 commit: blah diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/new-branch b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/new-branch deleted file mode 100644 index dcfac6de4..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/logs/refs/heads/new-branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 6d69ac71e12a83769fca195d0a714435e1f4661a CI 1665924403 +0900 branch: Created from refs/heads/@ diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 deleted file mode 100644 index a8a2b586df771ca14cecde7807a27ce30a6b580c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb+k8|g>J5cLD&o#S2XU diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/18/565748bda3ca01a67a92f340705af5a11384ae b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/18/565748bda3ca01a67a92f340705af5a11384ae deleted file mode 100644 index 111cf1d1f..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/18/565748bda3ca01a67a92f340705af5a11384ae +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9Ed3̀U1I&ThL)<=ۏx.т%A 1۔p`=4$XnBB1<.T3~yyyʗ۾-ЀzGQ_ N=~\ -9f \ No newline at end of file diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca deleted file mode 100644 index 07b07e91fc3473d2d2b21397ee9c3197bcd0bbe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJsk8|g>J$%4di(1Z N`-F<@0RUnl5mQh97fApB diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/6d/69ac71e12a83769fca195d0a714435e1f4661a b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/6d/69ac71e12a83769fca195d0a714435e1f4661a deleted file mode 100644 index 075130a92..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/6d/69ac71e12a83769fca195d0a714435e1f4661a +++ /dev/null @@ -1,3 +0,0 @@ -x= -1@abzAfgDdq%w `'K06UX Ė4WO9'm ]Dݛ%f͛H5q*DYW*:iəei4ԓ, -c`'8"#SC?; \ No newline at end of file diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/95/efd4ea6ed74b904cd8eeeaa6245ec462372f67 b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/95/efd4ea6ed74b904cd8eeeaa6245ec462372f67 deleted file mode 100644 index 4001d6ab36eb05dac42a67d7c051275c5b6a5dc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30gcT;3c@fDMq$@E#q0%{$z)=FC?a&#W7IN5!4N4CJic9c0Jo11-qLD) zbdppKeRC%>6`Tc%$eeV&aaz?CUZO!Vz%YxP!u;;{w$V7zFiuzh%=Pv3)6(jNBxgfR Xib6*QbJ*)X>Ha7Gd147)nH4KUIpR0k diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b deleted file mode 100644 index 85866acd897b150150557b0a331c827562ca4fa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;s>AV=y!@Ff%bxNXyJgH89jGsVHG^zut9yQT_3M9>$%4di(1Z n`-F<@K~`l1R>kK2&%2oE{r*j+J3eGcN9r85m}>?A;$I(9i#8>| diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/cf/c66e0e89b1dc11a927cc453dbee025ff03cf83 b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/cf/c66e0e89b1dc11a927cc453dbee025ff03cf83 deleted file mode 100644 index 3e1a2801d..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/cf/c66e0e89b1dc11a927cc453dbee025ff03cf83 +++ /dev/null @@ -1,3 +0,0 @@ -xA -1 @Q=E4mADH C,<[Ʀ -bP8s-GXErH)U6} H^[%('KFUa$/78Ϸ~O=_14G5{ݧ,/[; \ No newline at end of file diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 deleted file mode 100644 index 8bcfafeb644d88961fada612e53598966fbe73ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(cC0V^p=O;s>7G+{6_FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY O3)x&PPXPdnMJ)ztA2U4w diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/@ b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/@ deleted file mode 100644 index 2f00c9f3a..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/@ +++ /dev/null @@ -1 +0,0 @@ -6d69ac71e12a83769fca195d0a714435e1f4661a diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/master b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 15e666674..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -18565748bda3ca01a67a92f340705af5a11384ae diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/new-branch b/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/new-branch deleted file mode 100644 index 2f00c9f3a..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/.git_keep/refs/heads/new-branch +++ /dev/null @@ -1 +0,0 @@ -6d69ac71e12a83769fca195d0a714435e1f4661a diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/file01.txt b/test/integration_new/branch/checkout_by_name/expected/repo/file01.txt deleted file mode 100644 index 47d78ad7a..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/file01.txt +++ /dev/null @@ -1 +0,0 @@ -file01 content \ No newline at end of file diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/file02.txt b/test/integration_new/branch/checkout_by_name/expected/repo/file02.txt deleted file mode 100644 index 0647fe4b7..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/file02.txt +++ /dev/null @@ -1 +0,0 @@ -file02 content \ No newline at end of file diff --git a/test/integration_new/branch/checkout_by_name/expected/repo/file03.txt b/test/integration_new/branch/checkout_by_name/expected/repo/file03.txt deleted file mode 100644 index 3bf868a38..000000000 --- a/test/integration_new/branch/checkout_by_name/expected/repo/file03.txt +++ /dev/null @@ -1 +0,0 @@ -file03 content \ No newline at end of file diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/delete/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 907b30816..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -blah diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/delete/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/HEAD b/test/integration_new/branch/delete/expected/repo/.git_keep/HEAD deleted file mode 100644 index 62c2c3bd5..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch-two diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/config b/test/integration_new/branch/delete/expected/repo/.git_keep/config deleted file mode 100644 index 8a748ce32..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/description b/test/integration_new/branch/delete/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/index b/test/integration_new/branch/delete/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1661162427 +1000 commit (initial): blah -a7222d091ed91af493b7173e4b09dd2de085031d a7222d091ed91af493b7173e4b09dd2de085031d CI 1661162427 +1000 checkout: moving from master to branch-one -a7222d091ed91af493b7173e4b09dd2de085031d a7222d091ed91af493b7173e4b09dd2de085031d CI 1661162427 +1000 checkout: moving from branch-one to branch-two diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-one b/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-one deleted file mode 100644 index 6de773cbd..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-one +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a7222d091ed91af493b7173e4b09dd2de085031d CI 1661162427 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-two b/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-two deleted file mode 100644 index 6de773cbd..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/branch-two +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a7222d091ed91af493b7173e4b09dd2de085031d CI 1661162427 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 608657ff8..000000000 --- a/test/integration_new/branch/delete/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a7222d091ed91af493b7173e4b09dd2de085031d CI 1661162427 +1000 commit (initial): blah diff --git a/test/integration_new/branch/delete/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/delete/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 WcmbRG+oAomCC5#o zgQF*t?(X3JbE^La3j<49W=<+l76?LuTwQ?_8-uQ)f&o{MYbeNuFtEI#fq|Kc2?HwS zBj&EydGWT%>GYjbEQ^Ae6!X+>Vza|)jX`lY?=6d)DXX6yvPfh8X)r65;Zo7s#M))= R7QK?vbbWOFMuGNp2LK+~MxOux diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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_new/branch/rebase/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index be5fa6486..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,13 +0,0 @@ -0000000000000000000000000000000000000000 0227353d56e56df9e9f94559f90b86ce7aa1ca5c CI 1661164934 +1000 commit (initial): one -0227353d56e56df9e9f94559f90b86ce7aa1ca5c d7149d98e6da25303f9a8cdff131da4b0723a412 CI 1661164934 +1000 commit: two -d7149d98e6da25303f9a8cdff131da4b0723a412 4c66ef64d685d244db41efda29deffb381c46c3d CI 1661164934 +1000 commit: three -4c66ef64d685d244db41efda29deffb381c46c3d b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 commit: original -b827df09781d0648f66cd9a01f0ec0ad5d412e10 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from original-branch to first-change-branch -b827df09781d0648f66cd9a01f0ec0ad5d412e10 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 commit: first change -f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from first-change-branch to original-branch -b827df09781d0648f66cd9a01f0ec0ad5d412e10 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from original-branch to second-change-branch -b827df09781d0648f66cd9a01f0ec0ad5d412e10 702b646c08ba47b2ac5729deed77188ef1647b4d CI 1661164934 +1000 commit: second change -702b646c08ba47b2ac5729deed77188ef1647b4d 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164934 +1000 commit: second-change-branch unrelated change -5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 checkout: moving from second-change-branch to first-change-branch -f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164936 +1000 rebase (start): checkout second-change-branch -5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164938 +1000 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch deleted file mode 100644 index 994f744ef..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 branch: Created from HEAD -b827df09781d0648f66cd9a01f0ec0ad5d412e10 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 commit: first change -f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164938 +1000 rebase (continue) (finish): refs/heads/first-change-branch onto 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch deleted file mode 100644 index 0de43eaeb..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 0227353d56e56df9e9f94559f90b86ce7aa1ca5c CI 1661164934 +1000 commit (initial): one -0227353d56e56df9e9f94559f90b86ce7aa1ca5c d7149d98e6da25303f9a8cdff131da4b0723a412 CI 1661164934 +1000 commit: two -d7149d98e6da25303f9a8cdff131da4b0723a412 4c66ef64d685d244db41efda29deffb381c46c3d CI 1661164934 +1000 commit: three -4c66ef64d685d244db41efda29deffb381c46c3d b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 commit: original diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch deleted file mode 100644 index b20bc5041..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 branch: Created from HEAD -b827df09781d0648f66cd9a01f0ec0ad5d412e10 702b646c08ba47b2ac5729deed77188ef1647b4d CI 1661164934 +1000 commit: second change -702b646c08ba47b2ac5729deed77188ef1647b4d 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164934 +1000 commit: second-change-branch unrelated change diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 deleted file mode 100644 index bd9b135ac92b2dd8c84e8ee930f3abbad446dcdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb_?tZyx1W^!I;T0!)zPP`GRvIt8v}0& E0IOXS3jhEB diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 deleted file mode 100644 index 3f0746de578045d05bc0ab70eedb0910b69841be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmV+}0MY+=0ZYosPf{>8V&DqN$SmgaEC$l4T*0Zy`FSY{&KZe$>8V_9nK`Lk0P)uh E7zjcZDF6Tf diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 deleted file mode 100644 index 8cded6c81b47e88b26c954bb22ad356788258752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb8WZ(+P$SmgaEC$l4TyB{~#U%>P8Hsu6AWlvy7Xam63&W%1 B5^Dee diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb4XW$CS$SmgaEC$l4T>eFw>6v+nIb3d;IjLL#xmpU3me3P0 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d deleted file mode 100644 index b78879b105579bddbbb0f5a433b0ee5297e903f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@MfQTsB-1eiB0^U^#w3|g!P-(Hczk;Vx1YawWnGqM z_bB1icQa2pg`pOvP%>K<1qK@^w^Ug|N-dj_0J%+fdv{;2NKz#kR}Dji*hEvQtzpEf zl;Ikp5(cNAKCinUCx08KhkbR~UUn(#a`(uL$Rv^c83Di@^+0v|b9a3{=VPd9Re>JAhF+lC$6x%s zt?O%mbN)2CDj<@&La{Otic2-csv#B(B2%m+a%HrX%+6ig0756hhm29!lQ_;3xl~jO zk&RKS4F~&T_&w&W!{Z6J$Mdc~yzYyBo3?gPQrwowQnFsnI+pEem7$3YC_`0)tY6~(JZrB>@U zBzSunomm2?Ost|uN`yf5pMzoDKx-%_g&2}A&d-k`jKQcBEro*MioE?VDS+Yxs0146Sq EW|(wDi2wiq diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 deleted file mode 100644 index 9fcee8fcd7e1571c6bf065db0ba746bb5a1e1c72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA33IZ_@K&^9%^ny&XGh+rsgst`%`AkqSW?3S7eD?@8uXw!T<=)z3 zSSN58o2tbWJeADob7D;rfk6pV4TZ&rP?IVOpjqRluVKOa^F&i2R^n1cr3w=5gcLaI zIYyTwWfR}y-Zwih_A)Ow{l>OF^^|+NTF2}hqfBUz4gkz<_o<Gp0gcW}3c@fDfMM4;MfQTsLvlfn}hC)+Nl<02c=VeGGx7;=S5)leOz9nougF5U~KcSc$l#3|K)J za`DBX5d@V#ecqZLMtvQ|yL|JqzvRN(a??nJNG@5Y&j7Ke?*U_U@YJygo$z I0CvSYX@NRS+yDRo diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch deleted file mode 100644 index 4867226ea..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch +++ /dev/null @@ -1 +0,0 @@ -5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch deleted file mode 100644 index 8b9bdc87a..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch +++ /dev/null @@ -1 +0,0 @@ -b827df09781d0648f66cd9a01f0ec0ad5d412e10 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch deleted file mode 100644 index 4867226ea..000000000 --- a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch +++ /dev/null @@ -1 +0,0 @@ -5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/file b/test/integration_new/branch/rebase/expected/repo/file deleted file mode 100644 index 164a07af1..000000000 --- a/test/integration_new/branch/rebase/expected/repo/file +++ /dev/null @@ -1,6 +0,0 @@ - -This -Is -The -Second Change -File diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e2e92c427..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -to keep diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD deleted file mode 100644 index e1c7bf8c5..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 27e5d1433..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -39129f24587bdc648e1fdb6f0b089c0846f54d45 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config deleted file mode 100644 index 8a748ce32..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index deleted file mode 100644 index 44eb0c68b991165858fd0e4ca52e5785721eaa11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmZ?q402{*U|<4b#$@Ki5S}*EH!zx!fq|9zQ&AKHL*o*l^jDx75g=9&^I~5w`r=>o zgQF*t?(X3JbE^La3j<49W=<+l76?LuTwQ?_8-uQ)f&o{MYbeNuFtEI#fq|Kc2?HwS zBj&EydGWT%>GYjbEQ^Ae6!X+>Vza|)jX`lY?=6d)DXX6yvPfh8X)r5w`VK`CQ_e(_ RQ>-ssKEK>M^X)eo0RXP^MzjC` diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index a0a6f7fe5..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,16 +0,0 @@ -0000000000000000000000000000000000000000 ab5816052b05d45683d9fd3aa85203995b66cd65 CI 1661165903 +1000 commit (initial): one -ab5816052b05d45683d9fd3aa85203995b66cd65 9d068e4adf5b237e3f3abe9ce38cfd996cce75dc CI 1661165903 +1000 commit: two -9d068e4adf5b237e3f3abe9ce38cfd996cce75dc 7c0af051757503c84800076fd34851ea8b81e415 CI 1661165903 +1000 commit: three -7c0af051757503c84800076fd34851ea8b81e415 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 commit: original -c066f8c513a34cd0c63e54c3b418a50491686cff c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from original-branch to first-change-branch -c066f8c513a34cd0c63e54c3b418a50491686cff 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 commit: first change -5587edfe46cfc076fb9ff4db76d196965838669a c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from first-change-branch to original-branch -c066f8c513a34cd0c63e54c3b418a50491686cff c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from original-branch to second-change-branch -c066f8c513a34cd0c63e54c3b418a50491686cff 3fc37a0e51435e01769aa25e6fe7179add2642a6 CI 1661165904 +1000 commit: second change -3fc37a0e51435e01769aa25e6fe7179add2642a6 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165904 +1000 commit: second-change-branch unrelated change -3228c73cfc742264f3101966a81d6a0a70488e36 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 checkout: moving from second-change-branch to first-change-branch -5587edfe46cfc076fb9ff4db76d196965838669a b56a14235fe8b10e5cca38d8b8009899d60b6499 CI 1661165904 +1000 commit: to drop -b56a14235fe8b10e5cca38d8b8009899d60b6499 39129f24587bdc648e1fdb6f0b089c0846f54d45 CI 1661165904 +1000 commit: to keep -39129f24587bdc648e1fdb6f0b089c0846f54d45 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165905 +1000 rebase (start): checkout second-change-branch -3228c73cfc742264f3101966a81d6a0a70488e36 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (pick): to keep -99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch deleted file mode 100644 index 46db32f0e..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 branch: Created from HEAD -c066f8c513a34cd0c63e54c3b418a50491686cff 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 commit: first change -5587edfe46cfc076fb9ff4db76d196965838669a b56a14235fe8b10e5cca38d8b8009899d60b6499 CI 1661165904 +1000 commit: to drop -b56a14235fe8b10e5cca38d8b8009899d60b6499 39129f24587bdc648e1fdb6f0b089c0846f54d45 CI 1661165904 +1000 commit: to keep -39129f24587bdc648e1fdb6f0b089c0846f54d45 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (finish): refs/heads/first-change-branch onto 3228c73cfc742264f3101966a81d6a0a70488e36 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch deleted file mode 100644 index 5999618a9..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 ab5816052b05d45683d9fd3aa85203995b66cd65 CI 1661165903 +1000 commit (initial): one -ab5816052b05d45683d9fd3aa85203995b66cd65 9d068e4adf5b237e3f3abe9ce38cfd996cce75dc CI 1661165903 +1000 commit: two -9d068e4adf5b237e3f3abe9ce38cfd996cce75dc 7c0af051757503c84800076fd34851ea8b81e415 CI 1661165903 +1000 commit: three -7c0af051757503c84800076fd34851ea8b81e415 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 commit: original diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch deleted file mode 100644 index e0b0742a8..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 branch: Created from HEAD -c066f8c513a34cd0c63e54c3b418a50491686cff 3fc37a0e51435e01769aa25e6fe7179add2642a6 CI 1661165904 +1000 commit: second change -3fc37a0e51435e01769aa25e6fe7179add2642a6 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165904 +1000 commit: second-change-branch unrelated change diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 deleted file mode 100644 index bd9b135ac92b2dd8c84e8ee930f3abbad446dcdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb_?tZyx1W^!I;T0!)zPP`GRvIt8v}0& E0IOXS3jhEB diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 deleted file mode 100644 index 3f0746de578045d05bc0ab70eedb0910b69841be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmV+}0MY+=0ZYosPf{>8V&DqN$SmgaEC$l4T*0Zy`FSY{&KZe$>8V_9nK`Lk0P)uh E7zjcZDF6Tf diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 deleted file mode 100644 index 8cded6c81b47e88b26c954bb22ad356788258752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb4Z8i;v2%h?kO|r3qO-qd6^DX!RuQPL)xGu}1 zfic6ORS`gRVv-v(JBPve?8huLCZrJTm|X}xqjp|xT%|PVbL<_XSUvPsc0-=oSfMO# z&p0JRgJDwqZu45E;HVK%?R1}N@@KAI64#QtICHs6 V7b=%H!@E>@a+3r8WZ(+P$SmgaEC$l4TyB{~#U%>P8Hsu6AWlvy7Xam63&W%1 B5^Dee diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 deleted file mode 100644 index 91a3f59305cb4fec0824d5d4afbef89b41f1630f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gcW<3c@fDKvCB@MfQTsG|40Z5uvLdBbiLBV4G4Sczk;Vx1YE8+?M6p z^#E|{yNCwxG87+b@*eUKYYbH=6rh}4s6J4XW$CS$SmgaEC$l4T>eFw>6v+nIb3d;IjLL#xmpU3me3P0 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a deleted file mode 100644 index b4c454a68..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] 2I ]tb!Fn}]bZT-f. H#r2;чiVms8H L0$-I]i=^z}YdFd3iMUS7YmeICa;: \ No newline at end of file diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc deleted file mode 100644 index 125e024fab9dc20ad4b148addfcb48a014ce8fda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85 zcmV-b0IL6Z0ZYosPg1ZnXW$CS$SmgaEC$l4Ts9D(;Nj}%!WEpFoS&DX;GB_|m!8UH r3jthinMK7VFhM&AP%t&MFi%ZMQ_x5Q%O-=hXad#dq;dfO7{nek|7|9q diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 deleted file mode 100644 index 4b6d35f7f04de784048a4a7d1a464ac90e09f1f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)*$XoHO*2qL=&Hv^CKDqJ54w6h?13qhv~eAi?Jv3zChoW)V-|)saqlcTEK_ich76Y~3WTx|D@jT;y7a zkXfb?RO!>V{nX2<=Vg7!H?`v>H{RP_8$@F;5IB7`0H6jPQ(gYlRo}+C`T-MdI}hc- BLnit9kfT}Crmt?jb5husS~xgIp?U<2L`iU_ z1c@Pts3()&{nj=+PWC)bSN)`Aed?*SCHY=SMvpI G&pA=4j7m@d diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc deleted file mode 100644 index 1e6785cfe1fcb7890e27f7088bf73579ccb823b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gcX03c@fDKw;N8MfQSBerCvk6rrmgBa=)~Fs77<9^W3p?c-a#(p!5B z>ljXBSG7@+$66@*BBa6@2o$5NsS^8?R#A-%(QJ9w*RWYIIRf+oSR+yjmDd__PUs;p zqY#x!X!3j9`)=pOUgzbe-`uvRUP^D1bwth)G6Z{e0AP-KObz{$oAK%92hyuJjWU=; Ai~s-t diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 deleted file mode 100644 index 00050c536340577500754ddf7c70a70f7f15d348..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30gcT;3c@fDMq$@E#q0%{iIX7#5uvLdBT4_FV2qRq9^W3p?c;-2duxwD zqW&;8fV4y(mTKy2F_e_q7(vS#7fU|IwE&t}UH*)F-)NfYGR-%9b9+B=s=ZxF%tS0C XKGRW{+3j_o4E)Jmf5H6#f0ip&BqcW9 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 deleted file mode 100644 index 11da58d508b854e3f76fefb8c9b78a82cc71636c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gcX03c@fDKw;N8MfQTsG|8j`B0^U^Mt){cu%?6v9^W3p?Z;cZ(zfk6 zEV4h1E@Dxgo0NRX;0h3<^NdL+DAhy6Fvm!_hG6#8CXq6H#pW>sHvq>4;T zVRkbSCzC$o(Yjq$dtKJMeABkSTkDZbq}Ux83{za%?%K DRE9_t diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff deleted file mode 100644 index 750122d3f3fb61a249aaabf5e223b3af4e52cdbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmV;I0BHYs0gaA93d0}}MZ5MC?h9omanylQ3R&eCY9?(U#vm4Y{Cb4$K9Bd{r;_v5 zG%{UU714;WSb@mKCSEvlBrzrpeS6D;@IYy_KB+TQIhu9}!U}|r9Ko2p@c`iLx{SsX zO7PL67$g-w?Om##W__RLr+h;`ce$mK9~!Miw8UWa6??8a?WdajsjE`A*LH+m{Qz%E FIiiIdNQeLc diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch deleted file mode 100644 index c61dc9511..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch +++ /dev/null @@ -1 +0,0 @@ -99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch deleted file mode 100644 index 383cec079..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch +++ /dev/null @@ -1 +0,0 @@ -c066f8c513a34cd0c63e54c3b418a50491686cff diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch deleted file mode 100644 index de415434a..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch +++ /dev/null @@ -1 +0,0 @@ -3228c73cfc742264f3101966a81d6a0a70488e36 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/file b/test/integration_new/branch/rebase_and_drop/expected/repo/file deleted file mode 100644 index 164a07af1..000000000 --- a/test/integration_new/branch/rebase_and_drop/expected/repo/file +++ /dev/null @@ -1,6 +0,0 @@ - -This -Is -The -Second Change -File diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 19d60e4ba..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -current-branch commit diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/HEAD deleted file mode 100644 index f381a9dda..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/current-branch diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 784d8ea18..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -bad42488b30daac9e329ccb76a758d78c484a463 diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/config b/test/integration_new/branch/reset/expected/repo/.git_keep/config deleted file mode 100644 index 1723dc5b9..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/config +++ /dev/null @@ -1,14 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false -[protocol "file"] - allow = always diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/description b/test/integration_new/branch/reset/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/index b/test/integration_new/branch/reset/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1671449839 +1100 commit (initial): root commit -bc64902742511e6be6e8d4f6aa90f113ab03f232 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 checkout: moving from current-branch to other-branch -bc64902742511e6be6e8d4f6aa90f113ab03f232 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449839 +1100 commit: other-branch commit -0e9962fc70276ff33de86f77f20ed4482273711a bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 checkout: moving from other-branch to current-branch -bc64902742511e6be6e8d4f6aa90f113ab03f232 bad42488b30daac9e329ccb76a758d78c484a463 CI 1671449839 +1100 commit: current-branch commit -bad42488b30daac9e329ccb76a758d78c484a463 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449840 +1100 reset: moving to other-branch diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch deleted file mode 100644 index a90b621d5..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 commit (initial): root commit -bc64902742511e6be6e8d4f6aa90f113ab03f232 bad42488b30daac9e329ccb76a758d78c484a463 CI 1671449839 +1100 commit: current-branch commit -bad42488b30daac9e329ccb76a758d78c484a463 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449840 +1100 reset: moving to other-branch diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch deleted file mode 100644 index a90e49460..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 branch: Created from HEAD -bc64902742511e6be6e8d4f6aa90f113ab03f232 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449839 +1100 commit: other-branch commit diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a deleted file mode 100644 index aff4ca86c35aeb8499eb3712b6bbd7a4134825f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmV;M0A&Ao0gaA93d0}}0DJZo-b>4>n~g##g`DyX*Q}&aV-O2{egpkLufq&Xs---; zwm_%eL^QIu!;%PXViFD!2xLIcexYE!&n$ugQ0=kF)-@k$06U@`j1giX@e5{(F+euP zMFy9xvnsy(TAQ9`eVgWod}7&Oa!s||wV}}<2JeDC8v~#YdQ5fsQ&+XG(k|TMmR9|X J)fc?;KK=VANUs0@ diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 WcmbX-i1K=UeduUWXZ&w3hO0 z+JHZ`Dx!(K>89k!BzD3ff&=M@v!7fr-e(q}0Hn59WoeoZHGt{Kbco_uocM{di!ne( zw2{GPV~vV?o7bv`QQwB~A@5kWmt50Y?iyW>M8Vsj&xio(pvP2`KXsM%`klFOjZ2#K KFIOKxbU)zweNf&2 diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 deleted file mode 100644 index bf16466f3db351c25ef798e7f43c5de98a517f91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00ga783IZ_<06q5=xeJoiG`1ij>}j9Tbh9W}x|9k&-vvM5b(mpFtMxg6 z0v<*;1J>xnQiOd`F-;i-EwHX}k>q1s)r=Fe%kS}M9i|zs(|os2uG`B_rPUjdT!=Zv abAlrgqTA^{8TO~{dTRrIk^2Jg!7iRVKR5;e diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch deleted file mode 100644 index 7851aec36..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch +++ /dev/null @@ -1 +0,0 @@ -0e9962fc70276ff33de86f77f20ed4482273711a diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch deleted file mode 100644 index 7851aec36..000000000 --- a/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch +++ /dev/null @@ -1 +0,0 @@ -0e9962fc70276ff33de86f77f20ed4482273711a diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/suggestions/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 8a744b4fe..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -my commit message diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/suggestions/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/HEAD b/test/integration_new/branch/suggestions/expected/repo/.git_keep/HEAD deleted file mode 100644 index 3b627c921..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch-to-checkout diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/config b/test/integration_new/branch/suggestions/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[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_new/branch/suggestions/expected/repo/.git_keep/description b/test/integration_new/branch/suggestions/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/index b/test/integration_new/branch/suggestions/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1659873850 +1000 commit (initial): my commit message -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from master to new-branch -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from new-branch to new-branch-2 -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from new-branch-2 to new-branch-3 -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from new-branch-3 to branch-to-checkout -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from branch-to-checkout to other-new-branch-2 -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from other-new-branch-2 to other-new-branch-3 -1682dc1949e1937af44b5270fec5c1ac9256c6a1 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 checkout: moving from other-new-branch-3 to branch-to-checkout diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/branch-to-checkout b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/branch-to-checkout deleted file mode 100644 index 6b7fc9713..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/branch-to-checkout +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 7475970dc..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 commit (initial): my commit message diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch deleted file mode 100644 index 6b7fc9713..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-2 b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-2 deleted file mode 100644 index 6b7fc9713..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-2 +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-3 b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-3 deleted file mode 100644 index 6b7fc9713..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/new-branch-3 +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-2 b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-2 deleted file mode 100644 index 6b7fc9713..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-2 +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-3 b/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-3 deleted file mode 100644 index 6b7fc9713..000000000 --- a/test/integration_new/branch/suggestions/expected/repo/.git_keep/logs/refs/heads/other-new-branch-3 +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 1682dc1949e1937af44b5270fec5c1ac9256c6a1 CI 1659873850 +1000 branch: Created from HEAD diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/objects/16/82dc1949e1937af44b5270fec5c1ac9256c6a1 b/test/integration_new/branch/suggestions/expected/repo/.git_keep/objects/16/82dc1949e1937af44b5270fec5c1ac9256c6a1 deleted file mode 100644 index 45c339c1251d56ba83c8e0a054ad32b23844eecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmV-@0D}K`0ga783c@fD06pgwdlzIAlXU|kLQj20l5SOSNogarzqjBAybd!=sj9CA zHqfEXBH%N-Fck8xWRe^c5=!uSQ!|^bqp}61OnP?WQ+% diff --git a/test/integration_new/branch/suggestions/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/suggestions/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb 1663390248 -0700 commit (initial): base -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from master to first-branch -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from first-branch to second-branch -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from second-branch to first-branch -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 197a799a14b2ca7478cfe339e7c83f7cdea4918b CI 1663390248 -0700 commit: one -197a799a14b2ca7478cfe339e7c83f7cdea4918b c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390248 -0700 commit: two -c37c09bdd6f969542d7e94829662c5ac19f5fb7e 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from first-branch to second-branch -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 198998809e08270eebeb746d6aed45df9faee6a2 CI 1663390248 -0700 commit: three -198998809e08270eebeb746d6aed45df9faee6a2 2b10745f8823e1d49edc446ea1440d7730a6625b CI 1663390248 -0700 commit: four -2b10745f8823e1d49edc446ea1440d7730a6625b c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390248 -0700 checkout: moving from second-branch to first-branch -c37c09bdd6f969542d7e94829662c5ac19f5fb7e c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390252 -0700 rebase (start): checkout HEAD -c37c09bdd6f969542d7e94829662c5ac19f5fb7e 5d9c4c2ff245b2b0112cfa90a529baa3f3e12c6f CI 1663390252 -0700 rebase (pick): three -5d9c4c2ff245b2b0112cfa90a529baa3f3e12c6f 9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e CI 1663390252 -0700 rebase (pick): four -9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e 9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e CI 1663390252 -0700 rebase (finish): returning to refs/heads/first-branch diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch deleted file mode 100644 index 839c92cee..000000000 --- a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 branch: Created from HEAD -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 197a799a14b2ca7478cfe339e7c83f7cdea4918b CI 1663390248 -0700 commit: one -197a799a14b2ca7478cfe339e7c83f7cdea4918b c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390248 -0700 commit: two -c37c09bdd6f969542d7e94829662c5ac19f5fb7e 9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e CI 1663390252 -0700 rebase (finish): refs/heads/first-branch onto c37c09bdd6f969542d7e94829662c5ac19f5fb7e diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f5df202bf..000000000 --- a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 commit (initial): base diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch deleted file mode 100644 index 41f63c795..000000000 --- a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 branch: Created from HEAD -5b06c6c8d51ba89367991cc7b40dda5d827bb95a 198998809e08270eebeb746d6aed45df9faee6a2 CI 1663390248 -0700 commit: three -198998809e08270eebeb746d6aed45df9faee6a2 2b10745f8823e1d49edc446ea1440d7730a6625b CI 1663390248 -0700 commit: four diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918b b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918b deleted file mode 100644 index ec488017ba9a429a1d36d238415472d32ed14d5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MJ}LB(qu9NB0^U^Mkbk}U`#0yJia}G+s|A4(p!5D z>ljXBSG7UN$67G>BB;U{5Hto^sUmx#Ra65*Fk9aBJ!}-ff`w{yl8Glw%&wFq0cy>$ zl20NWv&o8EVTOuQBASMhxW=X70BuBt2d9#Iz_b(Jx5mJ!2k${LedQKdW{E)Kd z0B~?7?Cnvioo0KT<~u%N-CnpXWxd&sx$l*n7kj3W$Q<;TYWPz(x$M<^0eSp75nrK3 AUjP6A diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb3?N+ \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f deleted file mode 100644 index 8fdf508b88f1d9bcd3e4f17d6f2bf40530f7d341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmV;I0BHYs0e#Lv3c@fDKvCB@MJ}LBr^zG(B0^U^MlzXD!PrtFcznBX?e_B)U)I(h z-42YWzN=c7Bl;rbP%>%e1O)0`uCWkfj5Vt|24}Xk>#JKCg8=7Js4}s4Sc0;P$V4bU z$-vdu9Mq(DU)J4Dv%OC9T|cR9Prb<6ZgwCVM+S7!o*@93qaIUT|8tK&Zu)Ypn=hGm FIt^*qMy&t< diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e deleted file mode 100644 index de1b77fe4d21a4c6be22aaa1fe6c52728dea6b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0e#Lv3IZ_V~5fKkMAs8yZyYyFKt<# z!#Z|{(N!%;!Z4ReSR|@&h6ox+YMLWsN>x;efy|n_zK0Dn7b;jQQVc(Yl@P_A=dX`pL`s(o<>6)w&qHXFy8!2xkDZ*L`Z}e;)A1O>J8@Uxpw$ E1+Du+_y7O^ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e deleted file mode 100644 index 829be32046211347e61a1e7b83be05614d4e9a57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gaA93c@fD06pgw`GB%Xw@DU6gr540&31!=F{MQG`PLtJ9cEyp)q3yN z5ghuaYB482E)vj74w{J}fR30;S_1i$N>)VzG%IiV{DqMt5j)IYIATmvbQnmZq@hGv zl#yJ@hF|^GHapGsJk3}Aa9tmIl2$L)g|HXkG1((T0JGD5s_UP+>F;K~F)cZHpo2rH diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch deleted file mode 100644 index 52ca93d1e..000000000 --- a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch +++ /dev/null @@ -1 +0,0 @@ -9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index dca03b464..000000000 --- a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -5b06c6c8d51ba89367991cc7b40dda5d827bb95a diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch deleted file mode 100644 index 0d1ec1f3a..000000000 --- a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch +++ /dev/null @@ -1 +0,0 @@ -2b10745f8823e1d49edc446ea1440d7730a6625b diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 01f5cbba2..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,15 +0,0 @@ -second change - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# interactive rebase in progress; onto ccc8b92 -# Last command done (1 command done): -# pick dddf38b second change -# Next command to do (1 remaining command): -# pick dae6bc0 second-change-branch unrelated change -# You are currently rebasing branch 'first-change-branch' on 'ccc8b92'. -# -# Changes to be committed: -# modified: file -# diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD deleted file mode 100644 index e1c7bf8c5..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/first-change-branch diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index b303a7622..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ccc8b929484ac23c527c54d1a109f20b16f5a006 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config deleted file mode 100644 index 8a748ce32..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/index b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/index deleted file mode 100644 index b9ff2c0de0f85b22609b5413b6652b531f3af3ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmZ?q402{*U|<4b#$?rSB{o&nHWo zgQF*t?(X3JbE^La3j<49W=<+l76?LuTwQ^bB!i)X0T)A^ZpE*1Zq1+l&wAN*M||IH z#aJ2S8Va&B46Mb_z`)GJgaMWE5p!4Uym;H>bo$OImPJ8Kig{``t=1S6ck|w|xS6v0 l*&&NG=AQ<$Qn5Luh}ACfgS@E0AIFz*g5Pr1y?!yN9RQT-PLu!u diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 41ddb58b4..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 1091767dde559ffdc97b64f1536955253b931e50 CI 1663391521 -0700 commit (initial): one -1091767dde559ffdc97b64f1536955253b931e50 ad9b1c669fdc039038e54fc497f3e888cc4654e0 CI 1663391521 -0700 commit: two -ad9b1c669fdc039038e54fc497f3e888cc4654e0 1f9963859d30c1bfe620e9121f3d689a07a35519 CI 1663391521 -0700 commit: three -1f9963859d30c1bfe620e9121f3d689a07a35519 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 commit: original -977cb37e46b9a00e19e6f99c5c179a30b990ca3d 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 checkout: moving from original-branch to first-change-branch -977cb37e46b9a00e19e6f99c5c179a30b990ca3d ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 commit: first change -ccc8b929484ac23c527c54d1a109f20b16f5a006 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 checkout: moving from first-change-branch to original-branch -977cb37e46b9a00e19e6f99c5c179a30b990ca3d 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 checkout: moving from original-branch to second-change-branch -977cb37e46b9a00e19e6f99c5c179a30b990ca3d dddf38b00920854961ad30512b3b174141e877b4 CI 1663391521 -0700 commit: second change -dddf38b00920854961ad30512b3b174141e877b4 dae6bc03641275886fa12a2a00c01edd6e975d99 CI 1663391521 -0700 commit: second-change-branch unrelated change -dae6bc03641275886fa12a2a00c01edd6e975d99 ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 checkout: moving from second-change-branch to first-change-branch -ccc8b929484ac23c527c54d1a109f20b16f5a006 ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 rebase (start): checkout HEAD -ccc8b929484ac23c527c54d1a109f20b16f5a006 e010d664020f79e46ef7f8bf2a1508fe0864109c CI 1663391522 -0700 rebase (continue): second change -e010d664020f79e46ef7f8bf2a1508fe0864109c 948965327ab8404a12fb80d9490ded95969431d1 CI 1663391522 -0700 rebase (continue) (pick): second-change-branch unrelated change -948965327ab8404a12fb80d9490ded95969431d1 948965327ab8404a12fb80d9490ded95969431d1 CI 1663391522 -0700 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch deleted file mode 100644 index ff417251b..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 branch: Created from HEAD -977cb37e46b9a00e19e6f99c5c179a30b990ca3d ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 commit: first change -ccc8b929484ac23c527c54d1a109f20b16f5a006 948965327ab8404a12fb80d9490ded95969431d1 CI 1663391522 -0700 rebase (continue) (finish): refs/heads/first-change-branch onto ccc8b929484ac23c527c54d1a109f20b16f5a006 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch deleted file mode 100644 index b9f592467..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 1091767dde559ffdc97b64f1536955253b931e50 CI 1663391521 -0700 commit (initial): one -1091767dde559ffdc97b64f1536955253b931e50 ad9b1c669fdc039038e54fc497f3e888cc4654e0 CI 1663391521 -0700 commit: two -ad9b1c669fdc039038e54fc497f3e888cc4654e0 1f9963859d30c1bfe620e9121f3d689a07a35519 CI 1663391521 -0700 commit: three -1f9963859d30c1bfe620e9121f3d689a07a35519 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 commit: original diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch deleted file mode 100644 index 09842646b..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 branch: Created from HEAD -977cb37e46b9a00e19e6f99c5c179a30b990ca3d dddf38b00920854961ad30512b3b174141e877b4 CI 1663391521 -0700 commit: second change -dddf38b00920854961ad30512b3b174141e877b4 dae6bc03641275886fa12a2a00c01edd6e975d99 CI 1663391521 -0700 commit: second-change-branch unrelated change diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 deleted file mode 100644 index bd9b135ac92b2dd8c84e8ee930f3abbad446dcdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb_?tZyx1W^!I;T0!)zPP`GRvIt8v}0& E0IOXS3jhEB diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 deleted file mode 100644 index 3f0746de578045d05bc0ab70eedb0910b69841be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmV+}0MY+=0ZYosPf{>8V&DqN$SmgaEC$l4T*0Zy`FSY{&KZe$>8V_9nK`Lk0P)uh E7zjcZDF6Tf diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 deleted file mode 100644 index 8cded6c81b47e88b26c954bb22ad356788258752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmbB*)5xVLzlF5V$)|L{%rA1p-5$p_@d$wxC2L z5-~*ulRtgg4m-{EHq8(H=5>GRMYi>B9byRVl6UqDR{%5WnCki`H+>oF<_Db4Isg2r BM-Tu2 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb deleted file mode 100644 index e4ca8d59a28af84f911ba57b5962caa3f2e160be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85 zcmV-b0IL6Z0ZYosPg1b7VBiYL$SmgaEC$l4Ts9D(;Nj}%!sV7(R9vFqoROH9p2}ql r0bIeU$@zIHFi|@QP)JEhNi()cQqU-dNGF3eX#$PNN#z0nLB<~6L%t|D diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 deleted file mode 100644 index 1f72f9aeea32636014d2a1fd48203d51ca973040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmV+`0M!3@0ZYosPf{>8WZ(+P$SmgaEC$l4TyB{~#U%>P8Hsu6AWlvy7Xam63&W%1 B5^Dee diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb4XW$CS$SmgaEC$l4T>eFw>6v+nIb3d;IjLL#xmpU3me3P0 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/94/8965327ab8404a12fb80d9490ded95969431d1 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/94/8965327ab8404a12fb80d9490ded95969431d1 deleted file mode 100644 index 6510f0fd1a5558d883b06655437c8105a783235a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmV;a09OBa0fml13c@fD06pgw`+>?PZLo5Zow{^WW zFlIQkDguZkCXvfbgu(diT^8#S+7L#UDTJO;lUEO}QW^+qOx6x)Fq4-#i6g!WZW%P?SM9#56YxEHUfZFLkHRVrT&CgIj%kDUQqg+M_ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 deleted file mode 100644 index 52f8a5e1e..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9E.t〈UL'`R#x|{odunOmWXd H1dt_c yliץYQ2Eu!sPd Y`DA&}ڴMu{EzО!SMYT@; \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 deleted file mode 100644 index de1b67169..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 +++ /dev/null @@ -1,3 +0,0 @@ -xQj!>{uRy1^_}`CYm23M-Ŧ!V "kl,2'CZksQŸ(W+YqBɓFf&v \r=Ow=c -D%X[SSץlt{Շ -n~fD \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 deleted file mode 100644 index 32ec66bbf..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9\@$6cLT0m<=[}SDRW(V!rb+-YeӹI! e 9yG11c_|c`2N7J[_zK {pDB4{ݧ[2j~E< \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c deleted file mode 100644 index 8801370d5..000000000 --- a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9E.L&]DӖۅ{oxi5&` R1Xb 9[Zikf9a@vC1d Ul|u}88]Cm}ʉv{kqh>W/e.4D}'U>!F4n{LFFt9S;-qOp!(71$wf$=L)jR+9)tzDWXntu1g zGXID 1660133266 +1000 commit (initial): my commit message diff --git a/test/integration_new/commit/commit/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/commit/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 925bffbb2..000000000 --- a/test/integration_new/commit/commit/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 944b9ea58bef8f6352c3a081a1d0037125bcaabc CI 1660133266 +1000 commit (initial): my commit message diff --git a/test/integration_new/commit/commit/expected/repo/.git_keep/objects/3a/e2df795236e3c84cb1faa242d3268838603515 b/test/integration_new/commit/commit/expected/repo/.git_keep/objects/3a/e2df795236e3c84cb1faa242d3268838603515 deleted file mode 100644 index 57198442f6ad83fffd10538fa84ecee53ee8f023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s?nWH2-^Ff%bx$gNDv%t>WfyEIKS{qBcl{tT_-wHN?jA|1xZp&@wy diff --git a/test/integration_new/commit/commit/expected/repo/.git_keep/objects/94/4b9ea58bef8f6352c3a081a1d0037125bcaabc b/test/integration_new/commit/commit/expected/repo/.git_keep/objects/94/4b9ea58bef8f6352c3a081a1d0037125bcaabc deleted file mode 100644 index edba03fb864c2a2ec485a33640a82841c92524ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmV-?0E7Q{0ga783c@fD06pgwdlw{|ZPo}Pg`WD1HQlP<5@{pU-y84)UWXYb7qdqN zjJ&IhDv)TH=Hn>_Vx^qAe8pKLbYY^vDN$li5u=lLy_W@s5zfQd>n8Sk>LC}q05W@| erZeo(d+!=;ld6B}&OY!ZrtS-@h%ePg06OXb diff --git a/test/integration_new/commit/commit/expected/repo/.git_keep/objects/97/04090f88911a4083ef7d5907e38b9f45e43b16 b/test/integration_new/commit/commit/expected/repo/.git_keep/objects/97/04090f88911a4083ef7d5907e38b9f45e43b16 deleted file mode 100644 index c4b48a2f084a86a8022e805a2a31d1f398d03f12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmbUVNRX>5kdkCDR50M;an8JdH0FxzN 1671534726 +1100 commit (initial): first line diff --git a/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index b5d6fc0c7..000000000 --- a/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f5b4b9b810f0c3d13754db99d24b04de451f8cec CI 1671534726 +1100 commit (initial): first line diff --git a/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 b/test/integration_new/commit/commit_multiline/expected/repo/.git_keep/objects/0c/4369dfc55cd41da90e149f2fa8ee3fc0a8f297 deleted file mode 100644 index 79af4f45f798b3b47d9f64165886623304a60f87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0V^p=O;s>9VK6i>Ff%bx$gNDv%t>WfyEIKS{qBcl{t$ 1660125381 +1000 commit (initial): commit 1 -4e72cd440eec154569568bff8d4c955052ae246c 563414ba32c967cfbe21a17fe892d6118c1c58e8 CI 1660125381 +1000 commit: commit 2 -563414ba32c967cfbe21a17fe892d6118c1c58e8 0af36e404e6fec1c3a4d887e30622238e5ea0b2b CI 1660125381 +1000 commit: commit 3 -0af36e404e6fec1c3a4d887e30622238e5ea0b2b 563414ba32c967cfbe21a17fe892d6118c1c58e8 CI 1660125382 +1000 checkout: moving from master to my-branch-name diff --git a/test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 0e17a4008..000000000 --- a/test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 4e72cd440eec154569568bff8d4c955052ae246c CI 1660125381 +1000 commit (initial): commit 1 -4e72cd440eec154569568bff8d4c955052ae246c 563414ba32c967cfbe21a17fe892d6118c1c58e8 CI 1660125381 +1000 commit: commit 2 -563414ba32c967cfbe21a17fe892d6118c1c58e8 0af36e404e6fec1c3a4d887e30622238e5ea0b2b CI 1660125381 +1000 commit: commit 3 diff --git a/test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/my-branch-name b/test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/my-branch-name deleted file mode 100644 index 6f401d926..000000000 --- a/test/integration_new/commit/new_branch/expected/repo/.git_keep/logs/refs/heads/my-branch-name +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 563414ba32c967cfbe21a17fe892d6118c1c58e8 CI 1660125382 +1000 branch: Created from 563414ba32c967cfbe21a17fe892d6118c1c58e8 diff --git a/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/0a/f36e404e6fec1c3a4d887e30622238e5ea0b2b b/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/0a/f36e404e6fec1c3a4d887e30622238e5ea0b2b deleted file mode 100644 index eb9800f0aabfc5ef2960db03868574081aa3da8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw|TN!AUB2tD-~$##o^v86=t`S#!gyw1#FbZPC; z0dqR^%?x4{N|SOVt!yxWUgj0`{>rP*{eh15HZ#gNHd>x*MtSnvq`3j z5k*mxn7H!p_ho}&gv&7A>{HtMw39CF3drn{QV@hAdhgv%_o;4w=D!|-`vM@{I%#lq BN{j#i diff --git a/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb3WMaF8}}l diff --git a/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/56/3414ba32c967cfbe21a17fe892d6118c1c58e8 b/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/56/3414ba32c967cfbe21a17fe892d6118c1c58e8 deleted file mode 100644 index 1a610226f..000000000 --- a/test/integration_new/commit/new_branch/expected/repo/.git_keep/objects/56/3414ba32c967cfbe21a17fe892d6118c1c58e8 +++ /dev/null @@ -1,2 +0,0 @@ -xA -1 @Q=E1-m&uw-ͭ=:,D22YU ))sFKYՁD62Ea,q,BʼnBymm*FcMu1eGDhZ)#%E7LM_QbFoM zf?QpJlq7?pf&rI~(VN}ncXw}y@OkypFi(?rd9ktjd@cJ837$3Ix4d5J9P%X6RFaWf F4FK=XAe#UH diff --git a/test/integration_new/commit/staged/expected/repo/.git_keep/info/exclude b/test/integration_new/commit/staged/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration_new/commit/staged/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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] -# *~ diff --git a/test/integration_new/commit/staged/expected/repo/.git_keep/logs/HEAD b/test/integration_new/commit/staged/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 277243a2e..000000000 --- a/test/integration_new/commit/staged/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a0a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 CI 1669569482 +0100 commit (initial): my commit message diff --git a/test/integration_new/commit/staged/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/staged/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 277243a2e..000000000 --- a/test/integration_new/commit/staged/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a0a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 CI 1669569482 +0100 commit (initial): my commit message diff --git a/test/integration_new/commit/staged/expected/repo/.git_keep/objects/2c/32ecbb77ddbbb0584ceae9316e290da7733327 b/test/integration_new/commit/staged/expected/repo/.git_keep/objects/2c/32ecbb77ddbbb0584ceae9316e290da7733327 deleted file mode 100644 index 75197c7e913c978ccb4e12bcebe3e0bfb5d0a761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmb8X2`8f%gjktNY2kINzE(aD$gv*P)JlLP6Z02DCA`3r2+sa Gd=7F6eH0J? diff --git a/test/integration_new/commit/staged/expected/repo/.git_keep/objects/a0/a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 b/test/integration_new/commit/staged/expected/repo/.git_keep/objects/a0/a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 deleted file mode 100644 index c03b37b1d..000000000 --- a/test/integration_new/commit/staged/expected/repo/.git_keep/objects/a0/a4dfd8937f66345c93ee7ebf5f85d53e05e9e8 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0]o/H~%PGJAoo fDd(9XkYq(`$glҕct٨mi4_fY8&2!$0Z:j>SW_Bm-0 \ No newline at end of file diff --git a/test/integration_new/commit/staged/expected/repo/.git_keep/objects/a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 b/test/integration_new/commit/staged/expected/repo/.git_keep/objects/a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 deleted file mode 100644 index d746db209b355034e77175036b466f51c7ccbd10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmb1eGDhZ)#%E7LM_QbFoM zf?QpJlq7?pf&rI~(VN}ncXw}y@OkypFi(?rd9ktjd@cJ837$3Ix4d5J9P%X6RFaWf F4FK=XAe#UH diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/info/exclude b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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] -# *~ diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/HEAD b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 1c6b9a7b2..000000000 --- a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 4a33e6274dd3bc702442966e6774e7688bb7af64 CI 1669660775 +0100 commit (initial): WIPmy commit message diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 1c6b9a7b2..000000000 --- a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 4a33e6274dd3bc702442966e6774e7688bb7af64 CI 1669660775 +0100 commit (initial): WIPmy commit message diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/2c/32ecbb77ddbbb0584ceae9316e290da7733327 b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/2c/32ecbb77ddbbb0584ceae9316e290da7733327 deleted file mode 100644 index 75197c7e913c978ccb4e12bcebe3e0bfb5d0a761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmb8X2`8f%gjktNY2kINzE(aD$gv*P)JlLP6Z02DCA`3r2+sa Gd=7F6eH0J? diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/4a/33e6274dd3bc702442966e6774e7688bb7af64 b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/4a/33e6274dd3bc702442966e6774e7688bb7af64 deleted file mode 100644 index 90e89ac27dd35c72948602d26ababbac5f4db72e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmV-{0Dk{?0ga8j3IZ_@0Il;C+Y7QuOxD052Un%Dv(95t!6kB+1O0ms`~llxhABoYT$Vhxv^iE7O`qdOf7Ck|G7HUVoQvep_>Y3=tm!xUkd;>hnLuO}Z$lQU@V jgZD_}V2>J6ZFHM-{!>@ic##kMDiB_lbYt}ez#lQ!Y$iHP diff --git a/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 b/test/integration_new/commit/staged_without_hooks/expected/repo/.git_keep/objects/a4/de8e0658023fb43037b687b5052c1b5b2ab0c3 deleted file mode 100644 index d746db209b355034e77175036b466f51c7ccbd10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmb 1669569750 +0100 commit (initial): my commit message diff --git a/test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 2889f13ff..000000000 --- a/test/integration_new/commit/unstaged/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 109e5843c76c640d7075c2897b5720f1714df776 CI 1669569750 +0100 commit (initial): my commit message diff --git a/test/integration_new/commit/unstaged/expected/repo/.git_keep/objects/00/e2463e8a06d3191bd825531e5dbf26bac22d6b b/test/integration_new/commit/unstaged/expected/repo/.git_keep/objects/00/e2463e8a06d3191bd825531e5dbf26bac22d6b deleted file mode 100644 index 5bdcb3903da65756ce19935b40720e2a49776c17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb 1669660788 +0100 commit (initial): WIPmy commit message diff --git a/test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 59e73348a..000000000 --- a/test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ebc03af0e92eb50f1ab1dec0697880ed9da9b02d CI 1669660788 +0100 commit (initial): WIPmy commit message diff --git a/test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/objects/00/e2463e8a06d3191bd825531e5dbf26bac22d6b b/test/integration_new/commit/unstaged_without_hooks/expected/repo/.git_keep/objects/00/e2463e8a06d3191bd825531e5dbf26bac22d6b deleted file mode 100644 index 5bdcb3903da65756ce19935b40720e2a49776c17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmboYU3r&0<1h-1y=YHegB4#rv{>xs}+A1Y;)-~HZZm=YYObmBG3>&g4l 1669295719 +0000 commit (initial): commit 01 -4fa4f5e427373ac4ac0a6e11ff97293649959859 ddb8365ff4c367dbd7d49b965ab4b43c865b99cf CI 1669295719 +0000 commit: commit 02 diff --git a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/config/remote_named_star/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d1a05666d..000000000 --- a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 4fa4f5e427373ac4ac0a6e11ff97293649959859 CI 1669295719 +0000 commit (initial): commit 01 -4fa4f5e427373ac4ac0a6e11ff97293649959859 ddb8365ff4c367dbd7d49b965ab4b43c865b99cf CI 1669295719 +0000 commit: commit 02 diff --git a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 b/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 deleted file mode 100644 index a8a2b586df771ca14cecde7807a27ce30a6b580c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb+k8|g>J5cLD&o#S2XU diff --git a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc b/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc deleted file mode 100644 index c562d38cc74cf217a96352f3dc336a387371e749..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbsk8|g>JrT^5<1}CWvy|7$%4di(1Z N`-F<@0RUnl5mQh97fApB diff --git a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b b/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b deleted file mode 100644 index 85866acd897b150150557b0a331c827562ca4fa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;s>AV=y!@Ff%bxNXyJgH89jGsVHG^zut9yQT_3M9>$%4di(1Z n`-F<@K~`l1R>kK2&%2oE{r*j+J3eGcN9r85m}>?A;$I(9i#8>| diff --git a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/dd/b8365ff4c367dbd7d49b965ab4b43c865b99cf b/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/dd/b8365ff4c367dbd7d49b965ab4b43c865b99cf deleted file mode 100644 index fc4abfe75..000000000 --- a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/objects/dd/b8365ff4c367dbd7d49b965ab4b43c865b99cf +++ /dev/null @@ -1,2 +0,0 @@ -x; -1@sL"V{I`e+^]z @XXbd3b T*%U6} M| )zV"ƉE86ei4_#}}.# GcvO 3`|O: \ No newline at end of file diff --git a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/refs/heads/master b/test/integration_new/config/remote_named_star/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 4dcaa7e6b..000000000 --- a/test/integration_new/config/remote_named_star/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -ddb8365ff4c367dbd7d49b965ab4b43c865b99cf diff --git a/test/integration_new/config/remote_named_star/expected/repo/file01.txt b/test/integration_new/config/remote_named_star/expected/repo/file01.txt deleted file mode 100644 index 47d78ad7a..000000000 --- a/test/integration_new/config/remote_named_star/expected/repo/file01.txt +++ /dev/null @@ -1 +0,0 @@ -file01 content \ No newline at end of file diff --git a/test/integration_new/config/remote_named_star/expected/repo/file02.txt b/test/integration_new/config/remote_named_star/expected/repo/file02.txt deleted file mode 100644 index 0647fe4b7..000000000 --- a/test/integration_new/config/remote_named_star/expected/repo/file02.txt +++ /dev/null @@ -1 +0,0 @@ -file02 content \ No newline at end of file diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 907b30816..000000000 --- a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -blah diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/HEAD b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/config b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[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_new/custom_commands/basic/expected/repo/.git_keep/description b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/index b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1660476851 +1000 commit (initial): blah diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index b6f3a54de..000000000 --- a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 fe47c0cf0521f8864cd0531ddf35d2f741c14abf CI 1660476851 +1000 commit (initial): blah diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb6#aJ0Ik+5xb(X>VE_OC diff --git a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/refs/heads/master b/test/integration_new/custom_commands/basic/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 0dfced756..000000000 --- a/test/integration_new/custom_commands/basic/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -fe47c0cf0521f8864cd0531ddf35d2f741c14abf diff --git a/test/integration_new/custom_commands/basic/expected/repo/myfile b/test/integration_new/custom_commands/basic/expected/repo/myfile deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 907b30816..000000000 --- a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -blah diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/HEAD b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/commit-template.txt b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/commit-template.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/config b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/config deleted file mode 100644 index 8a748ce32..000000000 --- a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/description b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/index b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1664625021 +0900 commit (initial): blah diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e0854d95a..000000000 --- a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 4687e94a43ed02b2ba08f3e6160ee22b92e64413 CI 1664625021 +0900 commit (initial): blah diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/46/87e94a43ed02b2ba08f3e6160ee22b92e64413 b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/46/87e94a43ed02b2ba08f3e6160ee22b92e64413 deleted file mode 100644 index 00eeb9d5f..000000000 --- a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/46/87e94a43ed02b2ba08f3e6160ee22b92e64413 +++ /dev/null @@ -1,3 +0,0 @@ -x1 -0 @>BUYPB Sa9 -)ĸz]?~i;x~aRX׸HW5oi4ۣ:a ]t;N+ \ No newline at end of file diff --git a/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/custom_commands/form_prompts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb 1660476303 +1000 commit (initial): foo -d50975554a574b9c66e109927fdb4edfb6bbadb3 af550d3777f20bf024ad55c9c796e7e85ef32ccb CI 1660476303 +1000 commit: bar -af550d3777f20bf024ad55c9c796e7e85ef32ccb 16919871d6b442beac07e1573c557ca433cff356 CI 1660476303 +1000 commit: baz -16919871d6b442beac07e1573c557ca433cff356 16919871d6b442beac07e1573c557ca433cff356 CI 1660476303 +1000 checkout: moving from master to feature/foo diff --git a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/feature/foo b/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/feature/foo deleted file mode 100644 index 5538ba67f..000000000 --- a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/feature/foo +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 16919871d6b442beac07e1573c557ca433cff356 CI 1660476303 +1000 branch: Created from HEAD diff --git a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f9d13618c..000000000 --- a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 d50975554a574b9c66e109927fdb4edfb6bbadb3 CI 1660476303 +1000 commit (initial): foo -d50975554a574b9c66e109927fdb4edfb6bbadb3 af550d3777f20bf024ad55c9c796e7e85ef32ccb CI 1660476303 +1000 commit: bar -af550d3777f20bf024ad55c9c796e7e85ef32ccb 16919871d6b442beac07e1573c557ca433cff356 CI 1660476303 +1000 commit: baz diff --git a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/16/919871d6b442beac07e1573c557ca433cff356 b/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/16/919871d6b442beac07e1573c557ca433cff356 deleted file mode 100644 index 7b0995a4d3539afe4d323f081e60996df0d9e9bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@MfQSBlgT6j5y4fDk(o?TFt(Hk;_2-X+PNd diff --git a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb$2YUo7(=;OWxYePDFr#W|-}H0swQ=V`}K1+(_!?2QaodStv3` AbpQYW diff --git a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/d5/0975554a574b9c66e109927fdb4edfb6bbadb3 b/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/d5/0975554a574b9c66e109927fdb4edfb6bbadb3 deleted file mode 100644 index a8654985c..000000000 --- a/test/integration_new/custom_commands/menu_from_command/expected/repo/.git_keep/objects/d5/0975554a574b9c66e109927fdb4edfb6bbadb3 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q91)BW=F&`R"n?~ 1669412559 +0100 commit (initial): foo -44531ed59352b290ebe5d6bebeada267dff76fd5 44531ed59352b290ebe5d6bebeada267dff76fd5 CI 1669412559 +0100 checkout: moving from master to feature/foo -44531ed59352b290ebe5d6bebeada267dff76fd5 b3518a56dbbd6df36eff0613aea30ab8e6659b26 CI 1669412559 +0100 commit: bar -b3518a56dbbd6df36eff0613aea30ab8e6659b26 b3518a56dbbd6df36eff0613aea30ab8e6659b26 CI 1669412559 +0100 checkout: moving from feature/foo to feature/bar -b3518a56dbbd6df36eff0613aea30ab8e6659b26 083b75d86104b3a7d89d9c355719b2aa9113cab9 CI 1669412559 +0100 commit: baz -083b75d86104b3a7d89d9c355719b2aa9113cab9 44531ed59352b290ebe5d6bebeada267dff76fd5 CI 1669412567 +0100 checkout: moving from feature/bar to master diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/bar b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/bar deleted file mode 100644 index 77d5c6099..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/bar +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 b3518a56dbbd6df36eff0613aea30ab8e6659b26 CI 1669412559 +0100 branch: Created from HEAD -b3518a56dbbd6df36eff0613aea30ab8e6659b26 083b75d86104b3a7d89d9c355719b2aa9113cab9 CI 1669412559 +0100 commit: baz diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/foo b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/foo deleted file mode 100644 index a09bd9f99..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/feature/foo +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 44531ed59352b290ebe5d6bebeada267dff76fd5 CI 1669412559 +0100 branch: Created from HEAD -44531ed59352b290ebe5d6bebeada267dff76fd5 b3518a56dbbd6df36eff0613aea30ab8e6659b26 CI 1669412559 +0100 commit: bar diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d1b8c187e..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 44531ed59352b290ebe5d6bebeada267dff76fd5 CI 1669412559 +0100 commit (initial): foo diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/08/3b75d86104b3a7d89d9c355719b2aa9113cab9 b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/08/3b75d86104b3a7d89d9c355719b2aa9113cab9 deleted file mode 100644 index e428309a2..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/08/3b75d86104b3a7d89d9c355719b2aa9113cab9 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9EL H1f -ƖA<=Ƿxe1#8]F>ՂAb@sn xװ˜T-+`ɊH<~yyKYd"ES"{`zL Y9 \ No newline at end of file diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/44/531ed59352b290ebe5d6bebeada267dff76fd5 b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/44/531ed59352b290ebe5d6bebeada267dff76fd5 deleted file mode 100644 index 07469bc40aa39d674231bb80fe5c2f075bf34129..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmV-)0E_>40gcT;3IZ_1$9PVN zOsBb<0oP1vYr@p3Sk;1pmbmu3iBitJnz15>@|h3cVOin2tatmC@qXE*`M5z8QI3?7 W!WkoCIO;K(_9qYBJ^TQIpDS$4z&geN diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmbmr;+SG6d?Q^|}z3#-Hg3`!_96plWGDykR(&7Qixhef2xX`wig7au`IsjwVKC3&7p ztuxm`CVj?Z>vmb~by@HFO>KYaC2#F!9dktIiK0D&12Bg@riT8R8%f>#0AjH@&9eYN Ay#N3J diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/bar b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/bar deleted file mode 100644 index 9dfead794..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/bar +++ /dev/null @@ -1 +0,0 @@ -083b75d86104b3a7d89d9c355719b2aa9113cab9 diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/foo b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/foo deleted file mode 100644 index 0fd10f171..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/feature/foo +++ /dev/null @@ -1 +0,0 @@ -b3518a56dbbd6df36eff0613aea30ab8e6659b26 diff --git a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/master b/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 203202599..000000000 --- a/test/integration_new/custom_commands/menu_from_commands_output/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -44531ed59352b290ebe5d6bebeada267dff76fd5 diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 907b30816..000000000 --- a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -blah diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/HEAD b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/config b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[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_new/custom_commands/multiple_prompts/expected/repo/.git_keep/description b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/index b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1660476863 +1000 commit (initial): blah diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 4f92ac410..000000000 --- a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 b97a1d7c0e8dceef724220008962f8512a974ff0 CI 1660476863 +1000 commit (initial): blah diff --git a/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/custom_commands/multiple_prompts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb Y+`-)=qPyxfY4#^~x~0|q0Isq7#f!VrN08zhyXEzq=1HKnyvDW z?NRQ}7f7bwxiihJhk+v{vq(QJGbfdSAtcDv6{yUV!BD}FYi07z$Xb4X?wM2F_2T}U zDQz@cvK6QlC}+UczO;d-iGQ|Q{U_%(?sJ>GS=N^=GR 1668129994 +1100 commit (initial): first commit diff --git a/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 5a93ac9cc..000000000 --- a/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 763788c33660f53eecaecce8dae27c34e647ac57 CI 1668129994 +1100 commit (initial): first commit diff --git a/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/19/102815663d23f8b75a47e7a01965dcdc96468c b/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/19/102815663d23f8b75a47e7a01965dcdc96468c deleted file mode 100644 index 280a426b7656bd61cdd4f48a43f8088ea18291b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbd;@;K>oCKtt=3He z2@l#uAaV4WiKn|Qq1epK6ecGmrTFMvMjuniWYSw7t;4*)WnOObNp*k9X>Iii7~>h; bC<7c3tu=#=iOQe4DO-Oj{3`PW+ubgI%49d` diff --git a/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/87/a5800c820f9b267ff243860bceb24b04af76a2 b/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/87/a5800c820f9b267ff243860bceb24b04af76a2 deleted file mode 100644 index 115dcca4644a2968b0626173be1b391ff6e94da9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgWsnrm5KXgH{;@sE{rLjP)H`>kx%B`5 H>1++gxn&gE diff --git a/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/a9/63b9597d0f4f0b9995472e5eff3622b136a4b5 b/test/integration_new/file/dir_with_untracked_file/expected/repo/.git_keep/objects/a9/63b9597d0f4f0b9995472e5eff3622b136a4b5 deleted file mode 100644 index ba6b1afcde1396992dcafef1d18d328bec541c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)>>!B8K**4LnW!v(@T9Ik$12+vLr%zHAWyYWV1LIeq8W9k#Vv69)%U+qc z;`f}oUDq$zGQ44PX5h)p%Ph%E%+XED%t-~R0s^2pdCYDq0x%k4o|`|KdED-oif1o6 z>^4EAr+?xO@2!5FW}UMb1oBeLb<aGLY-hkGVd((S!b4*=k>Tu}f3 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index bf29df758..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 commit (initial): initial commit -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 checkout: moving from development-branch to feature-branch -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI 1663440492 -0700 commit: new feature commit -d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 checkout: moving from feature-branch to development-branch -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy. -f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch -7802c86c6ce62289e32aa13d0c85dc3f733195cb 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440494 -0700 rebase (start): checkout f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15^ -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI 1663440494 -0700 rebase: fast-forward -d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440494 -0700 rebase (reset): 'onto' -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI 1663440494 -0700 rebase: fast-forward -f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 f517de66e2a158d4a1d85246611cae9ca23a938d CI 1663440494 -0700 rebase (fixup): Merge branch 'feature-branch' into development-branch -f517de66e2a158d4a1d85246611cae9ca23a938d f517de66e2a158d4a1d85246611cae9ca23a938d CI 1663440494 -0700 rebase (finish): returning to refs/heads/development-branch diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch deleted file mode 100644 index c7353e0e3..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 commit (initial): initial commit -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy. -f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch -7802c86c6ce62289e32aa13d0c85dc3f733195cb f517de66e2a158d4a1d85246611cae9ca23a938d CI 1663440494 -0700 rebase (finish): refs/heads/development-branch onto 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch deleted file mode 100644 index 2d2177acc..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 branch: Created from HEAD -3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI 1663440492 -0700 commit: new feature commit diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e deleted file mode 100644 index 5f350fcff7689be1cedb988a54cbb6af10f32e89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0V^p=O;s>7GG{O}FfcPQQOL~8EXhpF(M`+DNoA;Fir~x3UYWPz_nf+2 z*Du&IykT>Os>@3)*G)@JEGaEYg{XDER6KjpVYdk?J^d4RcyIOVH0zuNRa=l>T%wzs iT9gh|n*1Q|+tpnwSQ0PlO|^UeJj6wUw;upBfi$|t^*itY diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 deleted file mode 100644 index 0ac8eaeca224797ad80ebd692f5aa059808274c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmV->0EGW|0ga7Y3c@fD0R7G>_5#W#n^!@k(61h2n*_HH#HMP4aJBvky7XWwC(;Xch{KDfQNd`rDOKzmQt dq8$ueF(9gwo)gJ`>Z-n~RNmm%sV^6QF79mQIuQT> diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 deleted file mode 100644 index 057b302dc63b77dfa185ad0b0bbeda88f7ded413..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57 zcmV-90LK4#0V^p=O;s>4U@$Z=Ff%bx$jr+u$xO`AP0P$lWvF6`;LFQinYZHioVs1t PFW54?VRHrmc8U?5wZ$4+ diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a deleted file mode 100644 index c416a87e05b83ccdacb2040539807f0853995be9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27 icmbB|T`&JokJD#7Lp{!&*Y-TC&B(AUit8HyEpHEA diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb deleted file mode 100644 index e99473942..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb +++ /dev/null @@ -1,2 +0,0 @@ -xMj0F)R$J ,zx1Drkh޷xTK; .~ ֍ݠ%k!"iFyhfjK |v`1O1 Q|6^o -O,띿o0!X-uZͻ!7\a[?`^z|k_BN \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 deleted file mode 100644 index c30233de17aa43a1c80be7ab20fc51d5103224b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmbFf%bx$jr+u$xO`AP0P$lWvF6`;LFQinYZHioVs1t zFW54?VRMG6%S$cSO-oHIDJ@EcsCBzoAu*>)p7;leAW diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 deleted file mode 100644 index abe014bbcd74657bfb18ee1fa5645b48d85895a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>Gp0gaAZ3c@fD0R7G>_5w;C+in6PLce;9Ja$nqZ3!uQd<$N{-(dzOueClq zSUsG2V+KkEtz|cAUqZ^lEPf#LIp{cWHU=fzY)Eaf@zTM?av-0O3sMj(B@|y!NZ7^@ zj3Y9M#HqOV$J$_;;X2KC{=~Yy_>$Lp12c{eQDd-h)}*yM=rPs#PhBni2I1KE#_(&^ I7yqa~ae(kg&j0`b diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d deleted file mode 100644 index 3d42ec640..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d +++ /dev/null @@ -1,2 +0,0 @@ -xjADWtHf9@"9-fwFƟ˱^m et,Gx6JRg9ZI9`R2ȦYBfTQXCeb{?1 -pX:Ve7Ǹ:/Nm㵬퍴sYq4tT^i_wp~'(+i<:@eTyL?2#Y| \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 deleted file mode 100644 index 72c90791a..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 +++ /dev/null @@ -1,2 +0,0 @@ -xjC1DS߯ΕkiBrC>?9i<U!W4&Gµ)#5v{V.b}*ق Z6 ǜ}x-GS2R4Y\<&MSy|Mʼ+"Cptٹi_wħw -]`ZƣඌD?n{Lr[Y \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch deleted file mode 100644 index 8dec112d4..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch +++ /dev/null @@ -1 +0,0 @@ -f517de66e2a158d4a1d85246611cae9ca23a938d diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch deleted file mode 100644 index 61eacdc31..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch +++ /dev/null @@ -1 +0,0 @@ -d1c7801838f293fe8f4b49dae6b4919d0359e6e6 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file deleted file mode 100644 index 7a02580e6..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file +++ /dev/null @@ -1 +0,0 @@ -initial file content \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file deleted file mode 100644 index 47d2739ba..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file +++ /dev/null @@ -1 +0,0 @@ -new content \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file deleted file mode 100644 index 63e06ef6d..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file +++ /dev/null @@ -1 +0,0 @@ -post merge file content \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index b572ccaf3..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,30 +0,0 @@ -# This is a combination of 3 commits. -# This is the 1st commit message: - -commit 02 - -# The commit message #2 will be skipped: - -# commit 03 - -# This is the commit message #3: - -commit 05 - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Wed Aug 10 19:26:28 2022 +1000 -# -# interactive rebase in progress; onto cc9defb -# Last commands done (4 commands done): -# drop da71be1 commit 04 -# squash 8a38398 commit 05 -# No commands remaining. -# You are currently rebasing branch 'master' on 'cc9defb'. -# -# Changes to be committed: -# new file: file02.txt -# new file: file03.txt -# new file: file05.txt -# diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/HEAD b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 319624f9d..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -8a3839811a7a9f4c678090c9def892d1e7ad7e54 diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/REBASE_HEAD b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/REBASE_HEAD deleted file mode 100644 index 319624f9d..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/REBASE_HEAD +++ /dev/null @@ -1 +0,0 @@ -8a3839811a7a9f4c678090c9def892d1e7ad7e54 diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/config b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[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_new/interactive_rebase/one/expected/repo/.git_keep/description b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/index b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/index deleted file mode 100644 index 2a0f3f08aec0c1d2e7524875027e186182dda6f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmZ?q402{*U|<4bmZZ;>M@*(Y?}X8e3=FKyx9yu47#f!_Ffe`vsu2NVKKJWg*B8|v z|L0-c8K}3vZn00O$Q}l+w9K4T14F%%iV~n2FaVl!)S9h(0*r>3=fHt(9-I3=?_#F+ z`!|{H_>dtTsdLz3t{K!kBQ*1lNj4m+2AT(^q2|e;n`iwaV{zvNcDus3mVUm+wuNl2 zmZzZR8Dp6DuFDu~9*~BbXNYdzq0sYw-~WasuDsS=SmeC2;)yov8mM`u$mWFvxw-;9 zF3Dh`V8Hd#g3G2<&%36s)c*+6xgZ1esVk#`Tth*D?F 1660123588 +1000 commit (initial): commit 01 -cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 2e2cd25ffdec58d32b5d549f8402bd054e22cc2a CI 1660123588 +1000 commit: commit 02 -2e2cd25ffdec58d32b5d549f8402bd054e22cc2a 90fda12ce101e7d0d4594a879e5bbd1be3c857a8 CI 1660123588 +1000 commit: commit 03 -90fda12ce101e7d0d4594a879e5bbd1be3c857a8 da71be1afbb03f46e91ab5de17d69f148bb009f3 CI 1660123588 +1000 commit: commit 04 -da71be1afbb03f46e91ab5de17d69f148bb009f3 8a3839811a7a9f4c678090c9def892d1e7ad7e54 CI 1660123589 +1000 commit: commit 05 -8a3839811a7a9f4c678090c9def892d1e7ad7e54 cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 CI 1660123589 +1000 rebase (start): checkout cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 -cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 2e2cd25ffdec58d32b5d549f8402bd054e22cc2a CI 1660123589 +1000 rebase: fast-forward -2e2cd25ffdec58d32b5d549f8402bd054e22cc2a b85535ebf12659044c33386376121d76756ceb59 CI 1660123590 +1000 rebase (continue) (fixup): # This is a combination of 2 commits. -b85535ebf12659044c33386376121d76756ceb59 aba3469fd6fc584a6af9c0073873005ffaaea56c CI 1660123590 +1000 rebase (continue) (squash): commit 02 -aba3469fd6fc584a6af9c0073873005ffaaea56c aba3469fd6fc584a6af9c0073873005ffaaea56c CI 1660123590 +1000 rebase (continue) (finish): returning to refs/heads/master diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index c6c18ee5a..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 CI 1660123588 +1000 commit (initial): commit 01 -cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 2e2cd25ffdec58d32b5d549f8402bd054e22cc2a CI 1660123588 +1000 commit: commit 02 -2e2cd25ffdec58d32b5d549f8402bd054e22cc2a 90fda12ce101e7d0d4594a879e5bbd1be3c857a8 CI 1660123588 +1000 commit: commit 03 -90fda12ce101e7d0d4594a879e5bbd1be3c857a8 da71be1afbb03f46e91ab5de17d69f148bb009f3 CI 1660123588 +1000 commit: commit 04 -da71be1afbb03f46e91ab5de17d69f148bb009f3 8a3839811a7a9f4c678090c9def892d1e7ad7e54 CI 1660123589 +1000 commit: commit 05 -8a3839811a7a9f4c678090c9def892d1e7ad7e54 aba3469fd6fc584a6af9c0073873005ffaaea56c CI 1660123590 +1000 rebase (continue) (finish): refs/heads/master onto cc9defb8ae9134f1a9a6c28a0006dc8c8cd78347 diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 deleted file mode 100644 index a8a2b586df771ca14cecde7807a27ce30a6b580c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb+k8|g>J5cLD&o#S2XU diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/2e/2cd25ffdec58d32b5d549f8402bd054e22cc2a b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/2e/2cd25ffdec58d32b5d549f8402bd054e22cc2a deleted file mode 100644 index 20504e122..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/2e/2cd25ffdec58d32b5d549f8402bd054e22cc2a +++ /dev/null @@ -1,3 +0,0 @@ -xA -0P9$1U1LQ0,<}9 -lcTd 9YT\ИxW\u)Ěч2GqXFj"w;L3\nSO+`?Ќv'y|̱;u \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 deleted file mode 100644 index 350af2800533c3104a701dce1729c5212dcef1f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0V^p=O;s>7HDWL{FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY n3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZZ^CcZiEHDN%H diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca deleted file mode 100644 index 07b07e91fc3473d2d2b21397ee9c3197bcd0bbe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJsk8|g>J$%4di(1Z N`-F<@0RUnl5mQh97fApB diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/8a/3839811a7a9f4c678090c9def892d1e7ad7e54 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/8a/3839811a7a9f4c678090c9def892d1e7ad7e54 deleted file mode 100644 index f518dcc891b4a1d8e315e04858939d0e992b8d3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c@fDg<;n@#q0%{X`G}3B0^U^#w4AfU~DN7Jib|Y0JlFMkC)e4 z9}P&tq3vd114$f>RZH=ahqRcb;5kzW(K1Ws)El`?cY8HhG*U9sk`nrI4ko0DJBUk= zLg%q}l;WMf+kM?(n&C3dH~VPao_5M>y+WTx8a$5zM?yr`Yd_WOPyX|O?7lEGJQ%Lg BL@NLQ diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/90/fda12ce101e7d0d4594a879e5bbd1be3c857a8 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/90/fda12ce101e7d0d4594a879e5bbd1be3c857a8 deleted file mode 100644 index 71b49be646369d4e7de115a10e11ce84da88652d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcX03c@fDKw;N8#q0%{nPfr&QiQI0jQmVcFt(Hk9^WoJfZNBncxCPV zF@T~!ja?Pg*Gx@9;haTNb%ZXapv^`?>rs!!q-?gd>uUfjm&(#w)gqx<&Qit2794V} zC{CG6;bhW#+}9oE1+MdQ(@*N#Q!i!h6Oi{vY$XIZ6C#?U9#cdA17 diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b deleted file mode 100644 index 85866acd897b150150557b0a331c827562ca4fa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;s>AV=y!@Ff%bxNXyJgH89jGsVHG^zut9yQT_3M9>$%4di(1Z n`-F<@K~`l1R>kK2&%2oE{r*j+J3eGcN9r85m}>?A;$I(9i#8>| diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/ab/a3469fd6fc584a6af9c0073873005ffaaea56c b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/ab/a3469fd6fc584a6af9c0073873005ffaaea56c deleted file mode 100644 index 6f0bc9bd3..000000000 --- a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/ab/a3469fd6fc584a6af9c0073873005ffaaea56c +++ /dev/null @@ -1,3 +0,0 @@ -x} -0=).wzc- -Ɩ7Qf ,>8CTA^(: 7RaN4:Jn"eYa\8ˌi5Q }`ue_ z9lzmhfaf_?=!?+3KCReNS)oiIKZSm*9)3}6CJ?oU|1O`YR(zocc6$t5vM-wc5HLu1 YOUnYDpuVPUqu5Qu55*Px0BAL2w#iUv`2YX_ diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac deleted file mode 100644 index 6ac1f71b1ac5591558972d0ca7dba18052afb32b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJT~ -:f?zϣ;v \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 deleted file mode 100644 index 37f59fe0fb0228d08de7eb36a278ec52c722aec2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0V^p=O;s?oG+;0^FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD O6;HHT*8l*@%}K*azEJT1 diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 deleted file mode 100644 index 8bcfafeb644d88961fada612e53598966fbe73ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(cC0V^p=O;s>7G+{6_FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY O3)x&PPXPdnMJ)ztA2U4w diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e9/380a3c752e4b7c7e754fc402ce52302795a95a b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/e9/380a3c752e4b7c7e754fc402ce52302795a95a deleted file mode 100644 index a75ffaf355a29646a7b0f684b160a9f68578835f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0V^p=O;s>7HDWL{FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY o3)x&PPa&%^1*}4$*SZUfoL5#n(Pmu(07PRv+Jvq_VE_OC diff --git a/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 b/test/integration_new/interactive_rebase/one/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 deleted file mode 100644 index 7e30b2e352ac316b3082ec42a9aabada4e057a17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbJ 1665905121 +0900 commit (initial): blah -209b9fa9264fa15f128127817f080fd7372050cf 209b9fa9264fa15f128127817f080fd7372050cf CI 1665905122 +0900 reset: moving to HEAD -209b9fa9264fa15f128127817f080fd7372050cf 209b9fa9264fa15f128127817f080fd7372050cf CI 1665905122 +0900 reset: moving to HEAD diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f1bfb4ca0..000000000 --- a/test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 209b9fa9264fa15f128127817f080fd7372050cf CI 1665905121 +0900 commit (initial): blah diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/stash b/test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index 5addb2d25..000000000 --- a/test/integration_new/stash/rename/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a5272a200897df5558c8cad683c1af14f7184124 CI 1665905122 +0900 On master: bar -a5272a200897df5558c8cad683c1af14f7184124 de8f5ed6f8a58664edfbdecd20b75a6ea0633bf6 CI 1665905125 +0900 On master: foo baz diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/20/9b9fa9264fa15f128127817f080fd7372050cf b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/20/9b9fa9264fa15f128127817f080fd7372050cf deleted file mode 100644 index b0b57c478..000000000 --- a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/20/9b9fa9264fa15f128127817f080fd7372050cf +++ /dev/null @@ -1,3 +0,0 @@ -x1 -0 @>B]YXPB Sa9 -)ĸz]?~i;xza)ĥ0l*-ia )jFoi4ۣ:gwDwkOtϛ;+ \ No newline at end of file diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/43/a4e12864cee1d7020a6d22772f0be34a24d257 b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/43/a4e12864cee1d7020a6d22772f0be34a24d257 deleted file mode 100644 index 12adb9b6ffa3002a9e5b1b6cfc8a01278385afc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0gaB!3c@fD06pg`_Abb7VzP;d2tD;Pwt3KkX-lop&o>wEUWXZ&xYRoB zpvj%~Eobn~3kT0^bD-pm=VB~LN-kO%3c8pEV=Svxwmi2G!w`xD?XE@07Sf(Hd*Xr~ zOJc(sEykkcvyaOLT@UxJf96B#`pTEM)CZ7rHlQV~;fw)MHQJ{3{HLy_IpqVE8LGTn Qb^Bex@RCt|0jfqohXv_Sxc~qF diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb|R -LTRs)6EVVs@fg[u'6==ha0duZwF #lt kiY-hiϹX(ը -Mr@% \ No newline at end of file diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/71/2f414b554b56ba82d43e1f7a0fe33be7eecc95 b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/71/2f414b554b56ba82d43e1f7a0fe33be7eecc95 deleted file mode 100644 index 4b6819c3a2d169b8348253ad5ceaca40d5a55a25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ncmb9VK6i>Ff%bxNXyJg)iq=&)OYj_^$y$Bbj41-ivO|o^LJ;a J0ssa(4)OEx73BZ` diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/a5/272a200897df5558c8cad683c1af14f7184124 b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/a5/272a200897df5558c8cad683c1af14f7184124 deleted file mode 100644 index 32ae211fe..000000000 --- a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/a5/272a200897df5558c8cad683c1af14f7184124 +++ /dev/null @@ -1,3 +0,0 @@ -xj1]Sѯ1pU~i%g.g[.ҧfvG޿wC65S+{JIlbb[ 4ahFH)D -Dx*2.9x -(NsKqkGYA]41boħ3)y{OHW \ No newline at end of file diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/b2/3d362d3fa47c3b1f29c4dd41c419326415122c b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/b2/3d362d3fa47c3b1f29c4dd41c419326415122c deleted file mode 100644 index eae6abec12b5ec05d82c11834bb328fde31ac5c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0V^p=O;s>9VK6i>Ff%bxNXyJg)iq+c!>TvW_uIezwCxWC-1201oD=Zw J1^^yL4^9d!75V@G diff --git a/test/integration_new/stash/rename/expected/repo/.git_keep/objects/dc/052e9e4df6fe8f66b7e110466e1db8ce104b8b b/test/integration_new/stash/rename/expected/repo/.git_keep/objects/dc/052e9e4df6fe8f66b7e110466e1db8ce104b8b deleted file mode 100644 index e2e62f94a5f2b12a1427c0909898f2526320cf45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ncmb 1668288675 -0330 commit (initial): initial commit -e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 CI 1668288676 -0330 reset: moving to HEAD diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 79820d14f..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 CI 1668288675 -0330 commit (initial): initial commit diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash b/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index 6933fca6b..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 c86eeda485a49ca608cb2617bb027be66cd92bc3 CI 1668288676 -0330 On master: my stashed file diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 WcmbX3"9~ l?=^ZSUA HdrN/)ra,sX̃w];()ÁkDQ0(߷n|ߦ=@mc=~x7u}B߃^y?yNFY \ No newline at end of file diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/c8/6eeda485a49ca608cb2617bb027be66cd92bc3 b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/c8/6eeda485a49ca608cb2617bb027be66cd92bc3 deleted file mode 100644 index 330924b9fac1677da05eecc3fe64cd61b396ea8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmV;w06_nE0gcZ+P6IIzhGFVG#asY1{u|o}A*58PIKy~mtVD{l(XNr;_H08>`{{X$ zPu4N66FlM5+{{3$QzVyiQ=t&lr(QF*Dw3k2wH$jZ3H$Qk&F&M7OtU8Ou9nU*AGuW_ zvVw@pgxR=P4u8JI#zjIc8jc8~NM%DZ=TWF*LDx0(;1~Xymvw{F8QxCk5BuivxY>)W t;~gAP@ug5Ec*YQLIo9LEw14vD^A3ae!@t7#fqn9RF@=7;*)In=PlT-fV=4du diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/objects/d9/1d06157bdc633d25f970b9cc54d0eb74fb850f b/test/integration_new/stash/stash/expected/repo/.git_keep/objects/d9/1d06157bdc633d25f970b9cc54d0eb74fb850f deleted file mode 100644 index 00c028c95d680f4223ce14f74203c00809801940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgWyp^3>pK^wxBrjm0EGW|0ga7Y3c@fD0R7G>_5w(zhrbK6Eel5QL}fnh6SSuVI^i4wNvRMuXeyR!(*C9{-(Nbe9NsqVL%LB d#k+^AwpOc7`$YIpU6pr{k~a8t>I8(zFWt0#J0t)A diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master b/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 9130d91a2..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -e6ed7d5c2198fa4791de9c66e8000da607eaf9a3 diff --git a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash b/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash deleted file mode 100644 index a976f263d..000000000 --- a/test/integration_new/stash/stash/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -c86eeda485a49ca608cb2617bb027be66cd92bc3 diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 802607664..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -initial commit diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/HEAD b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 8b6d164d8..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -364ac39500dfec09956626a513736d7602b4d64a diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/config b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/config deleted file mode 100644 index 8a748ce32..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[commit] - gpgSign = false diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/description b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/index b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154f23ffb2d0196e017d44a5e7017550f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1668288767 -0330 commit (initial): initial commit -364ac39500dfec09956626a513736d7602b4d64a 364ac39500dfec09956626a513736d7602b4d64a CI 1668288768 -0330 reset: moving to HEAD diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 9653f3a4b..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 364ac39500dfec09956626a513736d7602b4d64a CI 1668288767 -0330 commit (initial): initial commit diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index 9fa56fb7b..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 03892119fb6b807d1c13c23f6baacdc4a170e694 CI 1668288768 -0330 On master: my stashed file diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 deleted file mode 100644 index c933b47b3..000000000 --- a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/03/892119fb6b807d1c13c23f6baacdc4a170e694 +++ /dev/null @@ -1 +0,0 @@ -x=jA {@_2!\F# <^@rL>__Ǹ.U'%KK>W&F˽=6ÒZĴQ.%}H-84OS$uK 4C&45TC~z0lYEIQ4kK\s0ҾpǓ{?>U:>/b-^!FX:OO|h7~ݶr?]. \ No newline at end of file diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/0f/e7bff1bede9ebb8de52517a4b75ad0f80be423 deleted file mode 100644 index aacb0bb13cbf27bd76012d487ee42ffd64469722..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0ga7a3c@fDgniB__5w=t)6H5$gg*5c$+}{&X{1fT;~Ve-z74}S-*Cw} zRnSC-x{9>mJ!|Yq`p!Fp&S;0x#u$xbjD)slAJM6>*JoK_oZvD}H~ED8p5??PUqK_1 zA@WFY?5yonYuibcKXJ7$bq)NIJ3P`X89VK6i>Ff%bxNXyJgjW=S*j_~U{7pAxWkLcwNj0EGW|0ga783d0}}0DJZo`+*jt>qeoJKu&pvYc^DfwFC=!euaLZ*I|Z9wUpdo zaQ4y;5kU6Ft%=YiCgBh@X>rJ#Unv;xHx|L5QN>St)&u4R?(;Iq8OwW@TdL&&1Cj6Q dNF!XewOV!BCr$p;Ret4`;|{-0eF24uFX67lI{*Lx diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmbu6m3#GsQsDmKveQw;=A_e!TDT@=|MQ zpf#S_#tcM^N@W`ca)dNm<@^xi=(LSG2B!w;Ij1PrwDH`)piS9CCnb%XWsD9{V{*!P zgXB@_!P3Eq^lr~(gRX~L*FShqb)EQAM5lVYQj-7x diff --git a/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/dd/e611c48bd5d6df4157b99f524929851b07eca9 b/test/integration_new/stash/stash_including_untracked_files/expected/repo/.git_keep/objects/dd/e611c48bd5d6df4157b99f524929851b07eca9 deleted file mode 100644 index 1721a0ff4e35747e550d2943331beb3c1e434a45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0V^p=O;s>9VK6i>Ff%bxNXyJgjW=Y-j_~U{7pAxWkLcwNj