Re: git difftool --dir-diff error in the presence of symlinks to directories

On Wed, Jun 17, 2015 at 06:39:27PM -0400, Ismail Badawi wrote: Reproduce like this (using git 2.4.3): git init mkdir foo touch foo/bar git add . git commit -m Initial commit. ln -s foo link git add . git commit -m Add link to foo. git difftool -d HEAD^ HEAD That last command

Re: git difftool is not working as expected during MERGING

On Wed, Jun 10, 2015 at 03:12:21PM +0200, Bossert, Andre wrote: Hello, i've tested git difftool with -t --ext-cmd and other options to see my diff with external tools, but it always show internal text-diff in console. The same tests with git mergetool working as expected. I've compared

Re: Need some help on patching buildin-files // was: Looking for feedback and help with a git-mirror for local usage

On Fri, Jun 12, 2015 at 12:52:44PM +0200, Bernd Naumann wrote: Hello again, After digging the code I may have got a clue where to start but I would still appreciate some help from a developer, cause I have never learned to write C. (Some basics at school which happened over a decade ago.)

Re: [PATCH] mergetools: add config option to disable auto-merge

On Wed, Jun 17, 2015 at 10:27:58PM -0400, Mike Rappazzo wrote: On Wed, Jun 17, 2015 at 3:41 PM, Junio C Hamano gits...@pobox.com wrote: Michael Rappazzo rappa...@gmail.com writes: For some mergetools, the current invocation of git mergetool will include an auto-merge flag. By default the

Re: Staging commits with visual diff tools?

On Sun, May 31, 2015 at 10:36:52AM +0100, John Lee wrote: On Sat, 30 May 2015, David Aguilar wrote: On Tue, May 26, 2015 at 09:50:49PM +0100, John Lee wrote: Hi Does anybody have code to stage commits using a the visual diff/merge tools supported by git-difftool? Is there support in git

Re: Staging commits with visual diff tools?

On Tue, May 26, 2015 at 09:50:49PM +0100, John Lee wrote: Hi Does anybody have code to stage commits using a the visual diff/merge tools supported by git-difftool? Is there support in git itself somewhere, even? I'm looking for something functionally similar to git add -p Looking at

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

[just wrapping up the unaswered questions in this thread] On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: Quoting David Aguilar dav...@gmail.com: +translate_merge_tool_path() { +# Use WinMergeU.exe if it exists in $PATH +if type -p WinMergeU.exe /dev/null 21

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

On Fri, May 22, 2015 at 01:05:28PM -0700, Junio C Hamano wrote: David Aguilar dav...@gmail.com writes: [just wrapping up the unaswered questions in this thread] ... On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: Thanks for clarifications. I think all is good now? Yes

[PATCH 3/3] am: rename struct tree_desc t to desc for readability

Signed-off-by: David Aguilar dav...@gmail.com --- builtin/am.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 9db1b34..7e6860d 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1907,7 +1907,7 @@ static int fast_forward_to(struct tree

[PATCH 2/3] am: do not corrupt the index stat state

Reported-by: Linus Torvalds Signed-off-by: David Aguilar dav...@gmail.com --- builtin/am.c| 14 +- t/t4151-am-abort.sh | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 1399c8d..9db1b34 100644 --- a/builtin/am.c +++ b

[PATCH 1/3] t4151: demonstrate that builtin am corrupts index' stat data

From: Johannes Schindelin johannes.schinde...@gmx.de Reported by Linus Torvalds. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- t/t4151-am-abort.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index

Config variables and scripting // was Re: [RFC/PATCH] log: add log.firstparent option

On Wed, Jul 22, 2015 at 06:23:44PM -0700, Jeff King wrote: This patch adds an option to turn on --first-parent all the time, along with the corresponding --no-first-parent to disable it. [Putting on my scripter hat] I sometimes think, it would be really helpful if we had a way to tell Git

[PATCH] contrib/subtree: ignore log.date configuration

that the default date format is used instead. Reported-by: Bryan Jacobs b...@q3q.us Signed-off-by: David Aguilar dav...@gmail.com --- contrib/subtree/git-subtree.sh | 2 +- contrib/subtree/t/t7900-subtree.sh | 5 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/subtree/git

[PATCH v2] contrib/subtree: ignore log.date configuration

that the default date format is used instead. Reported-by: Bryan Jacobs b...@q3q.us Signed-off-by: David Aguilar dav...@gmail.com --- Please ignore the previous patch -- it had a stray comment in the test code that is not present in this version. contrib/subtree/git-subtree.sh | 2 +- contrib/subtree/t

Re: [PATCH] difftool: gracefully handle symlinks to directories

On Thu, Oct 22, 2015 at 11:23:54AM -0700, Junio C Hamano wrote: > David Aguilar <dav...@gmail.com> writes: > > > difftool's dir-diff feature was blindly feeding worktree paths > > to hash-object without checking whether the path was indeed a > > file, causing the fea

[PATCH] difftool: avoid symlinks when reusing worktree files

difftool's dir-diff should never reuse a symlink, regardless of what it points to. Tighten use_wt_file() so that it rejects all symlinks. Helped-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 12 ++-- 1 fil

Re: [PATCH] difftool: avoid symlinks when reusing worktree files

On Tue, Oct 27, 2015 at 03:24:49PM -0700, Junio C Hamano wrote: > David Aguilar <dav...@gmail.com> writes: > > > difftool's dir-diff should never reuse a symlink, regardless of > > what it points to. Tighten use_wt_file() so that it rejects all > > symlinks. >

Re: [PATCH] difftool: avoid symlinks when reusing worktree files

er %symlink that appears later in the caller. The caller discards > > $wt_sha1 when $use=0 is returned, so the second return value does > > not matter. > > So let me try to update your patch with the result of the study of > the codeflow. > > -- >8 -- > From: David Aguila

[PATCH] difftool: gracefully handle symlinks to directories

the breakage. Reported-by: Ismail Badawi <ism...@badawi.io> Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 4 +--- t/t7800-difftool.sh | 19 +++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl i

Re: Git's inconsistent command line options

On Mon, Aug 31, 2015 at 10:25:58AM -0400, Barry Warsaw wrote: > On Aug 31, 2015, at 05:10 PM, Duy Nguyen wrote: > > >I'm probably shot down for this. But could we go with a clean plate > >and create a new command prefix (something like git-next, git2, or > >gt...)? We could then redesign the

Re: Feature Request: enhance Git-GUI's Checkout Branch screen

On Thu, Sep 03, 2015 at 10:08:24AM -0700, John Medema wrote: > Git gurus, throw this one on your to-do list: > > This is a feature request to enhance the Git GUI to make it easier to > checkout non-existing branches that exist upstream. Apologies if this > is not the correct place for feature

Re: [PATCH 03/16] refs: add methods for the ref iterators

Apologies for the late review, and this review should probably go on patch 01 or 02 but I don't have it in my mbox atm... On Wed, Dec 02, 2015 at 07:35:08PM -0500, David Turner wrote: > From: Ronnie Sahlberg > > Signed-off-by: Ronnie Sahlberg >

Re: Combining APPLE_COMMON_CRYPTO=1 and NO_OPENSSL=1 produces unexpected result

On Sun, Dec 27, 2015 at 06:29:29PM -0800, Junio C Hamano wrote: > Eric Sunshine writes: > > > So, it might be easier to think of NO_OPENSSL as really meaning NO_SSL > > (that is, "disable all SSL-related functionality"). Since the only SSL > > implementation Git knows

Re: t7800 test failure

sion. If we end up fixing all of these then I can send this to the list as a proper patch. Curious, is there an easy way to get readlink and mktemp installed on AIX? Another alternative is that we can compile our own "git-readlink" and "git-mktemp" programs and use those instead

Re: t7610-mergetool.sh test failure

On Wed, May 25, 2016 at 08:51:14PM -0500, Jeff King wrote: > On Wed, May 25, 2016 at 06:16:15PM -0500, Jeff King wrote: > > > On Tue, May 24, 2016 at 09:45:25AM -0700, Junio C Hamano wrote: > > > > > On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik > > > wrote: > > > >

Re: [PATCH 11/11] i18n: difftool: mark warnings for translation

On Tue, Jun 21, 2016 at 11:44:13AM +, Vasco Almeida wrote: > --- a/git-difftool.perl > +++ b/git-difftool.perl > @@ -451,11 +452,11 @@ sub dir_diff > } > > if (exists $wt_modified{$file} and exists $tmp_modified{$file}) > { > - my $errmsg =

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

ay need to forewarn. > > > In any case, the buffer numbering is not the same (it is local remote > > base merge) but it doesn't matter in this case because only one window > > is displayed, so there is no visual association. > > OK, thanks. Sorry for not noticing this thr

[PATCH v3 1/2] mergetool: support delete/delete conflicts

resolution when encountering a delete/delete conflict. The end result is that a delete/delete conflict is presented for the user to resolve. Reported-by: Joe Einertson <j...@kidblog.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- Rebased to include tests and test fixes. The ser

[PATCH v3 2/2] mergetool: honor tempfile configuration when resolving delete conflicts

Teach resolve_deleted_merge() to honor the mergetool.keepBackup and mergetool.keepTemporaries configuration knobs. This ensures that the worktree is kept pristine when resolving deletion conflicts with the variables both set to false. Signed-off-by: David Aguilar <dav...@gmail.com> --- R

[PATCH] t7610-mergetool: add test cases for tempfile behavior

Ensure that mergetool.keepTemporaries is honored when resolving delete/delete conflicts. Ensure that stderr stays empty, and that worktree directories created by mergetool to are removed. Signed-off-by: David Aguilar <dav...@gmail.com> --- t/t7610-mergetool.s

Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent

It might be > better just to drop the example since it's obvious what the patch does. Thanks for reviewing. Acked-by: David Aguilar <dav...@gmail.com> cheers, -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] difftool/mergetool: make the form of yes/no questions consistent

On Tue, Apr 12, 2016 at 02:15:09PM -0700, Junio C Hamano wrote: > Nikola Forró writes: > > > Every yes/no question in difftool/mergetool scripts has slightly > > different form, and none of them is consistent with the form git > > itself uses. > > > > Make the form of all the

Re: [PATCH] mergetools: created new mergetool file for ExamDiff

On Sun, Mar 20, 2016 at 06:02:55PM -0700, Junio C Hamano wrote: > Jacob Nisnevich <jacob.nisnev...@gmail.com> writes: > > > --- > > Missing sign-off. > > I'll Cc the area expert (David Aguilar). > > > mergetools/examdiff | 37 ++

Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff

On Wed, Mar 23, 2016 at 03:55:45PM -0700, Jacob Nisnevich wrote: > Signed-off-by: Jacob Nisnevich > --- Please write commit message in an imperative tone. e.g. "mergetools: add support for ExamDiff" might be a good summary. > mergetools/examdiff | 20

[PATCH v2 1/2] mergetool: honor tempfile configuration when resolving delete conflicts

Teach resolve_deleted_merge() to honor the mergetool.keepBackup and mergetool.keepTemporaries configuration knobs. This ensures that the worktree is kept pristine when resolving deletion conflicts with the variables both set to false. Signed-off-by: David Aguilar <dav...@gmail.com> --- v

[PATCH 2/2] mergetool: support delete/delete conflicts

resolution when encountering a delete/delete conflict. The end result is that a delete/delete conflict is presented for the user to resolve. Reported-by: Joe Einertson <j...@kidblog.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- git-mergetool.sh | 14 +++--- t/t7610-

[PATCH 1/2] mergetool: honor tempfile configuration when resolving delete conflicts

Teach resolve_deleted_merge() to honor the mergetool.keepBackup and mergetool.keepTemporaries configuration knobs. This ensures that the worktree is kept pristine when resolving deletion conflicts with the variables both set to false. Signed-off-by: David Aguilar <dav...@gmail.com> --

Re: git-rebase + git-mergetool results in broken state

On Tue, Feb 23, 2016 at 04:44:49PM -0600, Joe Einertson wrote: > I'm experiencing an annoying issue which leaves the repository in a > weird, broken state. I am attempting a rather vanilla rebase, rebasing > the commits from a feature branch on top of the newest commits on > master. Can you tell

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

Hello, On Tue, Mar 29, 2016 at 11:38:10AM +, Harish K wrote: > --- > git-gui/lib/tools.tcl | 16 +--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/git-gui/lib/tools.tcl b/git-gui/lib/tools.tcl > index 6ec9411..749bc67 100644 > --- a/git-gui/lib/tools.tcl >

Re: [PATCH] Feature: custom guitool commands can now have custom keyboard shortcuts

On Tue, Mar 29, 2016 at 11:29:41AM +, Harish K wrote: > --- > git-gui/lib/tools.tcl | 16 +--- > 1 file changed, 13 insertions(+), 3 deletions(-) I forgot to mention that git-gui has its own repository. The git project merges the upstream repo as a subtree into its git-gui

Re: [PATCH 0/2] mergetools: add support for ExamDiff

mergetools/examdiff | 18 ++ > > mergetools/winmerge | 21 + > > 3 files changed, 44 insertions(+), 20 deletions(-) > > create mode 100644 mergetools/examdiff > > This round looked good to me. > David, does this look sens

Re: using git-difftool -d when cherry-picking

On Wed, Apr 27, 2016 at 11:12:25AM +0200, Jan Smets wrote: > Hi > > Please consider following example > > #!/bin/bash > rm -rf /tmp/gittest > mkdir /tmp/gittest > cd /tmp/gittest > > git init > > echo $RANDOM > testfile > git add testfile > git commit -m test -a > > git branch X > git

[PATCH 2/2] difftool: handle unmerged files in dir-diff mode

. Add a test to demonstrate the breakage. Reported-by: Jan Smets <j...@smets.cx> Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 5 + t/t7800-difftool.sh | 23 +++ 2 files changed, 28 insertions(+) diff --git a/git-difftool.perl b/git-d

[PATCH 1/2] difftool: initialize variables for readability

The code always goes into one of the two conditional blocks but make it clear that not doing so is an error condition by setting $ok to 0. Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH 2/3] subtree: fix "git subtree split --rejoin"

ndelin <johannes.schinde...@gmx.de> Signed-off-by: David Aguilar <dav...@gmail.com> --- This is a "re-implementation" of Brett's original RFC patch. I preferred adding a new line (rather than modifying the existing line) so I have no problem signing off on this being a dist

[PATCH 1/3] t7900-subtree.sh: fix quoting and broken && chains

Allow whitespace in arguments to subtree_test_create_repo. Add missing && chains. Signed-off-by: David Aguilar <dav...@gmail.com> --- contrib/subtree/t/t7900-subtree.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/subtree/t/t7900-subtree

[PATCH 3/3] subtree: adjust style to match CodingGuidelines

Prefer "test" over "[ ... ]", use double-quotes around variables, break long lines, and properly indent "case" statements. Signed-off-by: David Aguilar <dav...@gmail.com> --- contrib/subtree/git-subtree.sh | 544 ++--- 1

[PATCH v2 3/3] subtree: adjust style to match CodingGuidelines

Prefer "test" over "[ ... ]", use double-quotes around variables, break long lines, and properly indent "case" statements. Helped-by: Johannes Sixt <j...@kdbg.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- This is a replacement patch th

[PATCH v3 3/4] subtree: adjust style to match CodingGuidelines

Prefer "test" over "[ ... ]", use double-quotes around variables, break long lines, and properly indent "case" statements. Helped-by: Johannes Sixt <j...@kdbg.org> Helped-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: David Aguilar <dav.

[PATCH v3 4/4] subtree: adjust function definitions to match CodingGuidelines

We prefer a space between the function name and the parentheses, and no space inside the parentheses. The opening "{" should also be on the same line. Suggested-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: David Aguilar <dav...@gmail.com> --- This says "v3&quo

Re: [PATCH] difftool: always honor "command not found" exit code

rg/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02 > > Signed-off-by: John Keeping <j...@keeping.me.uk> Looks good to me, thanks. Acked-by: David Aguilar <dav...@gmail.com> > --- > On Sat, Aug 13, 2016 at 11:36:39AM +0100, John Keeping wrote: > > It woul

Re: git-mergetool reverse file ordering

On Wed, Jul 27, 2016 at 11:14:28AM +0100, Luis Gutierrez wrote: > Hi, > > Attached is a potential patch for reversing the order on which > git-mergetool presents the files to merge. > > Currently, when running git-mergetool, it performs a sort of the files > to merge by alphabetical ordering.

Re: [PATCH 2/3] difftool: avoid $GIT_DIR and $GIT_WORK_TREE

On Tue, Jul 19, 2016 at 02:06:35PM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > It is not wrong per-se, but as you are in a subshell, you do not > > have to unset these, I would think. Not worth a reroll, but unless > > I am overlooking something (in which case

Re: [PATCH] git-subtree.sh: Use --allow-unrelated-histories when splitting with --rejoin

[cc'd Roberto for submitGit q's] On Thu, Jul 21, 2016 at 12:56:51AM +, Brett Cundal wrote: > --- The message on the pull request[1] has a better justification for this change, which would have been nice in the commit message itself: Git 2.9 added a check against merging unrelated

[PATCH 1/3] difftool: fix argument handling in subdirs

ng.me.uk> Acked-by: David Aguilar <dav...@gmail.com> --- This patch is unchanged from John's version but also includes Reported-by and Acked-by lines. git-difftool.perl | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index

[PATCH 3/3] difftool: use Git::* functions instead of passing around state

side-effects involving environment variables. Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 54 ++ 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index bc2267f..a

[PATCH 2/3] difftool: avoid $GIT_DIR and $GIT_WORK_TREE

-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 27 ++- t/t7800-difftool.sh | 16 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index c9d3ef8..bc2267f 100755 --- a/git-difftool.perl +++

Re: [PATCH] difftool: fix argument handling in subdirs

[Cc'd Tim, who originally authored the dir-diff code] On Tue, Jul 05, 2016 at 08:52:52PM +0100, John Keeping wrote: > On Mon, Jul 04, 2016 at 08:37:39PM +0200, Bernhard Kirchen wrote: > > Today I started using --dir-diff and noticed a problem when specifying a > > non-full path limiter. My diff

Re: git-mergetool reverse file ordering

On Mon, Aug 15, 2016 at 09:19:35PM +0100, Luis Gutierrez wrote: > > Thoughts? Would you be interested in helping work up a patch > > for this idea? At a minimum we should also write a test case in > > t/t7610-mergetool.sh to verify that it works as advertised. > > > Why not reuse the

Re: git-mergetool reverse file ordering

Hi Luis and Hannes, On Wed, Aug 17, 2016 at 09:35:56AM +0200, Johannes Sixt wrote: > Am 17.08.2016 um 08:46 schrieb David Aguilar: > > The only thing that using diff-files doesn't address is the > > rerere support in mergetool where it processes the files in > > the or

[PATCH] tag: add a config option for setting --annotate by default

Make it easier for users to remember to annotate their tags. Allow setting the default value for "--annotate" via the "tag.annotate" configuration variable. Signed-off-by: David Aguilar <dav...@gmail.com> --- Documentation/config.txt | 5 + builtin/tag.c

[PATCH 2/2] t7800: replace "wc -l" with test_line_count

Make t7800 easier to debug by capturing output into temporary files and using test_line_count to make assertions on those files. Signed-off-by: David Aguilar <dav...@gmail.com> --- t/t7800-difftool.sh | 31 +++ 1 file changed, 19 insertions(+), 12 deletions(-)

[PATCH 1/2] t7800: simplify basic usage test

Use "test_line_count" instead of "wc -l", use "git -C" instead of a subshell, and use test_expect_code when calling difftool. Ease debugging by capturing output into temporary files. Suggested-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off

Re: [PATCH] tag: add a config option for setting --annotate by default

On Fri, Feb 03, 2017 at 09:02:47PM -0800, Junio C Hamano wrote: > David Aguilar <dav...@gmail.com> writes: > > > Make it easier for users to remember to annotate their tags. > > Allow setting the default value for "--annotate" via the "tag.annotate" &g

Re: subtree merging fails

On Tue, Feb 07, 2017 at 08:59:06AM -0600, Samuel Lijin wrote: > Have you tried using (without -s subtree) -X subtree=path/to/add/subtree/at? > > From the man page: > > subtree[=] >This option is a more advanced form of subtree > strategy, where the strategy >

Re: [PATCH] Remove --no-gui option from difftool usage string

On Fri, Feb 03, 2017 at 10:23:51PM -0800, Denton Liu wrote: > On Fri, Feb 03, 2017 at 09:58:09PM -0800, Jacob Keller wrote: > > On Fri, Feb 3, 2017 at 6:56 PM, Denton Liu wrote: > > > The --no-gui option not documented in the manpage, nor is it actually > > > used in the

Re: [PATCH] Add --gui option to mergetool

On Fri, Feb 03, 2017 at 10:43:03PM -0800, Denton Liu wrote: > * fix the discrepancy between difftool and mergetool where > the former has the --gui flag and the latter does not by adding the > functionality to mergetool Please avoid bullet points in commit messages when a simple paragraph

[PATCH] difftool: fix bug when printing usage

Signed-off-by: David Aguilar <dav...@gmail.com> --- This bug exists in both "master" and "next". This patch has been tested on both branches. builtin/difftool.c | 8 t/t7800-difftool.sh | 13 + 2 files changed, 17 insertions(+), 4 deletions(-) diff

[BUG] was: Re: [PATCH] Remove --no-gui option from difftool usage string

On Fri, Feb 03, 2017 at 06:56:17PM -0800, Denton Liu wrote: > The --no-gui option not documented in the manpage, nor is it actually > used in the source code. This change removes it from the usage help > that's printed. > > Signed-off-by: Denton Liu > --- >

Re: mergetool and difftool inconsistency?

On Wed, Jan 25, 2017 at 06:58:10PM -0800, Denton Liu wrote: > Hello all, > > I was wondering if there is any reason why 'git difftool' accepts the > '-g|--gui' whereas 'git mergetool' does not have an option to accept > that flag. Please let me know if this is intentional, otherwise I can > write

Re: [PATCH] difftool.c: mark a file-local symbol with static

number of people. > > -Peff How about using warning(" ") instead? For difftool.c specifically, the following is a fine solution, and doesn't require that we change our warning flags just for this one file. -- David --- 8< --- >From 28bdc381202ced35399cfdf4899a019b

[PATCH] gitk: remove translated message from comments

Reported-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: David Aguilar <dav...@gmail.com> --- po/sv.po | 15 --- 1 file changed, 15 deletions(-) diff --git a/po/sv.po b/po/sv.po index 32fc752..2a06fe5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1385,21 +1385,6 @@ msgstr &q

Re: Feature Request: user defined suffix for temp files created by git-mergetool

On Tue, Oct 04, 2016 at 01:18:47AM -0400, Josef Ridky wrote: > Hi Anatoly, > > > | Sent: Monday, October 3, 2016 5:18:44 PM > | > | Hi Josef, > | > | > | On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote: > | > In several projects, we are using git mergetool for comparing

[PATCH v3 1/4] mergetool: add copyright

Signed-off-by: David Aguilar <dav...@gmail.com> --- Unchanged since v1; included for completeness. git-mergetool.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-mergetool.sh b/git-mergetool.sh index bf86270..300ce7f 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -3,

[PATCH v3 2/4] mergetool: move main program flow into a main() function

, and many other languages. This helps readers more familiar with other languages understand the purpose of each function when diving into the codebase with fresh eyes. Signed-off-by: David Aguilar <dav...@gmail.com> --- Unchanged since v2; included for completeness. git-mergetool.sh

[PATCH v3 3/4] mergetool: honor diff.orderFile

Teach mergetool to get the list of files to edit via `diff` so that we gain support for diff.orderFile. Suggested-by: Luis Gutierrez <luisg...@gmail.com> Helped-by: Johannes Sixt <j...@kdbg.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- Changes since v2: The te

[PATCH v3 4/4] mergetool: honor -O

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Helped-by: Johannes Sixt <j...@kdbg.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- Changes since v2: The tests no longer rely on "grep -A" and instead use "git

[PATCH 3/4] mergetool: honor diff.orderFile

Teach mergetool to get the list of files to edit via `diff` so that we gain support for diff.orderFile. Suggested-by: Luis Gutierrez <luisg...@gmail.com> Helped-by: Johannes Sixt <j...@kdbg.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- Documentation/git-mergetool.t

[PATCH 4/4] mergetool: honor -O

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Signed-off-by: David Aguilar <dav...@gmail.com> --- Documentation/git-mergetool.txt | 10 ++ git-mergetool.sh| 14 -- t/t7610-mergetool.sh

[PATCH 2/4] mergetool: move main program flow into a main() function

Signed-off-by: David Aguilar <dav...@gmail.com> --- git-mergetool.sh | 180 --- 1 file changed, 93 insertions(+), 87 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 300ce7f..b2cd0a4 100755 --- a/git-mergetool.sh +++

[PATCH 1/4] mergetool: add copyright

Signed-off-by: David Aguilar <dav...@gmail.com> --- git-mergetool.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-mergetool.sh b/git-mergetool.sh index bf86270..300ce7f 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -3,6 +3,7 @@ # This program resolves merge conflicts

[PATCH v2 4/4] mergetool: honor -O

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Signed-off-by: David Aguilar <dav...@gmail.com> --- This is a replacement patch for 4/4 from the original series. The changes are stylistic -- the "order_file" variable name and &quo

[PATCH v2 2/4] mergetool: move main program flow into a main() function

, and many other languages. This helps readers more familiar with other languages understand the purpose of each function when diving into the codebase with fresh eyes. Signed-off-by: David Aguilar <dav...@gmail.com> --- As suggested by Hannes, v2 provides a better commit message. This is a sty

[PATCH v4 4/4] mergetool: honor -O

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Helped-by: Johannes Sixt <j...@kdbg.org> Signed-off-by: David Aguilar <dav...@gmail.com> --- Since v3: I missed one last piped invocation of "git mergetool" in the tests, which has

Re: git-mergetool reverse file ordering

On Wed, Aug 17, 2016 at 08:10:46AM +0200, Johannes Sixt wrote: > Am 17.08.2016 um 08:05 schrieb Johannes Sixt: > > Am 17.08.2016 um 03:25 schrieb David Aguilar: > > > Hmm, I do like the idea of reusing the diff orderFile, but a > > > mechanism for sorting arbitrary in

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Wed, Aug 17, 2016 at 05:51:30PM -0700, Jacob Keller wrote: > [snip] > @@ -333,31 +326,23 @@ static void print_submodule_summary(struct rev_info > *rev, FILE *f, > strbuf_release(); > } > > -void show_submodule_summary(FILE *f, const char *path, > +/* Helper function to display the

Re: [PATCH 1/2] difftool: add the builtin

On Tue, Nov 22, 2016 at 06:01:23PM +0100, Johannes Schindelin wrote: > This adds a builtin difftool that represents a conversion of the current > Perl script version of the difftool. > > The motivation is that Perl scripts are not at all native on Windows, > and that `git difftool` therefore is

Re: trustExitCode doesn't apply to vimdiff mergetool

he scriptlets. A subtle benefit of this change is that the responsibility of merge_cmd() has been narrowed to running the command only, rather than also needing to deal with the backup file and checking for changes. Reported-by: Dun Peal <dunpea...@gmail.com> Signed-off-by: David Aguilar &

Re: trustExitCode doesn't apply to vimdiff mergetool

On Sun, Nov 27, 2016 at 05:45:38PM -0800, David Aguilar wrote: > On Sun, Nov 27, 2016 at 11:55:59AM -0500, Jeff King wrote: > > On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote: > > > > > Ignoring a non-zero exit code from the merge tool, and assuming a > > &

Re: [PATCH v4 4/4] mergetool: honor -O

On Mon, Oct 10, 2016 at 11:28:35AM -0700, Junio C Hamano wrote: > David Aguilar <dav...@gmail.com> writes: > > > Teach mergetool to pass "-O" down to `git diff` when > > specified on the command-line. > > > > Helped-by: Johannes Sixt <j..

Re: [PATCH v2 2/2] Feature Request: user defined suffix for temp files created by git-mergetool

On Wed, Oct 12, 2016 at 10:59:46AM -0700, Junio C Hamano wrote: > Josef Ridky writes: > > > This is update of the second variant for request to add option to change > > suffix of name of temporary files generated by git mergetool. This > > change is requested for cases, when

Re: [PATCH 1/2] Feature Request: user defined suffix for temp files created by git-mergetool

On Thu, Oct 06, 2016 at 08:43:02AM -0400, Josef Ridky wrote: > This is the first of two variant for request to add option to change > suffix of name of temporary files generated by git mergetool. This > change is requested for cases, when is git mergetool used for local > comparision between two

[PATCH 2/2] mergetools/vimdiff: trust Vim's exit code

ather than relying on a timestamp heuristic that is unforgiving to users that save in-progress merge files. The original behavior can be restored by configuring mergetool.vimdiff.trustExitCode to false. Reported-by: Dun Peal <dunpea...@gmail.com> Signed-off-by: David Aguilar <dav...@

[PATCH 1/2] mergetool: honor mergetool.$tool.trustExitCode for built-in tools

-by: Dun Peal <dunpea...@gmail.com> Signed-off-by: David Aguilar <dav...@gmail.com> --- git-mergetool--lib.sh| 56 ++-- mergetools/araxis| 2 -- mergetools/bc| 2 -- mergetools/codecompare | 2 -- mergetools/deltaw

[PATCH 1/2] mergetools/kompare: simplify can_merge() by using "false"

Signed-off-by: David Aguilar <dav...@gmail.com> --- This patch builds upon da/mergetool-trust-exit-code mergetools/kompare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/kompare b/mergetools/kompare index e8c0bfa678..321022500b 100644 --- a/mergetools/k

[PATCH 2/2] mergetools/tortoisemerge: simplify can_diff() by using "false"

Signed-off-by: David Aguilar <dav...@gmail.com> --- This patch builds upon da/mergetool-trust-exit-code mergetools/tortoisemerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index d7ab666a59..9067d8a4e5

Re: [PATCH 2/3] difftool: chdir as early as possible

On Fri, Dec 09, 2016 at 03:02:09PM -0800, Junio C Hamano wrote: > David Aguilar <dav...@gmail.com> writes: > > > @@ -182,10 +188,6 @@ EOF > > } > > } > > > > - # Go to the root of the worktree so that the left index files > > -

[PATCH] mergetools: fix xxdiff hotkeys

xxdiff was using a mix of "Ctrl-" and "Ctrl+" hotkeys. The dashed "-" form is not accepted by newer xxdiff versions. Use the plus "+" form only. Signed-off-by: David Aguilar <dav...@gmail.com> --- This patch is based on top of da/mergetool-diff-ord

[PATCH 2/3] difftool: chdir as early as possible

-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index 17c336321f..99b03949bf 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -59,14

[PATCH 1/3] difftool: sanitize $workdir as early as possible

the issue by sanitizing inputs as soon as they arrive. Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index 959822d5f3..17c336321f 100755 --- a/git-difftool.perl +++ b/g

<    1   2   3   4   5   6   >