diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-23 00:14:24 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-23 00:14:24 +0200 |
commit | 00499d994fea6fb55a33c788f069782f917dbdd4 (patch) | |
tree | f3de7739d34003a7356bd72769f212a47ebc8993 /test/git/test_index.py | |
parent | b2a14e4b96a0ffc5353733b50266b477539ef899 (diff) | |
parent | d1bd99c0a376dec63f0f050aeb0c40664260da16 (diff) | |
download | gitpython-00499d994fea6fb55a33c788f069782f917dbdd4.tar.gz |
Merge branch 'symbolic_ref' into improvements
* symbolic_ref:
SymbolicReferences can now change they references safely as I think and well controlled, including test.
Adjusted tests to deal with API changes
Added SymbolicReference and HEAD type to better represent these special types of references and allow special handling
Diffstat (limited to 'test/git/test_index.py')
-rw-r--r-- | test/git/test_index.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/git/test_index.py b/test/git/test_index.py index 257acf10..7bc2ad7e 100644 --- a/test/git/test_index.py +++ b/test/git/test_index.py @@ -116,8 +116,8 @@ class TestTree(TestBase): # test diff # resetting the head will leave the index in a different state, and the # diff will yield a few changes - cur_head_commit = rw_repo.head.commit - ref = rw_repo.head.reset(rw_repo, 'HEAD~6', index=True, working_tree=False) + cur_head_commit = rw_repo.head.reference.commit + ref = rw_repo.head.reset('HEAD~6', index=True, working_tree=False) # diff against same index is 0 diff = index.diff() |