Skip to content

Repo: handle worktrees better #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 1, 2017
Merged

Repo: handle worktrees better #638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
176696b
Repo: handle worktrees better
vathpela Jun 26, 2017
9667b7a
Maybe work around AppVeyor setting a bad email?
vathpela Jun 28, 2017
0e9b99b
Try to ignore test on windows as it fails for the wrong reasons
Byron Jul 1, 2017
afe947b
Update changelog and improve docs on skipped test
Byron Jul 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update changelog and improve docs on skipped test 
[skip ci]
  • Loading branch information
@Byron
Byron committed Jul 1, 2017
commit afe947b808c06f2a5adc03d160c2376947e1a1ef
5 changes: 5 additions & 0 deletions doc/source/changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog
=========

2.1.6 - Bugfixes
====================================

* support for worktrees

2.1.3 - Bugfixes
====================================

Expand Down
3 changes: 2 additions & 1 deletion git/test/test_submodule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,11 +664,12 @@ def test_add_empty_repo(self, rwdir):
# end for each checkout mode

@skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
"""FIXME: ile "C:\\projects\\gitpython\\git\\cmd.py", line 671, in execute
"""FIXME on cygwin: File "C:\\projects\\gitpython\\git\\cmd.py", line 671, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
GitCommandError: Cmd('git') failed due to: exit code(128)
cmdline: git add 1__Xava verbXXten 1_test _myfile 1_test_other_file 1_XXava-----verbXXten
stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files'
FIXME on appveyor: see https://ci.appveyor.com/project/Byron/gitpython/build/1.0.185
""")
@with_rw_directory
def test_git_submodules_and_add_sm_with_new_commit(self, rwdir):
Expand Down