summaryrefslogtreecommitdiff
path: root/git/repo
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-20 20:56:33 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-20 20:56:33 +0100
commit9fbae711b76a4f2fa9345f43da6d2cdedd75d6c3 (patch)
treee203a3ea4ab21dc4db72e7df3ec52237e7cd65ae /git/repo
parentea29541e213df928d356b3c12d4d074001395d3c (diff)
downloadgitpython-9fbae711b76a4f2fa9345f43da6d2cdedd75d6c3.tar.gz
Greatly improved possible safety of Submodule.update(), which is used by default.
Previously, the implementation would gladly reset new commits in submodules, and/or reset a dirty working tree. Now the new force_reset/force flag has to be specified explicitly to get back to the old behaviour. All submodule tests except for one are working.
Diffstat (limited to 'git/repo')
-rw-r--r--git/repo/fun.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/repo/fun.py b/git/repo/fun.py
index 1ee11ffc..2a1270be 100644
--- a/git/repo/fun.py
+++ b/git/repo/fun.py
@@ -296,7 +296,7 @@ def rev_parse(repo, rev):
raise ValueError("Invalid token: %r" % token)
# END end handle tag
except (IndexError, AttributeError):
- raise BadObject("Invalid Revision in %s" % rev)
+ raise BadName("Invalid revision spec '%s' - not enough parent commits to reach '%s%i'" % (rev, token, num))
# END exception handling
# END parse loop