mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-15 01:34:26 +02:00
add tests for dealing with remotes
This commit is contained in:
52
test/integration/pullRebaseInteractive/setup.sh
Normal file
52
test/integration/pullRebaseInteractive/setup.sh
Normal file
@ -0,0 +1,52 @@
|
||||
#!/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"
|
||||
|
||||
cd ..
|
||||
git clone --bare ./actual actual_remote
|
||||
|
||||
cd actual
|
||||
|
||||
git reset --hard HEAD~2
|
||||
|
||||
echo conflict > myfile4
|
||||
git add .
|
||||
git commit -am "myfile4 conflict"
|
||||
|
||||
echo test > myfile5
|
||||
git add .
|
||||
git commit -am "5"
|
||||
|
||||
echo test > myfile6
|
||||
git add .
|
||||
git commit -am "6"
|
||||
|
||||
echo test > myfile7
|
||||
git add .
|
||||
git commit -am "7"
|
||||
|
||||
git remote add origin ../actual_remote
|
||||
git fetch origin
|
||||
git branch --set-upstream-to=origin/master master
|
||||
|
||||
git config pull.rebase interactive
|
Reference in New Issue
Block a user