[PATCH 2/2] bisect: add test to check that revs are properly parsed

2014-12-25 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6030-bisect-porcelain.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 064f5ce..e6abe65 100755 --- a/t/t6030-bisect-porcelain.sh +++

[PATCH 1/2] bisect: parse revs before passing them to check_expected_revs()

2014-12-25 Thread Christian Couder
When running for example git bisect bad HEAD or git bisect good master, the parameter passed to git bisect (bad|good) has to be parsed into a commit hash before checking if it is the expected commit or not. We could do that in is_expected_rev() or in check_expected_revs(), but it is already done

Re: git: regression with mergetool and answering n (backport fix / add tests)

2014-12-25 Thread David Aguilar
On Tue, Dec 23, 2014 at 08:08:34PM +0100, Daniel Hahler wrote: Hi, this is in reply to the commits from David: commit 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 Refs: v2.2.0-60-g0ddedd4 Merge: e886efd 1e86d5b Author: Junio C Hamano gits...@pobox.com AuthorDate: Fri

Re: git: regression with mergetool and answering n (backport fix / add tests)

2014-12-25 Thread Daniel Hahler
Hi David, sorry for the confusion - the patch / fix I've mentioned was meant to be applied on the commit that caused the regression and not current master. Cheers, Daniel. On 26.12.2014 02:00, David Aguilar wrote: On Tue, Dec 23, 2014 at 08:08:34PM +0100, Daniel Hahler wrote: Hi, this is

Re: [PATCH 6/7] push.c: add an --atomic argument

2014-12-25 Thread Michael Haggerty
On 12/19/2014 08:39 PM, Stefan Beller wrote: Add a command line argument to the git push command to request atomic pushes. [...] diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 21b3f29..da63bdf 100644 --- a/Documentation/git-push.txt +++