From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: John Keeping <john@keeping.me.uk>, git@vger.kernel.org
Subject: Re: [PATCH 8/7] mergetool--lib: don't call "exit" in setup_tool
Date: Fri, 25 Jan 2013 23:01:08 -0800 [thread overview]
Message-ID: <CAJDDKr5aC6K7FqVB-EgmObUTJUfS3Qc5YOeG-0eZd289YCq1Og@mail.gmail.com> (raw)
In-Reply-To: <7vip6k23mk.fsf@alter.siamese.dyndns.org>
On Fri, Jan 25, 2013 at 4:24 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Applying this one on top of 1/7 thru 5/7 and 7/7 seems to break
> t7610 rather badly.
I just sent a replacement for the vim/symlink issue stuff.
I tried to keep the patch small. John, can you rebase this
patch on top of it?
> --- >8 ------ >8 ------ >8 ------ >8 ------ >8 ------ >8 ---
> ...
> ok 1 - setup
>
> expecting success:
> git checkout -b test1 branch1 &&
> git submodule update -N &&
> test_must_fail git merge master >/dev/null 2>&1 &&
> ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> ( yes "" | git mergetool file1 file1 ) &&
> ( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
> ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
> ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
> ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
> ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
> test "$(cat file1)" = "master updated" &&
> test "$(cat file2)" = "master new" &&
> test "$(cat subdir/file3)" = "master new sub" &&
> test "$(cat submod/bar)" = "branch1 submodule" &&
> git commit -m "branch1 resolved with mergetool"
>
> M submod
> Switched to a new branch 'test1'
> Submodule path 'submod': checked out '39c7f044ed2e6a9cebd5266529badd181c8762b5'
> not ok - 2 custom mergetool
> #
> # git checkout -b test1 branch1 &&
> # git submodule update -N &&
> # test_must_fail git merge master >/dev/null 2>&1 &&
> # ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> # ( yes "" | git mergetool file1 file1 ) &&
> # ( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
> # ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
> # ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
> # ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
> # ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
> # test "$(cat file1)" = "master updated" &&
> # test "$(cat file2)" = "master new" &&
> # test "$(cat subdir/file3)" = "master new sub" &&
> # test "$(cat submod/bar)" = "branch1 submodule" &&
> # git commit -m "branch1 resolved with mergetool"
> #
> --- 8< ------ 8< ------ 8< ------ 8< ------ 8< ------ 8< ---
>
> Due to ">dev/null 2>&1", all of the error clues are hidden, and I
> didn't dig further to see which one was failing (this is why tests
> shouldn't do these in general).
--
David
next prev parent reply other threads:[~2013-01-26 7:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 9:43 [PATCH 0/7] mergetool-lib improvements for --tool-help David Aguilar
2013-01-25 9:43 ` [PATCH 1/7] git-mergetool: move show_tool_help to mergetool--lib David Aguilar
2013-01-25 9:43 ` [PATCH 2/7] git-mergetool: remove redundant assignment David Aguilar
2013-01-25 9:43 ` [PATCH 3/7] git-mergetool: don't hardcode 'mergetool' in show_tool_help David Aguilar
2013-01-25 9:43 ` [PATCH 4/7] git-difftool: use git-mergetool--lib for "--tool-help" David Aguilar
2013-01-25 9:43 ` [PATCH 5/7] mergetools/vim: Remove redundant diff command David Aguilar
2013-01-25 9:43 ` [PATCH 6/7] mergetools: Fix difftool/mergetool --tool-help listing for vim David Aguilar
2013-01-25 10:23 ` Sebastian Schuberth
2013-01-25 10:28 ` David Aguilar
2013-01-25 10:34 ` Sebastian Schuberth
2013-01-25 11:39 ` Sebastian Schuberth
2013-01-25 10:38 ` John Keeping
2013-01-25 10:40 ` David Aguilar
2013-01-25 19:11 ` Junio C Hamano
2013-01-25 9:43 ` [PATCH 7/7] mergetool--lib: Improve show_tool_help() output David Aguilar
2013-01-25 19:54 ` John Keeping
2013-01-25 20:06 ` Junio C Hamano
2013-01-25 20:08 ` John Keeping
2013-01-25 20:16 ` Junio C Hamano
2013-01-25 20:46 ` John Keeping
2013-01-25 20:56 ` Junio C Hamano
2013-01-25 21:16 ` John Keeping
2013-01-25 21:47 ` Junio C Hamano
2013-01-25 22:02 ` John Keeping
2013-01-25 22:03 ` [PATCH 8/7] mergetool--lib: don't call "exit" in setup_tool John Keeping
2013-01-26 0:24 ` Junio C Hamano
2013-01-26 7:01 ` David Aguilar [this message]
2013-01-26 12:17 ` [PATCH 1/2 v2] " John Keeping
2013-01-26 13:50 ` [PATCH 1/2 v3] " John Keeping
2013-01-25 22:04 ` [PATCH 9/7] mergetool--lib: fix path lookup in guess_merge_tool John Keeping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJDDKr5aC6K7FqVB-EgmObUTJUfS3Qc5YOeG-0eZd289YCq1Og@mail.gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).