From 9fbae711b76a4f2fa9345f43da6d2cdedd75d6c3 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 20 Jan 2015 20:56:33 +0100 Subject: 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. --- git/repo/fun.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/repo') 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 -- cgit v1.2.3