diff --git a/pkg/commands/git_commands/bisect.go b/pkg/commands/git_commands/bisect.go index c72eaee52..b032afc45 100644 --- a/pkg/commands/git_commands/bisect.go +++ b/pkg/commands/git_commands/bisect.go @@ -166,7 +166,7 @@ func (self *BisectCommands) IsDone() (bool, []string, error) { func (self *BisectCommands) ReachableFromStart(ref string, startRef string) bool { err := self.cmd.New( fmt.Sprintf("git merge-base --is-ancestor %s %s", startRef, ref), - ).Run() + ).DontLog().Run() return err == nil } diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go index 3ac6f0c8c..1158fa85f 100644 --- a/pkg/integration/integration.go +++ b/pkg/integration/integration.go @@ -2,6 +2,7 @@ package integration import ( "encoding/json" + "errors" "fmt" "io/ioutil" "log" @@ -251,8 +252,8 @@ func createFixture(testPath, actualDir string) error { bashScriptPath := filepath.Join(testPath, "setup.sh") cmd := secureexec.Command("bash", bashScriptPath, actualDir) - if _, err := cmd.CombinedOutput(); err != nil { - return err + if output, err := cmd.CombinedOutput(); err != nil { + return errors.New(string(output)) } return nil diff --git a/test/integration/bisect/setup.sh b/test/integration/bisect/setup.sh index a15abc2bc..6aa3bf7df 100644 --- a/test/integration/bisect/setup.sh +++ b/test/integration/bisect/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_ANCESTORS_OK new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV new file mode 100644 index 000000000..c86a4ce34 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV @@ -0,0 +1 @@ +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG new file mode 100644 index 000000000..7aae44d66 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG @@ -0,0 +1,8 @@ +# bad: [96f59302fbb47e8abb38d110328500055c2eae8f] commit 18 +# good: [064b01d296b5d0a6d829b2c6da812000909144a3] commit 13 +git bisect start 'other~2' 'other~7' +# good: [545ee64d47536092ef63907a18995827a74fa77d] commit 15 +git bisect good 545ee64d47536092ef63907a18995827a74fa77d +# good: [b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35] commit 17 +git bisect good b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 +# first bad commit: [96f59302fbb47e8abb38d110328500055c2eae8f] commit 18 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_NAMES @@ -0,0 +1 @@ + diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START new file mode 100644 index 000000000..1f7391f92 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_START @@ -0,0 +1 @@ +master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS new file mode 100644 index 000000000..25dd30b14 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_TERMS @@ -0,0 +1,2 @@ +bad +good diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG b/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..e6cf6d392 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +commit 20 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD new file mode 100644 index 000000000..cea9d05ed --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/test diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/config b/test/integration/bisectFromOtherBranch/expected/.git_keep/config new file mode 100644 index 000000000..8ae104545 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/description b/test/integration/bisectFromOtherBranch/expected/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/index b/test/integration/bisectFromOtherBranch/expected/.git_keep/index new file mode 100644 index 000000000..f619b9dc5 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/index differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude b/test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ +.DS_Store diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD new file mode 100644 index 000000000..a47298e4b --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD @@ -0,0 +1,26 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 commit (initial): first commit +3e94c347542e28f329499237920a81240575a1f4 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 checkout: moving from master to other +3e94c347542e28f329499237920a81240575a1f4 787e69fd95b7075de9290439e54677d023ea92c7 CI 1643175915 +1100 commit: commit 1 +787e69fd95b7075de9290439e54677d023ea92c7 847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 CI 1643175915 +1100 commit: commit 2 +847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 d2022605750ce8c6d2fd703df624fc1e191b799a CI 1643175915 +1100 commit: commit 3 +d2022605750ce8c6d2fd703df624fc1e191b799a 681e7676f6bd15140ad8d51345914d0b7fa69489 CI 1643175915 +1100 commit: commit 4 +681e7676f6bd15140ad8d51345914d0b7fa69489 3df063bdb2fd238bdf7bda23290b7da497589258 CI 1643175915 +1100 commit: commit 5 +3df063bdb2fd238bdf7bda23290b7da497589258 2d0d5709569edc32bd9ee891dc0645e7b7bf2061 CI 1643175915 +1100 commit: commit 6 +2d0d5709569edc32bd9ee891dc0645e7b7bf2061 9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 CI 1643175915 +1100 commit: commit 7 +9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 93feecfa069adae620503f0ea027c4d7d368efcc CI 1643175915 +1100 commit: commit 8 +93feecfa069adae620503f0ea027c4d7d368efcc 41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 CI 1643175915 +1100 commit: commit 9 +41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 d989cb769db41caf40f46f40aaa421568ee0d6bc CI 1643175915 +1100 commit: commit 10 +d989cb769db41caf40f46f40aaa421568ee0d6bc f59b0d2e37845a8d46ee072354598e8246f98324 CI 1643175915 +1100 commit: commit 11 +f59b0d2e37845a8d46ee072354598e8246f98324 304e25b1cbcd673476a98779d817b4d87feba619 CI 1643175915 +1100 commit: commit 12 +304e25b1cbcd673476a98779d817b4d87feba619 064b01d296b5d0a6d829b2c6da812000909144a3 CI 1643175915 +1100 commit: commit 13 +064b01d296b5d0a6d829b2c6da812000909144a3 72e695b433526c667e356788b961ebe192878531 CI 1643175915 +1100 commit: commit 14 +72e695b433526c667e356788b961ebe192878531 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 commit: commit 15 +545ee64d47536092ef63907a18995827a74fa77d be3e8df868feac07f915a39aaceb886aeca56442 CI 1643175915 +1100 commit: commit 16 +be3e8df868feac07f915a39aaceb886aeca56442 b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175915 +1100 commit: commit 17 +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 96f59302fbb47e8abb38d110328500055c2eae8f CI 1643175915 +1100 commit: commit 18 +96f59302fbb47e8abb38d110328500055c2eae8f 96095b64429648b96e25b3a02a5ccd43c61cafef CI 1643175915 +1100 commit: commit 19 +96095b64429648b96e25b3a02a5ccd43c61cafef 0b148673b6c3595b97542fcd5b5e97a568ea26b0 CI 1643175915 +1100 commit: commit 20 +0b148673b6c3595b97542fcd5b5e97a568ea26b0 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 checkout: moving from other to master +3e94c347542e28f329499237920a81240575a1f4 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 checkout: moving from master to 545ee64d47536092ef63907a18995827a74fa77d +545ee64d47536092ef63907a18995827a74fa77d b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175918 +1100 checkout: moving from 545ee64d47536092ef63907a18995827a74fa77d to b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 3e94c347542e28f329499237920a81240575a1f4 CI 1643175923 +1100 checkout: moving from b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 to test diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..b89685177 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 commit (initial): first commit diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other new file mode 100644 index 000000000..83bcfea8a --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other @@ -0,0 +1,21 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 branch: Created from HEAD +3e94c347542e28f329499237920a81240575a1f4 787e69fd95b7075de9290439e54677d023ea92c7 CI 1643175915 +1100 commit: commit 1 +787e69fd95b7075de9290439e54677d023ea92c7 847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 CI 1643175915 +1100 commit: commit 2 +847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 d2022605750ce8c6d2fd703df624fc1e191b799a CI 1643175915 +1100 commit: commit 3 +d2022605750ce8c6d2fd703df624fc1e191b799a 681e7676f6bd15140ad8d51345914d0b7fa69489 CI 1643175915 +1100 commit: commit 4 +681e7676f6bd15140ad8d51345914d0b7fa69489 3df063bdb2fd238bdf7bda23290b7da497589258 CI 1643175915 +1100 commit: commit 5 +3df063bdb2fd238bdf7bda23290b7da497589258 2d0d5709569edc32bd9ee891dc0645e7b7bf2061 CI 1643175915 +1100 commit: commit 6 +2d0d5709569edc32bd9ee891dc0645e7b7bf2061 9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 CI 1643175915 +1100 commit: commit 7 +9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 93feecfa069adae620503f0ea027c4d7d368efcc CI 1643175915 +1100 commit: commit 8 +93feecfa069adae620503f0ea027c4d7d368efcc 41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 CI 1643175915 +1100 commit: commit 9 +41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 d989cb769db41caf40f46f40aaa421568ee0d6bc CI 1643175915 +1100 commit: commit 10 +d989cb769db41caf40f46f40aaa421568ee0d6bc f59b0d2e37845a8d46ee072354598e8246f98324 CI 1643175915 +1100 commit: commit 11 +f59b0d2e37845a8d46ee072354598e8246f98324 304e25b1cbcd673476a98779d817b4d87feba619 CI 1643175915 +1100 commit: commit 12 +304e25b1cbcd673476a98779d817b4d87feba619 064b01d296b5d0a6d829b2c6da812000909144a3 CI 1643175915 +1100 commit: commit 13 +064b01d296b5d0a6d829b2c6da812000909144a3 72e695b433526c667e356788b961ebe192878531 CI 1643175915 +1100 commit: commit 14 +72e695b433526c667e356788b961ebe192878531 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 commit: commit 15 +545ee64d47536092ef63907a18995827a74fa77d be3e8df868feac07f915a39aaceb886aeca56442 CI 1643175915 +1100 commit: commit 16 +be3e8df868feac07f915a39aaceb886aeca56442 b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175915 +1100 commit: commit 17 +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 96f59302fbb47e8abb38d110328500055c2eae8f CI 1643175915 +1100 commit: commit 18 +96f59302fbb47e8abb38d110328500055c2eae8f 96095b64429648b96e25b3a02a5ccd43c61cafef CI 1643175915 +1100 commit: commit 19 +96095b64429648b96e25b3a02a5ccd43c61cafef 0b148673b6c3595b97542fcd5b5e97a568ea26b0 CI 1643175915 +1100 commit: commit 20 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test new file mode 100644 index 000000000..5b8c1f1cf --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175923 +1100 branch: Created from master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba new file mode 100644 index 000000000..d3c45d51e Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 new file mode 100644 index 000000000..355004b9e Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f new file mode 100644 index 000000000..da9396d18 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 new file mode 100644 index 000000000..0ff3d683a Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 new file mode 100644 index 000000000..41b1acb17 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 new file mode 100644 index 000000000..a0c03c19e --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 @@ -0,0 +1,2 @@ +xK +1]뙀0+tP00Df\֣x=:D8U #Mʊ8{) (x0L!DaΉGZ }ay]m{Iv;pьuDuS|":j \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f new file mode 100644 index 000000000..da246e1fe Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 new file mode 100644 index 000000000..be2aa4386 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 new file mode 100644 index 000000000..f1722ae00 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 new file mode 100644 index 000000000..12e1f82f1 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c new file mode 100644 index 000000000..77e40c5af Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 new file mode 100644 index 000000000..8413068b9 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 @@ -0,0 +1,2 @@ +x; +@@QbzAfs~ "2/(8&\)\W݅}3sJEIg4 5U1F`F) +mu Yf,sf%@ҹX*lnen>$Kr!c{ݧޥ ZG7]ݭ<ơ'=B \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc new file mode 100644 index 000000000..c90ce22da Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef new file mode 100644 index 000000000..2a3256196 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f new file mode 100644 index 000000000..69bd27609 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f @@ -0,0 +1,2 @@ +xA + E/GJ!cԑj.z|އ0ҩ"`Ml*Ll3V9]f!)f'Jlu5T=T)4.]jwo,+z)+ Mul; \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d new file mode 100644 index 000000000..f6e750c5d Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 new file mode 100644 index 000000000..c6c240e0c --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 @@ -0,0 +1 @@ +x+)JMU03c040031QHIeʕ2ۃߴ?Tg>T>G7]ݭ<ơ'=G \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 new file mode 100644 index 000000000..53eba54d8 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e new file mode 100644 index 000000000..268d0f459 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 new file mode 100644 index 000000000..6d65f13b4 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 new file mode 100644 index 000000000..02dc68891 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad new file mode 100644 index 000000000..0761b6105 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 new file mode 100644 index 000000000..75e56067d Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 new file mode 100644 index 000000000..6cbaf038e Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed new file mode 100644 index 000000000..13147f24b Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d new file mode 100644 index 000000000..8dab6a9ea Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a new file mode 100644 index 000000000..e019fa50f Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 new file mode 100644 index 000000000..efc598268 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 @@ -0,0 +1 @@ +x+)JMU03c040031QHIe2o]_G6ڱ-x/T>G7]ݭ<ơ'= 5 \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd new file mode 100644 index 000000000..262f6ef1f Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 new file mode 100644 index 000000000..1ece9675c Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc new file mode 100644 index 000000000..4c06d65f7 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc @@ -0,0 +1,3 @@ +xM +0]o/{?1 +Ɩۅp;G'wL`ac^Yb8a,<-xu2Ru\42&rjQɢUz487|R۞]ImKgfucO瓰:q \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 new file mode 100644 index 000000000..336fa7996 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c new file mode 100644 index 000000000..b19f46c3d Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 000000000..711223894 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 new file mode 100644 index 000000000..0207e4b4b Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 new file mode 100644 index 000000000..674e37f3f Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 new file mode 100644 index 000000000..b8fafea4f Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/packed-refs b/test/integration/bisectFromOtherBranch/expected/.git_keep/packed-refs new file mode 100644 index 000000000..250f18738 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/packed-refs @@ -0,0 +1 @@ +# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad new file mode 100644 index 000000000..461c04d68 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad @@ -0,0 +1 @@ +96f59302fbb47e8abb38d110328500055c2eae8f diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 new file mode 100644 index 000000000..37b4d53a7 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 @@ -0,0 +1 @@ +064b01d296b5d0a6d829b2c6da812000909144a3 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d new file mode 100644 index 000000000..d9df07a69 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d @@ -0,0 +1 @@ +545ee64d47536092ef63907a18995827a74fa77d diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 new file mode 100644 index 000000000..c86a4ce34 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 @@ -0,0 +1 @@ +b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master new file mode 100644 index 000000000..8467ab3ff --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master @@ -0,0 +1 @@ +3e94c347542e28f329499237920a81240575a1f4 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other new file mode 100644 index 000000000..fbb2ee58a --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other @@ -0,0 +1 @@ +0b148673b6c3595b97542fcd5b5e97a568ea26b0 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test new file mode 100644 index 000000000..8467ab3ff --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test @@ -0,0 +1 @@ +3e94c347542e28f329499237920a81240575a1f4 diff --git a/test/integration/bisectFromOtherBranch/expected/myfile b/test/integration/bisectFromOtherBranch/expected/myfile new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/bisectFromOtherBranch/recording.json b/test/integration/bisectFromOtherBranch/recording.json new file mode 100644 index 000000000..453ad5417 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/recording.json @@ -0,0 +1 @@ +{"KeyEvents":[{"Timestamp":611,"Mod":0,"Key":259,"Ch":0},{"Timestamp":754,"Mod":0,"Key":259,"Ch":0},{"Timestamp":947,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1098,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1202,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1545,"Mod":0,"Key":256,"Ch":98},{"Timestamp":1865,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2195,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2905,"Mod":0,"Key":256,"Ch":98},{"Timestamp":3499,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3866,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5556,"Mod":0,"Key":27,"Ch":0},{"Timestamp":5835,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6850,"Mod":0,"Key":256,"Ch":110},{"Timestamp":7091,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7146,"Mod":0,"Key":256,"Ch":101},{"Timestamp":7401,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7441,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7858,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9099,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/setup.sh b/test/integration/bisectFromOtherBranch/setup.sh new file mode 100644 index 000000000..73f0a0205 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/setup.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +cd $1 + +git init + +git config user.email "CI@example.com" +git config user.name "CI" + +touch myfile +git add myfile +git commit -m "first commit" + +git checkout -b other + +for i in {1..20} +do + echo "$i" > file + git add . + git commit -m "commit $i" +done + +git checkout master + +git bisect start other~2 other~7 diff --git a/test/integration/bisectFromOtherBranch/test.json b/test/integration/bisectFromOtherBranch/test.json new file mode 100644 index 000000000..a5503ac83 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/test.json @@ -0,0 +1,4 @@ +{ + "description": "Opening lazygit when bisect has been started from another branch. There's an issue where we don't reselect the current branch if we mark the current branch as bad so this test side-steps that problem", + "speed": 20 +} diff --git a/test/integration/branchAutocomplete/setup.sh b/test/integration/branchAutocomplete/setup.sh index cde74f610..4c53f58a2 100644 --- a/test/integration/branchAutocomplete/setup.sh +++ b/test/integration/branchAutocomplete/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchDelete/setup.sh b/test/integration/branchDelete/setup.sh index da9b9bddb..d67fa9291 100644 --- a/test/integration/branchDelete/setup.sh +++ b/test/integration/branchDelete/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchRebase/setup.sh b/test/integration/branchRebase/setup.sh index 0fa1d98a1..a1f14b455 100644 --- a/test/integration/branchRebase/setup.sh +++ b/test/integration/branchRebase/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchReset/setup.sh b/test/integration/branchReset/setup.sh index 0fa1d98a1..a1f14b455 100644 --- a/test/integration/branchReset/setup.sh +++ b/test/integration/branchReset/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/branchSuggestions/setup.sh b/test/integration/branchSuggestions/setup.sh index da9b9bddb..d67fa9291 100644 --- a/test/integration/branchSuggestions/setup.sh +++ b/test/integration/branchSuggestions/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/cherryPicking/setup.sh b/test/integration/cherryPicking/setup.sh index d60a9a7e1..1a913412f 100644 --- a/test/integration/cherryPicking/setup.sh +++ b/test/integration/cherryPicking/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/commit/setup.sh b/test/integration/commit/setup.sh index 21fb3fefb..c6c6a9271 100644 --- a/test/integration/commit/setup.sh +++ b/test/integration/commit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/commitsNewBranch/setup.sh b/test/integration/commitsNewBranch/setup.sh index 9b9e01321..4e35cf543 100644 --- a/test/integration/commitsNewBranch/setup.sh +++ b/test/integration/commitsNewBranch/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/commitsRevert/setup.sh b/test/integration/commitsRevert/setup.sh index 9b9e01321..4e35cf543 100644 --- a/test/integration/commitsRevert/setup.sh +++ b/test/integration/commitsRevert/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/confirmQuit/setup.sh b/test/integration/confirmQuit/setup.sh index e58c74f38..ee8276237 100644 --- a/test/integration/confirmQuit/setup.sh +++ b/test/integration/confirmQuit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/customCommands/setup.sh b/test/integration/customCommands/setup.sh index 54ec0d96e..fbd02e952 100644 --- a/test/integration/customCommands/setup.sh +++ b/test/integration/customCommands/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/customCommandsComplex/setup.sh b/test/integration/customCommandsComplex/setup.sh index a37a2823b..0f364d18a 100644 --- a/test/integration/customCommandsComplex/setup.sh +++ b/test/integration/customCommandsComplex/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/diffing/setup.sh b/test/integration/diffing/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/diffing/setup.sh +++ b/test/integration/diffing/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/diffing2/setup.sh b/test/integration/diffing2/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/diffing2/setup.sh +++ b/test/integration/diffing2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/diffing3/setup.sh b/test/integration/diffing3/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/diffing3/setup.sh +++ b/test/integration/diffing3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/discardFileChanges/setup.sh b/test/integration/discardFileChanges/setup.sh index df68833f9..82fa59475 100644 --- a/test/integration/discardFileChanges/setup.sh +++ b/test/integration/discardFileChanges/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/discardOldFileChanges/setup.sh b/test/integration/discardOldFileChanges/setup.sh index 22426c2aa..5b592cabd 100644 --- a/test/integration/discardOldFileChanges/setup.sh +++ b/test/integration/discardOldFileChanges/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/filterPath/setup.sh b/test/integration/filterPath/setup.sh index e766b6bdb..460b35b25 100644 --- a/test/integration/filterPath/setup.sh +++ b/test/integration/filterPath/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/filterPath2/setup.sh b/test/integration/filterPath2/setup.sh index e766b6bdb..460b35b25 100644 --- a/test/integration/filterPath2/setup.sh +++ b/test/integration/filterPath2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/filterPath3/setup.sh b/test/integration/filterPath3/setup.sh index e766b6bdb..460b35b25 100644 --- a/test/integration/filterPath3/setup.sh +++ b/test/integration/filterPath3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/forcePush/setup.sh b/test/integration/forcePush/setup.sh index 79a9499d0..74192c316 100644 --- a/test/integration/forcePush/setup.sh +++ b/test/integration/forcePush/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/initialOpen/setup.sh b/test/integration/initialOpen/setup.sh index 84ad82d36..e7de1949f 100644 --- a/test/integration/initialOpen/setup.sh +++ b/test/integration/initialOpen/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflictRevert/setup.sh b/test/integration/mergeConflictRevert/setup.sh index 4618aa37c..aa3eb68c7 100644 --- a/test/integration/mergeConflictRevert/setup.sh +++ b/test/integration/mergeConflictRevert/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflictUndo/setup.sh b/test/integration/mergeConflictUndo/setup.sh index 0d9a57cf9..5182e5eae 100644 --- a/test/integration/mergeConflictUndo/setup.sh +++ b/test/integration/mergeConflictUndo/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflicts/setup.sh b/test/integration/mergeConflicts/setup.sh index 0d9a57cf9..5182e5eae 100644 --- a/test/integration/mergeConflicts/setup.sh +++ b/test/integration/mergeConflicts/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/mergeConflictsResolvedExternally/setup.sh b/test/integration/mergeConflictsResolvedExternally/setup.sh index 1e6ecd751..e1126d2c3 100644 --- a/test/integration/mergeConflictsResolvedExternally/setup.sh +++ b/test/integration/mergeConflictsResolvedExternally/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/patchBuilding/setup.sh b/test/integration/patchBuilding/setup.sh index 2e117b4ad..3ba5d6017 100644 --- a/test/integration/patchBuilding/setup.sh +++ b/test/integration/patchBuilding/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/patchBuilding2/setup.sh b/test/integration/patchBuilding2/setup.sh index 2e117b4ad..3ba5d6017 100644 --- a/test/integration/patchBuilding2/setup.sh +++ b/test/integration/patchBuilding2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/patchBuildingWithFiletree/setup.sh b/test/integration/patchBuildingWithFiletree/setup.sh index 87dc9f6f6..c552b9e56 100644 --- a/test/integration/patchBuildingWithFiletree/setup.sh +++ b/test/integration/patchBuildingWithFiletree/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/pull/setup.sh b/test/integration/pull/setup.sh index 2634d0278..ffe8a3b6d 100644 --- a/test/integration/pull/setup.sh +++ b/test/integration/pull/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullAndSetUpstream/setup.sh b/test/integration/pullAndSetUpstream/setup.sh index cb1d07717..f0c7cf842 100644 --- a/test/integration/pullAndSetUpstream/setup.sh +++ b/test/integration/pullAndSetUpstream/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullMerge/setup.sh b/test/integration/pullMerge/setup.sh index b9d9a933a..379a95362 100644 --- a/test/integration/pullMerge/setup.sh +++ b/test/integration/pullMerge/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullMergeConflict/setup.sh b/test/integration/pullMergeConflict/setup.sh index a19999045..56967049f 100644 --- a/test/integration/pullMergeConflict/setup.sh +++ b/test/integration/pullMergeConflict/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebase/setup.sh b/test/integration/pullRebase/setup.sh index aef24c8e8..b1eb37fcf 100644 --- a/test/integration/pullRebase/setup.sh +++ b/test/integration/pullRebase/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebaseConflict/setup.sh b/test/integration/pullRebaseConflict/setup.sh index 63146bda2..e02be3c0c 100644 --- a/test/integration/pullRebaseConflict/setup.sh +++ b/test/integration/pullRebaseConflict/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebaseInteractive/setup.sh b/test/integration/pullRebaseInteractive/setup.sh index 0795a297f..a0dce709f 100644 --- a/test/integration/pullRebaseInteractive/setup.sh +++ b/test/integration/pullRebaseInteractive/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pullRebaseInteractiveWithDrop/setup.sh b/test/integration/pullRebaseInteractiveWithDrop/setup.sh index 0795a297f..a0dce709f 100644 --- a/test/integration/pullRebaseInteractiveWithDrop/setup.sh +++ b/test/integration/pullRebaseInteractiveWithDrop/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/push/setup.sh b/test/integration/push/setup.sh index 7d137b349..075e9afd9 100644 --- a/test/integration/push/setup.sh +++ b/test/integration/push/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushAndSetUpstream/setup.sh b/test/integration/pushAndSetUpstream/setup.sh index 2911a073c..6c4c85af6 100644 --- a/test/integration/pushAndSetUpstream/setup.sh +++ b/test/integration/pushAndSetUpstream/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushAndSetUpstreamDefault/setup.sh b/test/integration/pushAndSetUpstreamDefault/setup.sh index d12f985f6..1d5f61ecf 100644 --- a/test/integration/pushAndSetUpstreamDefault/setup.sh +++ b/test/integration/pushAndSetUpstreamDefault/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushFollowTags/setup.sh b/test/integration/pushFollowTags/setup.sh index 2da0cbf18..035c9189d 100644 --- a/test/integration/pushFollowTags/setup.sh +++ b/test/integration/pushFollowTags/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushNoFollowTags/setup.sh b/test/integration/pushNoFollowTags/setup.sh index 304dcd9e9..b60c4eed4 100644 --- a/test/integration/pushNoFollowTags/setup.sh +++ b/test/integration/pushNoFollowTags/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushTag/setup.sh b/test/integration/pushTag/setup.sh index 5e09ed4ea..cf6270c03 100644 --- a/test/integration/pushTag/setup.sh +++ b/test/integration/pushTag/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/pushWithCredentials/setup.sh b/test/integration/pushWithCredentials/setup.sh index 97de49d11..d39a13d5a 100644 --- a/test/integration/pushWithCredentials/setup.sh +++ b/test/integration/pushWithCredentials/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/rebase/setup.sh b/test/integration/rebase/setup.sh index d11e86c0a..8806332fd 100644 --- a/test/integration/rebase/setup.sh +++ b/test/integration/rebase/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebase2/setup.sh b/test/integration/rebase2/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebase2/setup.sh +++ b/test/integration/rebase2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebase3/setup.sh b/test/integration/rebase3/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebase3/setup.sh +++ b/test/integration/rebase3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseFixupAndSquash/setup.sh b/test/integration/rebaseFixupAndSquash/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebaseFixupAndSquash/setup.sh +++ b/test/integration/rebaseFixupAndSquash/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseFixups/setup.sh b/test/integration/rebaseFixups/setup.sh index 84c2fab8d..99fec6578 100644 --- a/test/integration/rebaseFixups/setup.sh +++ b/test/integration/rebaseFixups/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseRewordLastCommit/setup.sh b/test/integration/rebaseRewordLastCommit/setup.sh index 42957e626..cdd7ac5d0 100644 --- a/test/integration/rebaseRewordLastCommit/setup.sh +++ b/test/integration/rebaseRewordLastCommit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseRewordOldCommit/setup.sh b/test/integration/rebaseRewordOldCommit/setup.sh index 42957e626..cdd7ac5d0 100644 --- a/test/integration/rebaseRewordOldCommit/setup.sh +++ b/test/integration/rebaseRewordOldCommit/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rebaseSwapping/setup.sh b/test/integration/rebaseSwapping/setup.sh index 864bf5ca9..99c030a87 100644 --- a/test/integration/rebaseSwapping/setup.sh +++ b/test/integration/rebaseSwapping/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogCheckout/setup.sh b/test/integration/reflogCheckout/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogCheckout/setup.sh +++ b/test/integration/reflogCheckout/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogCherryPick/setup.sh b/test/integration/reflogCherryPick/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogCherryPick/setup.sh +++ b/test/integration/reflogCherryPick/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogCommitFiles/setup.sh b/test/integration/reflogCommitFiles/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogCommitFiles/setup.sh +++ b/test/integration/reflogCommitFiles/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/reflogHardReset/setup.sh b/test/integration/reflogHardReset/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/reflogHardReset/setup.sh +++ b/test/integration/reflogHardReset/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/rememberCommitMessageAfterFail/setup.sh b/test/integration/rememberCommitMessageAfterFail/setup.sh index d4c351f63..0ac33d4c9 100644 --- a/test/integration/rememberCommitMessageAfterFail/setup.sh +++ b/test/integration/rememberCommitMessageAfterFail/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/searching/setup.sh b/test/integration/searching/setup.sh index 21fb3fefb..c6c6a9271 100644 --- a/test/integration/searching/setup.sh +++ b/test/integration/searching/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/searchingInStagingPanel/setup.sh b/test/integration/searchingInStagingPanel/setup.sh index d55861929..e3566ddb9 100644 --- a/test/integration/searchingInStagingPanel/setup.sh +++ b/test/integration/searchingInStagingPanel/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/setUpstream/setup.sh b/test/integration/setUpstream/setup.sh index 6a2b91419..a5a68834a 100644 --- a/test/integration/setUpstream/setup.sh +++ b/test/integration/setUpstream/setup.sh @@ -2,6 +2,8 @@ set -e +set -e + cd $1 git init diff --git a/test/integration/squash/setup.sh b/test/integration/squash/setup.sh index 15e61f48b..44b82bf26 100644 --- a/test/integration/squash/setup.sh +++ b/test/integration/squash/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/staginWithDiffContextChange/setup.sh b/test/integration/staginWithDiffContextChange/setup.sh index 7cfacd06f..ac450f8d2 100644 --- a/test/integration/staginWithDiffContextChange/setup.sh +++ b/test/integration/staginWithDiffContextChange/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stagingTwo/setup.sh b/test/integration/stagingTwo/setup.sh index 7cfacd06f..ac450f8d2 100644 --- a/test/integration/stagingTwo/setup.sh +++ b/test/integration/stagingTwo/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stash/setup.sh b/test/integration/stash/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stash/setup.sh +++ b/test/integration/stash/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stashDrop/setup.sh b/test/integration/stashDrop/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stashDrop/setup.sh +++ b/test/integration/stashDrop/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stashNewBranch/setup.sh b/test/integration/stashNewBranch/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stashNewBranch/setup.sh +++ b/test/integration/stashNewBranch/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stashPop/setup.sh b/test/integration/stashPop/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stashPop/setup.sh +++ b/test/integration/stashPop/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/stash_Copy/setup.sh b/test/integration/stash_Copy/setup.sh index 7b6eea95c..caff56b7d 100644 --- a/test/integration/stash_Copy/setup.sh +++ b/test/integration/stash_Copy/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/switchTabFromMenu/setup.sh b/test/integration/switchTabFromMenu/setup.sh index 65cd6d129..e6f5ec24f 100644 --- a/test/integration/switchTabFromMenu/setup.sh +++ b/test/integration/switchTabFromMenu/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags/setup.sh b/test/integration/tags/setup.sh index 75cd7a91b..e878a9ed5 100644 --- a/test/integration/tags/setup.sh +++ b/test/integration/tags/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags2/setup.sh b/test/integration/tags2/setup.sh index d11e86c0a..8806332fd 100644 --- a/test/integration/tags2/setup.sh +++ b/test/integration/tags2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags3/setup.sh b/test/integration/tags3/setup.sh index d11e86c0a..8806332fd 100644 --- a/test/integration/tags3/setup.sh +++ b/test/integration/tags3/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/tags4/setup.sh b/test/integration/tags4/setup.sh index 75cd7a91b..e878a9ed5 100644 --- a/test/integration/tags4/setup.sh +++ b/test/integration/tags4/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/undo/setup.sh b/test/integration/undo/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/undo/setup.sh +++ b/test/integration/undo/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init diff --git a/test/integration/undo2/setup.sh b/test/integration/undo2/setup.sh index 327d4594f..4cd444a1f 100644 --- a/test/integration/undo2/setup.sh +++ b/test/integration/undo2/setup.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -e + cd $1 git init