The first patch is one I've had in my experimental branch for a very
long time; it bumps our git version requirement to 1.6.1, which is by
now sufficiently ancient.
The last two patches is a test and fix for a bug found by Dan
Härdfeldt. Catalin, you introduced that bug (see the cimmit
message)---do you recall what that line was for?
The easiest way to get the patches is to pull
git://repo.or.cz/stgit/kha.git safe
---
Karl Wiberg (5):
Diff several trees at once with git diff-tree --stdin
Correct function docstring
reorder_patches: Comment that a failed push means we never get to the end
Add two tests (one currently failing) for "stg float" causing conflicts
Don't clear the list of changed patches when we hit a push conflict
INSTALL | 5 +++--
stgit/lib/git.py | 37 +++++++++++++++++++++++++++++++++----
stgit/lib/transaction.py | 5 +++--
t/t1502-float-conflict-1.sh | 38 ++++++++++++++++++++++++++++++++++++++
t/t1503-float-conflict-2.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 119 insertions(+), 8 deletions(-)
create mode 100755 t/t1502-float-conflict-1.sh
create mode 100755 t/t1503-float-conflict-2.sh
--
Karl Wiberg, Intel
_______________________________________________
stgit-users mailing list
[email protected]
https://mail.gna.org/listinfo/stgit-users
