Re: Git trademark status and policy

On Tue, Sep 18, 2018 at 02:22:22PM -0400, Jeff King wrote: > On Mon, Sep 17, 2018 at 11:25:31AM +0200, Christian Couder wrote: > > > > (Also, to be clear, this is all _only_ about "Git Cola". The "git-cola" > > > command is explicitly OK in the policy because that's how commands > > > work). > >

Re: [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments

g the default merge tool, which should only ever happen in one of the two modes. The bit about difftool falling back to mergetool's config is a convenience so it does make sense to keep that for guitool as well. The code after this part should handle merge_tool being empty just fine, so once the `[ ... ]` vs `test` bit is updated, please feel free to add: Acked-by: David Aguilar cheers, -- David

Re: Git trademark status and policy

Hi Peff, On Thu, Feb 02, 2017 at 03:26:56AM +0100, Jeff King wrote: > > - Commands like "git-foo" (so you run "git foo") are generally OK. > This is Git's well-known extension mechanism, so it doesn't really > imply endorsement (on the other hand, you do not get to complain if >

Re: Git for games working group

On Fri, Sep 14, 2018 at 02:13:28PM -0700, John Austin wrote: > Hey Taylor, > > Great to have your support! I think LFS has done a great job so far > solving the large file issue. I've been working myself on strategies > for handling binary conflicts, and particularly how to do it in a >

Re: Feature request: be able to pass arguments to difftool command

On Wed, Aug 29, 2018 at 09:18:38AM +0200, H.Merijn Brand wrote: > On Tue, 28 Aug 2018 12:37:40 -0700, Junio C Hamano > wrote: > > > "H.Merijn Brand" writes: > > > > > So, my wish would be to have an option, possibly using -- to pass > > > additional command line arguments to git difftool, so

Re: [PATCH] mergetools: add support for guiffy

t; > + else > + "$merge_tool_path" -m "$LOCAL" \ > + "$REMOTE" "$MERGED" > + fi > +} > + > +exit_code_trustable () { > + true > +} > -- > 2.15.1.windows.2 I tested this on Linux and it works great. Thanks Bill. Acked-by: David Aguilar <dav...@gmail.com> cheers, -- David

[PATCH v3] mergetools/meld: improve compatibiilty with Meld on macOS X

usseb/meld [2] https://github.com/yousseb/meld/blob/master/osx/Meld [3] https://github.com/yousseb/meld/issues/42 Reported-by: Matthew Groth <mgrot...@gmail.com> Helped-by: Samuel Lijin <sxli...@gmail.com> Signed-off-by: David Aguilar <dav...@gmail.com> --- I cloned the meld rep

[PATCH v2] mergetools/meld: improve backwards-compatibiilty when using "--output"

Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optparse, which accepts either "--output " or "--output=". Use "--output=" for better comp

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sun, Jun 18, 2017 at 05:11:48AM -0400, Samuel Lijin wrote: > On Sun, Jun 18, 2017 at 3:46 AM, David Aguilar <dav...@gmail.com> wrote: > > On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > >> On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <dav...@gm

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

On Sat, Jun 17, 2017 at 10:11:36AM -0400, Samuel Lijin wrote: > On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar <dav...@gmail.com> wrote: > > Meld 3.16.0 requires a "=" in the --output argument, as it uses > > a simple hand-rolled command-line parser. > &g

[PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optpaarse, which accepts either "--output " or "--output=". Use "--output=" for better comp

Re: [PATCH] contrib/subtree: add "--no-commit" flag for merge and pull

On Sun, Mar 26, 2017 at 03:02:38AM -0400, Mike Lewis wrote: > Allows the user to verify and/or change the contents of the merge > before committing as necessary > > Signed-off-by: Mike Lewis > --- > contrib/subtree/git-subtree.sh | 17 + > 1 file changed, 13

Re: should git-subtree ignore submodules?

On Tue, Nov 01, 2016 at 12:41:50PM -0700, Kirill Katsnelson wrote: > "git-subtree add" fails to add the subtree into a repository with > submodules, reporting that the worktree is not clean, while `git status` > says that everything is clean (including submodules). I tracked the problem > down to

Re: [PATCH v2 3/3] difftool: handle modified symlinks in dir-diff mode

On Wed, Mar 15, 2017 at 11:54:14AM -0700, Junio C Hamano wrote: > David Aguilar <dav...@gmail.com> writes: > > > @@ -397,7 +438,7 @@ static int run_dir_diff(const char *extcmd, int > > symlinks, const char *prefix, > > return error(&q

[PATCH v2 3/3] difftool: handle modified symlinks in dir-diff mode

<johannes.schinde...@gmx.de> Signed-off-by: David Aguilar <dav...@gmail.com> --- Only 3/3 was re-sent; the rest are the same. When re-reading the patch I noticed two spots where spurious whitespace was added. I've dropped those hunks. builtin/diff

[PATCH 2/3] t7800: cleanup cruft left behind by tests

Signed-off-by: David Aguilar <dav...@gmail.com> --- More cleanup, this is needed because the final patch adds a test to t7800 that was sensitive to the cruft left behind. t/t7800-difftool.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t

[PATCH 3/3] difftool: handle modified symlinks in dir-diff mode

<johannes.schinde...@gmx.de> Signed-off-by: David Aguilar <dav...@gmail.com> --- This was reworked a bit since the original patch. The subject line changed, a lot of comments were added, and the tests were made more extensive. This implementation is simpler since we now use a get_symlin

[PATCH 1/3] t7800: remove whitespace before redirect

Signed-off-by: David Aguilar <dav...@gmail.com> --- Cleanup before the fix. t/t7800-difftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 25241f4096..e1ec292718 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difft

Re: [PATCH] difftool: handle changing symlinks in dir-diff mode

On Mon, Mar 13, 2017 at 02:33:09PM -0700, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > +if (strbuf_readlink(, ce->name, ce_namelen(ce)) == 0) { > >> > +strbuf_add(, state->base_dir, state->base_dir_len); > >> > +

[PATCH] difftool: handle changing symlinks in dir-diff mode

. Original-patch-by: Johannes Schindelin <johannes.schinde...@gmx.de> Signed-off-by: David Aguilar <dav...@gmail.com> --- builtin/difftool.c | 36 +--- t/t7800-difftool.sh | 40 2 files changed, 73 insertions(+),

Re: [PATCH 3/3] Remove outdated info in difftool manpage

On Fri, Mar 03, 2017 at 01:28:36PM -0800, Denton Liu wrote: > On Fri, Mar 03, 2017 at 04:46:36PM +0100, Johannes Schindelin wrote: > > Hi Denton (or should I address you as Liu?), > Denton is fine, thanks. > > > > On Fri, 3 Mar 2017, Denton Liu wrote: > > > > > When difftool was rewritten in C,

Re: [PATCH 1/3] Add --gui option to mergetool

On Fri, Mar 03, 2017 at 03:57:38AM -0800, Denton Liu wrote: > This fixes the discrepancy between difftool and mergetool where the > former has the --gui flag and the latter does not by adding the > functionality to mergetool. > > Signed-off-by: Denton Liu > --- >

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 >

[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

[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: [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

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

[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

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

gitk pull request // was: Re: gitk: "lime" color incompatible with older Tk versions

On Fri, Jan 13, 2017 at 03:20:43AM -0800, David Aguilar wrote: > > Ping.. it would be nice to get this patch applied. Sorry for the noise, and thank you Paul for the fix. This was already fixed by Paul in gitk@22a713c72df. I'm sure Junio will merge gitk.git into git.git soon enough so I c

Re: gitk: "lime" color incompatible with older Tk versions

On Mon, May 02, 2016 at 09:20:43AM -0700, Stefan Beller wrote: > + Paul Mackerras, who maintains gitk > > On Sun, May 1, 2016 at 10:03 AM, Andrew Janke wrote: > > Hi, git folks, > > > > I'm having trouble running gitk on Mac OS X 10.9.5. The gitk program uses > > the color

Re: [PATCH 0/4] fix mergetool+rerere+subdir regression

nabled > > git-mergetool.sh | 1 + > t/t7610-mergetool.sh | 132 > ++- > 2 files changed, 90 insertions(+), 43 deletions(-) Thanks for finding these, this reminds me very much of the recent fixes that had to be done

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

On Sat, Dec 10, 2016 at 09:15:34AM +0100, Johannes Sixt wrote: > Am 10.12.2016 um 04:21 schrieb David Aguilar: > > Signed-off-by: David Aguilar <dav...@gmail.com> > > --- > > This patch builds upon da/mergetool-trust-exit-code > > > > mergetools/tort

[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

[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

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 3/3] difftool: rename variables for consistency

Always call the list of files @files. Always call the worktree $worktree. Signed-off-by: David Aguilar <dav...@gmail.com> --- git-difftool.perl | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl

[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

[PATCH v2] difftool: fix dir-diff index creation when in a subdirectory

ed-off-by: David Aguilar <dav...@gmail.com> --- Changes since v1: - Improved commit message thanks to Johannes Schindelin ("git whatis" was used to describe the referenced commit) - Add more tests for edge cases that are properly handled but were not being tested. git-diffto

[PATCH] difftool: fix dir-diff index creation when in a subdirectory

. Teach difftool to chdir to the toplevel of the repository before preparing its temporary indexes. This ensures that all of the toplevel-relative paths are valid. Adjust the test cases to more thoroughly exercise this scenario. Reported-by: Frank Becker <f...@mooflu.com> Signed-off-by: David A

Re: Error after calling git difftool -d with

On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote: > Hi Peter, > > On Fri, 2 Dec 2016, P. Duijst wrote: > > > Incase filenames are used with a quote ' or a bracket [ (and maybe some > > more > > characters), git "diff" and "difftool -y" works fine, but git *difftool > >

Re: difftool -d not populating left correctly when not in git root

e left side we construct an index, but we were constructing it relative to the subdirectory, and thus it ends up empty because we are in a subdirectory and the paths are incorrect. Teach difftool to chdir to the toplevel of the repository before preparing its temporary indexes. This ensures that all

Re: [BUG] git gui can't commit multiple files

On Sun, Dec 04, 2016 at 05:36:46PM +0100, Timon wrote: > This is a regression in git 2.11.0 (version 2.10.2 is fine). > > In git-gui I select multiple files in the Unstaged Changes (using > shift+click) and press ctrl+t to stage them. Then only one files gets > staged instead of all of the

Re: CVSImport - spaces in CVS path

On Wed, Nov 30, 2016 at 01:56:35PM -0700, Yojoa wrote: > I'm in the process of moving an entire collection of cvs modules into git. > I'm working in Mac Yosemite. Everything is working fine except for one > thing. A couple of the CVS modules have spaces in the paths. Below is what > my command

[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 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...@

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: 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: [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: [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

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 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..

[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

[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 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 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 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 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

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

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: 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

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: 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: [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.

[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

[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 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

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

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

[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: [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: 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: 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

[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

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

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] 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 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: [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] 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 >

  1   2   3   4   5   6   >