| Age | Commit message (Collapse) | Author |
|---|
|
If the file was not present, the mode seen in a diff can be legally '0',
which previously caused an assertion to fail for no good reason.
Now the assertion tests for None instead.
Closes #323
|
|
There is simply no excuse to doing that.
Closes #330
|
|
|
|
Without this commit the update() function of a submodule does not work
in CentOS 6.
|
|
Wrap `git merge-base --is-ancestor` into its own function because it acts
as a boolean check unlike base `git merge-base call`
|
|
I knew that flake would eventually get me, especially when least
suspected.
This time it's even useful, as it is a non-whitespace related issue.
|
|
It was a left-over of some prior hacking that was not removed by
accident.
|
|
I have no idea why PY3 requires such a mess of encoding/decoding
statements, but let's just be happy it works.
Also let's be sure I never ever write python code again ... EVER.
|
|
* untracked_files could, if there were spaces in the path returned,
re-rencode the previously decoded unicode string thanks to a
`decode("string_escape")` call. Now re-encode into utf-8 afterwards
- added test to assure this works indeed
* IndexFile.add() didn't handle unicode correctly and would write
broken index files. The solution was to compute the path length after
encoding it into utf-8 bytes, not before ... .
Closes #320
|
|
Always add '--' to git reset
|
|
If a git repo has the misfortune to have a file with the name "HEAD"
at the root level of the repo, git will return an error because it
is unsure whether the file or ref is meant:
File "/usr/local/lib/python2.7/dist-packages/git/refs/head.py", line 81, in reset
self.repo.git.reset(mode, commit, add_arg, paths, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 440, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 834, in _call_process
return self.execute(make_call(), **_kwargs)
File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 627, in execute
raise GitCommandError(command, status, stderr_value)
GitCommandError: 'git reset --hard HEAD' returned with exit code 128
stderr: 'fatal: ambiguous argument 'HEAD': both revision and filename
Use '--' to separate filenames from revisions'
Implement its suggested fix by always passing '--' as an argument to
"git reset". It is fine to pass it with no file specifiers afterwords.
In that case, git knows that "HEAD" is always meant as the ref.
|
|
|
|
|
|
|
|
revA..revB → revA...revB (three instead of two dots) [base.py, line
467](https://github.com/gitpython-developers/GitPython/blob/master/git/repo/base.py#L467)
rorepo is a ~~a~~ Repo instance [test_docs.py, line
21](https://github.com/gitpython-developers/GitPython/blob/master/git/test/test_docs.py#L21)
closes #314
|
|
|
|
|
|
|
|
Seems like OSX is somewhat special here ... .
|
|
Fixed additional test which seems to have different outcomes depending
on the interpreter. This just makes it work withouth attempting
to find the root cause of the issue.
|
|
This allows us to use the main thread to parse stderr to get progress,
and resolve assertion failures hopefully once and for all.
Relates to #301
|
|
Test was adjusted as well to parse only a single file which simulates
stderr output.
|
|
|
|
* Previously we could fail to parse the last line within a read buffer,
which is now fixed.
* Added a test to verify our *slow* line parsing works as expected.
|
|
Adds the optional keyword parameter env to Repo.clone_from(). The parameter
is a dictionary containing the desired environment variables for the git
clone invocation. The environment is applied to the temporary Git instance
before calling Repo._clone().
|
|
|
|
It shows that the previous implementation was never really working on
linux, and thus failed on travis as well for good reason.
Closes #303
|
|
When expanding directories, check if it is a symlink and don't expand
them at all.
Previously, we followed symlinks and expanded their contents, which
could lead to weird index files.
Fixes #302
|
|
This will make usage of the `NullHandler` possible in python 2.6
and below.
|
|
When the code is run without setting up loggers, the loggers have no
handlers for the emitted messages. The logging module displays:
`No handlers could be found for logger "git.cmd"` on the
console. By adding a NullHandler (a no-op) the message disappears,
and doesn't affect logging when other handlers are configured.
|
|
support passing odbt for using with Repo
|
|
It turns out we can't deal do fetches if no refspec is set as git
will change the format of the fetch return values, providing less
information than usual.
A test was added to show that such a case will fail, and an assertion
will assure we don't attempt to fetch/pull if there is no refspec
for 'fetch'.
Closes #296
|
|
In that case, the handler for processing stdout and stderr of the git
process is offloaded to threads. These currently don't return
any exception they raise.
We could easily fix this using an approach as shown
[here](http://goo.gl/hnVax6).
|
|
Reverted changes of `fe2fbc5~2`.
This caused `git-pull` to error, which now actually results in a fatal
error while fetching or pulling. Previously we simply didn't check
for this issue.
Now we are back to a `poll` based or threaded concurrent reading from
stdout and stderr to prevent a git process deadlock, and the
aforementioned error.
Related to #297
|
|
victorgp-master
|
|
* renamed `consider_submodules` to `submodules` to be in line with the
existing parameters. Nowadays I would prefer the `consider_` prefix,
but can't change the existing API and thus stick to the current
naming scheme.
* reduced amount of code in one portion to make it more maintainable.
Related to #294
|
|
Javex-submodule_fix
|
|
|
|
There are cases when might not consider a directory dirty when a submodule has
changes. Particular case was git-up stashing changes where submodules are
irrelevant.
|
|
|
|
|
|
This is a pre-emptive measure based on http://goo.gl/l74GC8 .
Related to #290
|
|
Previously, only program messages where forced to the C-locale, now
we force the entire program. That way, we should assure a remote
will not provide us with branch information in any other language but
english.
Related to #290
|
|
|
|
* config parser now handles quoted values correctly. This doesn't hamper
multi-line support.
* added regression test to travis to assure we will be warned if we
rewrite and break the user's .gitconfig file
* only rewrite configuration files if we actually called a mutating
method on the writer. Previously it would always rewrite it.
Fixes #285
|
|
add a GIT_PYTHON_TEST_GIT_DAEMON_PORT to set a port other than 9418,
for example for when you already have a daemon running on that port.
|
|
No reason to expose a daemon to all interfaces when it is only used for
tests, which connect to localhost anyway.
I'd love to use localhost here instead, but the git-daemon man page points out:
If IPv6 is not supported, then --listen=hostname is also not
supported and --listen must be given an IPv4 address.
I don't know of a way to check if git has ipv6 support, but 127.0.0.1
should be around for the foreseeable future
|
|
It expected to see major version 0 though.
|
|
|
|
The previous patch failed to update the expected number of op_codes,
which would result in an exception when creating an instance of
RemoteProgress. This patch corrects the value to the new expected number
of op_codes (8)
|
