summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Milchior <Arthur@Milchior.fr>2019-08-13 01:09:04 +0200
committerSebastian Thiel <byronimo@gmail.com>2019-08-14 17:57:00 +0800
commitf6fdb67cec5c75b3f0a855042942dac75c612065 (patch)
tree8a13442893a12e8a316fe1b9d79ed7aa5c591233
parent4bebfe31c2d9064d4a13de95ad79a4c9bdc3a33a (diff)
downloadgitpython-f6fdb67cec5c75b3f0a855042942dac75c612065.tar.gz
Adding test
-rw-r--r--git/test/test_repo.py22
1 files changed, 22 insertions, 0 deletions
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 0577bd58..c74d4ef4 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -1023,3 +1023,25 @@ class TestRepo(TestBase):
self.assertEqual(r.working_dir, repo_dir)
finally:
os.environ = oldenv
+
+ @with_rw_directory
+ def test_rebasing(self, rw_dir):
+ r = Repo.init(rw_dir)
+ fp = osp.join(rw_dir, 'hello.txt')
+ r.git.commit("--allow-empty", message="init",)
+ with open(fp, 'w') as fs:
+ fs.write("hello world")
+ r.git.add(Git.polish_url(fp))
+ r.git.commit(message="English")
+ self.assertEqual(r.currently_rebasing_on(), None)
+ r.git.checkout("HEAD^1")
+ with open(fp, 'w') as fs:
+ fs.write("Hola Mundo")
+ r.git.add(Git.polish_url(fp))
+ r.git.commit(message="Spanish")
+ commitSpanish = r.commit()
+ try:
+ r.git.rebase("master")
+ except GitCommandError:
+ pass
+ self.assertEqual(r.currently_rebasing_on(), commitSpanish)