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 > > --- > > This patch builds upon da/mergetool-trust-exit-code > > > > mergetools/tortoisemerge | 2 +- > > 1 file changed, 1

Re: [PATCH v2 12/16] pathspec: create parse_long_magic function

Stefan Beller writes: >> I do not see how it would work without further splitting the >> attr_stack. I think you made it per check[], but you would further >> split it per before losing the mutex, no? > > Well I have not yet looked into it again, so my

Re: [PATCH 1/3] update_unicode.sh: update the uniset repo if it exists

On 2016-12-12 00:34, Beat Bolli wrote: > We need to track the new commits in uniset, otherwise their and our code > get out of sync. > > Signed-off-by: Beat Bolli > --- > > Junio, these go on top of my bb/unicode-9.0 branch, please. > > Thanks! > > update_unicode.sh | 5

Re: [PATCH v2 12/16] pathspec: create parse_long_magic function

On Sat, Dec 10, 2016 at 10:18 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Jonathan Nieder mentioned off list that he prefers to see that >> series rerolled without mutexes if possible. That is possible by >> creating the questions "struct

Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules

On Sat, Dec 10, 2016 at 5:41 AM, vi0oss wrote: > On 12/08/2016 04:38 AM, vi0...@gmail.com wrote: >> >> Third review: missing && in test fixed. >> > > Shall something more be done about this or just wait until the patch gets > reviewed and integrated? I have no further

[PATCH] submodule--helper: set alternateLocation for cloned submodules

From: "Vitaly \"_Vi\" Shukela" In 31224cbdc7 (clone: recursive and reference option triggers submodule alternates, 2016-08-17) a mechanism was added to have submodules referenced. It did not address _nested_ submodules, however. This patch makes all not just the root

Re: [PATCH v4] gitk: Add Portuguese translation

On Wed, May 11, 2016 at 08:01:33PM +, Vasco Almeida wrote: > Signed-off-by: Vasco Almeida > --- > > Oops, fix typo. Thanks, applied. Paul.

Re: [PATCH] Gitk Inotify support

On Sat, Jun 11, 2016 at 04:06:36PM +0200, Florian Schüller wrote: > >From 74d2f4c1ec560b358fb50b8b7fe8282e7e1457b0 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Florian=20Sch=C3=BCller?= > Date: Thu, 9 Jun 2016 22:54:43 +0200 > Subject: [PATCH] first support for inotify

Re: [PATCH v2 0/2] gitk: Two improvements to the branch context menu

On Sat, Mar 19, 2016 at 07:31:32PM +0100, Rogier Goossens wrote: > Hi, > > Hereby the revised patches. > > Changes since v1: > - Rebased on latest master > - Made the changes you suggested > - Moved 'rename branch' menu option above 'delete branch' > - Cleaned up some code duplication that the

Re: [PATCH v3] gitk: Fix missing commits when using -S or -G

On Sat, Jun 04, 2016 at 10:47:16AM +0200, Stefan Dotterweich wrote: > When -S or -G is used as a filter option, the resulting commit list > rarely contains all matching commits. Only a certain number of commits > are displayed and the rest are missing. > > "git log --boundary -S" does not return

Re: [PATCH] gitk: Makefile: create install bin directory

On Thu, May 05, 2016 at 05:46:32PM +, Vasco Almeida wrote: > Force creation of destination bin directory. Before this commit, gitk > would fail to install if this directory didn't already exist. > > Signed-off-by: Vasco Almeida Thanks, applied (with slight tweak to

Re: [PATCH v3 1/2] gitk: alter the ordering for the "Tags and heads" view

On Sun, Mar 27, 2016 at 11:06:07AM -0400, Michael Rappazzo wrote: > In the "Tags and heads" view, the list of refs is globally sorted. > Because of this, the list of local refs (heads) can be interrupted by the > list of remote refs. This change re-orders the view to be: local refs, > remote refs

[PATCH 1/3] update_unicode.sh: update the uniset repo if it exists

We need to track the new commits in uniset, otherwise their and our code get out of sync. Signed-off-by: Beat Bolli --- Junio, these go on top of my bb/unicode-9.0 branch, please. Thanks! update_unicode.sh | 5 + 1 file changed, 5 insertions(+) diff --git

[PATCH 3/3] update_unicode.sh: restore hexadecimal output

The uniset upstream has decided that decimal numbers are The True Way, so let's convert them back to the usual format that's closer to the U+ standard. The generated unicode_widths.h file again looks exactly the same as two commits ago. Signed-off-by: Beat Bolli ---

[PATCH 2/3] update_unicode.sh: remove the plane filters

The uniset upstream has accepted my patches that eliminate the Unicode plane offsets from the output in '--32' mode. Remove the corresponding filter in update_unicode.sh. Signed-off-by: Beat Bolli --- update_unicode.sh | 5 ++--- 1 file changed, 2 insertions(+), 3

Draft of Git Rev News edition 22

Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-22.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: [PATCH 0/1] Fix a long-standing isatty() problem on Windows

Johannes Schindelin writes: > I finally got a chance to debug the problems with the ever-timing-out > test runs of `pu` on Windows. Turns out that pb/bisect uncovered a > really old, really bad bug: on Windows, isatty() does not do what Git > expects, at least not

Re: [BUG] Colon in remote urls

From: "Klaus Ethgen" To: Am Sa den 10. Dez 2016 um 19:18 schrieb Johannes Schindelin: On Sat, 10 Dec 2016, Klaus Ethgen wrote: > Am Fr den 9. Dez 2016 um 22:32 schrieb Johannes Sixt: > > There are too many systems out there that use a backslash in path

Re: [PATCH 4/4] doc: omit needless "for"

From: "Philip Oakley" diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 72ca9c1ef..22309cfb4 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -25,7 +25,7 @@ you want to understand Git's

Re: [BUG] git crash for git remote update tip tip

On Sun, Dec 11, 2016 at 07:51:16AM -0500, Jeff King wrote: > On Sun, Dec 11, 2016 at 01:17:44PM +0100, Jiri Olsa wrote: > > > I accidentaly added 2 remotes and git remote update > > crashed, see the attached output. > > > > [jolsa@krava perf]$ git --version > > git version 2.7.4 > > This is

Re: [PATCH 4/4] doc: omit needless "for"

From: "Kristoffer Haugsbakk" Sent: Friday, December 09, 2016 3:51 PM What was intended was perhaps "... plumbing does for you" ("you" added), but simply omitting the word "for" is more terse and gets the intended point across just as well, if not more so. After

Re: git add -p with new file

On Sat, Dec 10, 2016 at 02:04:33PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > On Fri, Dec 09, 2016 at 01:43:24PM -0500, Ariel wrote: > > ... > >> But it doesn't have to be that way. You could make add -p identical to add > >> without options, except the -p prompts to

Re: [BUG] git crash for git remote update tip tip

On Sun, Dec 11, 2016 at 01:17:44PM +0100, Jiri Olsa wrote: > I accidentaly added 2 remotes and git remote update > crashed, see the attached output. > > [jolsa@krava perf]$ git --version > git version 2.7.4 This is fixed already by b7410f616 (builtin/fetch.c: don't free remote->name after

[BUG] git crash for git remote update tip tip

hi, I accidentaly added 2 remotes and git remote update crashed, see the attached output. [jolsa@krava perf]$ git --version git version 2.7.4 thanks, jirka [jolsa@krava perf]$ git remote update tip tip Fetching tip Fetching tip *** Error in `git': double free or corruption (fasttop):

[PATCH 1/1] mingw: intercept isatty() to handle /dev/null as Git expects it

When Git's source code calls isatty(), it really asks whether the respective file descriptor is connected to an interactive terminal. Windows' _isatty() function, however, determines whether the file descriptor is associated with a character device. And NUL, Windows' equivalent of /dev/null, is a

[PATCH 0/1] Fix a long-standing isatty() problem on Windows

I finally got a chance to debug the problems with the ever-timing-out test runs of `pu` on Windows. Turns out that pb/bisect uncovered a really old, really bad bug: on Windows, isatty() does not do what Git expects, at least not completely: it detects interactive terminals *and character devices*.

Re: [BUG] Colon in remote urls

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hi, Am Sa den 10. Dez 2016 um 19:18 schrieb Johannes Schindelin: > On Sat, 10 Dec 2016, Klaus Ethgen wrote: > > Am Fr den 9. Dez 2016 um 22:32 schrieb Johannes Sixt: > > > There are too many systems out there that use a backslash in path names. I