Re: What's cooking in git.git (Aug 2016, #06; Sun, 14)

2016-08-17 Thread Duy Nguyen
On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote: > * dt/index-helper (2016-07-06) 21 commits > > A new "index-helper" daemon has been introduced to give newly > spawned Git process a quicker access to the data in the index, and > optionally interface with the watchman

Re: [PATCH] document how to reference previous commits

2016-08-17 Thread Heiko Voigt
Hi, On Thu, Jul 28, 2016 at 02:55:14PM +0200, Heiko Voigt wrote: > To reference previous commits people used to put just the abbreviated > SHA-1 into commit messages. This is what has evolved as a more > stable format for referencing commits. So lets document it for everyone > to lookup when

[ANNOUNCE] Git Rev News edition 18

2016-08-17 Thread Christian Couder
Hi everyone, I'm happy announce that the 18th edition of Git Rev News is now published: https://git.github.io/rev_news/2016/08/17/edition-18/ Thanks a lot to all the contributors and helpers, especially Lars, Dscho, Jakub, Roberto and Josh! Enjoy, Christian and Thomas. -- To unsubscribe from

Re: [PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Junio C Hamano
Stefan Beller writes: > +static void prepare_possible_alternates(const char *sm_name, > + struct string_list *reference) > +{ > + char *sm_alternate = NULL, *error_strategy = NULL; > + struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SETUP_INIT;

Re: git-mergetool reverse file ordering

2016-08-17 Thread 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 inputs based on the orderFile isn't currently exposed in a way that mergetool could use it. Instead of using 'git ls-files -u | sed ... | sort -u' you

[PATCH 0/2] Do not lock temporary files via child processes on Windows

2016-08-17 Thread Johannes Schindelin
This issue was originally reported and fixed in https://github.com/git-for-windows/git/pull/755 The problem is that file handles to temporary files (such as index.lock) were inherited by spawned processes. If those spawned processes do not exit before the parent process wants to delete or rename

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

2016-08-17 Thread Eric Sunshine
On Wed, Aug 17, 2016 at 8:41 AM, Johannes Schindelin wrote: > When the index is locked and child processes inherit the handle to > said lock and the parent process wants to remove the lock before the > child process exits, on Windows there is a problem: it won't work >

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

2016-08-17 Thread Lars Schneider
> On 17 Aug 2016, at 14:41, Johannes Schindelin > wrote: > > From: Ben Wijen > > When the index is locked and child processes inherit the handle to > said lock and the parent process wants to remove the lock before the > child process exits, on

Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

2016-08-17 Thread Stephen Morton
Responding to a few comments... On 2016-08-14 7:44 AM, Christian Couder wrote: multiple_commits) ... but here multiple_commits is the last argument. It would be better if it was more consistent. (Johannes made the same comment.) Yes. Will do. multiple_commits = (todo_list->next) != NULL;

[PATCH 1/2] t6026-merge-attr: child processes must not inherit index.lock handles

2016-08-17 Thread Johannes Schindelin
From: Ben Wijen On Windows, files cannot be removed unless all file handles to it have been released. Hence it is particularly important to close handles when spawning children (which would probably not even know that they hold on to those handles). The example chosen for this

Re: [PATCH v2 0/1] convert: Correct NNO tests and missing `LF will be replaced by CRLF`

2016-08-17 Thread Johannes Schindelin
Hi Torsten, On Sat, 13 Aug 2016, tbo...@web.de wrote: > From: Torsten Bögershausen > > Change since v1: > - The changes done in 1/2 in t0027 needed to be reverted in 2/2. > Put both changes for convert.c and t0027 into a single commit > Thanks to Johannes Sixt. > Torsten

Re: What's cooking in git.git (Aug 2016, #06; Sun, 14)

2016-08-17 Thread David Turner
On Wed, 2016-08-17 at 17:49 +0700, Duy Nguyen wrote: > On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote: > > * dt/index-helper (2016-07-06) 21 commits > > > > A new "index-helper" daemon has been introduced to give newly > > spawned Git process a quicker access to the

Re: [ANNOUNCE] Git for Windows 2.9.3

2016-08-17 Thread Johannes Schindelin
Hi Junio, On Sat, 13 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > New Features > > > > • Comes with Git 2.9.3. > > For future reference, what time (in UTC) of the day is convenient > for you to see an upstream tarball? Heh... I don't do

Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

2016-08-17 Thread Remi Galan Alfonso
Stephen Morton writes: > [snip] > On 2016-08-16 4:44 AM, Remi Galan Alfonso wrote: >> Hi Stephen, >> >> Stephen Morton writes: >>> +if (multiple_commits) >>> + advise(_("after resolving the

Re: [PATCH v2] rev-parse: respect core.hooksPath in --git-path

2016-08-17 Thread Junio C Hamano
Remi Galan Alfonso writes: > I tried to see if the `git config` in other tests were in the > same case or not but the sheer amount made me reconsider. However > taking a look at a couple of random ones, there are some scripts > that would benefit from

Re: [ANNOUNCE] Git for Windows 2.9.3

2016-08-17 Thread Junio C Hamano
Johannes Schindelin writes: >> And then your "git cat-file" patch can be upstreamed with the option >> renamed to (or with an additional synonym) "--filters", which would make >> things consistent. > > Right. I would like to ask for a `--smudge` synonym nevertheless,

[PATCH v2 3/3] diff-highlight: add support for --graph output.

2016-08-17 Thread Brian Henderson
Signed-off-by: Brian Henderson --- contrib/diff-highlight/diff-highlight | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight index ffefc31..9364423 100755 ---

[PATCH v2 0/3] diff-highlight: add support for git log --graph output.

2016-08-17 Thread Brian Henderson
Changes made per Eric. On Wed, Aug 10, 2016 at 08:56:35AM +, Eric Wong wrote: > Brian Henderson wrote: > > Hi Brian, > > A few minor portability/style nits below, but contrib/ probably > (still?) has laxer rules than the rest of git... > > I think we still require

Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

2016-08-17 Thread Junio C Hamano
Remi Galan Alfonso writes: > Either way (3 or 4 lines) I find it strange to have both advices > start in the same way except that one is split and not the other. True. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

[PATCH v2 1/3] diff-highlight: add some tests.

2016-08-17 Thread Brian Henderson
Signed-off-by: Brian Henderson --- contrib/diff-highlight/Makefile | 5 ++ contrib/diff-highlight/t/Makefile| 22 contrib/diff-highlight/t/t9400-diff-highlight.sh | 62 +

[PATCH v2 2/3] diff-highlight: add failing test for handling --graph output.

2016-08-17 Thread Brian Henderson
Signed-off-by: Brian Henderson --- contrib/diff-highlight/t/t9400-diff-highlight.sh | 13 +++ contrib/diff-highlight/t/test-diff-highlight.sh | 43 2 files changed, 56 insertions(+) diff --git

Re: [ANNOUNCE] Git v2.10.0-rc0

2016-08-17 Thread Junio C Hamano
Torsten Bögershausen writes: > Is this `text=auto` correct ? Thanks for spotting a typo. Definitely. > I think it should be > >used to have the same effect as >$ echo "* text eol=crlf" >.gitattributes Thanks. > # In other words, the `auto` was ignored, as explained

[PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

2016-08-17 Thread Johannes Schindelin
From: Ben Wijen When the index is locked and child processes inherit the handle to said lock and the parent process wants to remove the lock before the child process exits, on Windows there is a problem: it won't work because files cannot be deleted if a process holds a handle on

Re: [PATCH 1/3] t3404: become resilient to GETTEXT_POISON

2016-08-17 Thread Johannes Schindelin
Hi Vasco, On Fri, 12 Aug 2016, Vasco Almeida wrote: > The concerned test greps the output of exit_with_patch() in > git-rebase--interactive.sh script. > > Signed-off-by: Vasco Almeida Thank you for keeping an eye out for these issues. I have to admit that I am a bit

Re: [PATCH] document how to reference previous commits

2016-08-17 Thread Junio C Hamano
Heiko Voigt writes: > On Thu, Jul 28, 2016 at 02:55:14PM +0200, Heiko Voigt wrote: >> To reference previous commits people used to put just the abbreviated >> SHA-1 into commit messages. This is what has evolved as a more >> stable format for referencing commits. So lets

Re: What's cooking in git.git (Aug 2016, #06; Sun, 14)

2016-08-17 Thread Junio C Hamano
Duy Nguyen writes: > On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote: >> * dt/index-helper (2016-07-06) 21 commits >> >> A new "index-helper" daemon has been introduced to give newly >> spawned Git process a quicker access to the data in the index,

Re: [ANNOUNCE] Git v2.10.0-rc0

2016-08-17 Thread Junio C Hamano
Junio C Hamano writes: > Torsten Bögershausen writes: > >> Is this `text=auto` correct ? > > Thanks for spotting a typo. Definitely. > >> I think it should be >> >>used to have the same effect as >>$ echo "* text eol=crlf" >.gitattributes > > Thanks. >

Re: [PATCH 1/2] t6026-merge-attr: child processes must not inherit index.lock handles

2016-08-17 Thread Junio C Hamano
Johannes Schindelin writes: > From: Ben Wijen > > On Windows, files cannot be removed unless all file handles to it have s/files/a file/, as the file handles later in the sentence are open on that single file. Alternatively s/file handles to it/file

Re: [PATCH 2/2] mingw: ensure temporary file handles are not inherited by child processes

2016-08-17 Thread Junio C Hamano
Johannes Schindelin writes: > From: Ben Wijen > > When the index is locked and child processes inherit the handle to > said lock and the parent process wants to remove the lock before the > child process exits, on Windows there is a problem: it won't

Re: diff --diff-filter on modified but locally deleted files

2016-08-17 Thread Junio C Hamano
Robert Dailey writes: > My use case is that I do a merge from branch A to branch B. Branch A > modified a file which is already deleted on B some time before the > merge. > > When I do a `git status -sb`, these locally deleted but remotely > modified files show up as

diff --diff-filter on modified but locally deleted files

2016-08-17 Thread Robert Dailey
My use case is that I do a merge from branch A to branch B. Branch A modified a file which is already deleted on B some time before the merge. When I do a `git status -sb`, these locally deleted but remotely modified files show up as "DU". I want to invoke git status or diff (or something else)

Re: [ANNOUNCE] Git v2.10.0-rc0

2016-08-17 Thread Torsten Bögershausen
On 17.08.16 19:38, Junio C Hamano wrote: > Junio C Hamano writes: > >> Torsten Bögershausen writes: >> >>> Is this `text=auto` correct ? >> >> Thanks for spotting a typo. Definitely. >> >>> I think it should be >>> >>>used to have the same effect as >>>

Re: [PATCH] git-multimail: update to release 1.4.0

2016-08-17 Thread Junio C Hamano
Thanks. Will directly take it to 'master'. -- 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: diff --diff-filter on modified but locally deleted files

2016-08-17 Thread Robert Dailey
On Wed, Aug 17, 2016 at 1:34 PM, Junio C Hamano wrote: > Robert Dailey writes: > >> My use case is that I do a merge from branch A to branch B. Branch A >> modified a file which is already deleted on B some time before the >> merge. >> >> When I do a

Re: [PATCH] push: change submodule default to check

2016-08-17 Thread Junio C Hamano
Stefan Beller writes: > If working with submodules, there are more reports of missing submodules > rather than the desire to push the superproject without the submodules > to be pushed out. I do not know how you are counting the "more reports" part of that assertion, but it

Re: [PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Stefan Beller
On Wed, Aug 17, 2016 at 1:02 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> +static void prepare_possible_alternates(const char *sm_name, >> + struct string_list *reference) >> +{ >> + char *sm_alternate = NULL, *error_strategy =

Re: git-mergetool reverse file ordering

2016-08-17 Thread David Aguilar
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 order specified by "git

[PATCH] push: change submodule default to check

2016-08-17 Thread Stefan Beller
When working with submodules, it is easy to forget to push the submodules. Change the default to 'check' if any existing submodule is present on at least one remote of the submodule remotes. This doesn't affect you if you do not work with submodules. If working with submodules, there are more

Re: [PATCH] push: change submodule default to check

2016-08-17 Thread Stefan Beller
On Wed, Aug 17, 2016 at 2:05 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> If working with submodules, there are more reports of missing submodules >> rather than the desire to push the superproject without the submodules >> to be pushed out. > > I

[PATCHv6 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Stefan Beller
When `--recursive` and `--reference` is given, it is reasonable to expect that the submodules are created with references to the submodules of the given alternate for the superproject. An initial attempt to do this was presented to the mailing list, which used flags that are passed around

Re: [PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > >> +static void prepare_possible_alternates(const char *sm_name, >> +struct string_list *reference) >> +{ >> +char *sm_alternate = NULL, *error_strategy = NULL; >> +struct

[PATCHv7 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Stefan Beller
When `--recursive` and `--reference` is given, it is reasonable to expect that the submodules are created with references to the submodules of the given alternate for the superproject. An initial attempt to do this was presented to the mailing list, which used flags that are passed around

Working from different machines.

2016-08-17 Thread Tobiah
Right now I have a server at work where I keep a bare repository as a source and backup for projects. So I clone a project from there to my desktop, and work, making a few branches as I try out ideas for new features. Then I go home, and I want to work as though I was sitting at my desktop. If

Re: [PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Stefan Beller
On Wed, Aug 17, 2016 at 2:31 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Stefan Beller writes: >> >>> +static void prepare_possible_alternates(const char *sm_name, >>> +struct string_list *reference) >>> +{ >>> +

Re: [PATCHv7 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Junio C Hamano
Stefan Beller writes: > Added a default for alternateErrorStrategy and hence fixed the null pointer > for error_strategy in prepare_possible_alternates(), Looks much better. > +submodule.alternateLocation:: > + Specifies how the submodules obtain alternates when

Re: [PATCHv7 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Stefan Beller
On Wed, Aug 17, 2016 at 3:12 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Added a default for alternateErrorStrategy and hence fixed the null pointer >> for error_strategy in prepare_possible_alternates(), > > Looks much better. > >>

Re: [PATCH v2 1/3] diff-highlight: add some tests.

2016-08-17 Thread Junio C Hamano
Brian Henderson writes: > Signed-off-by: Brian Henderson > --- > contrib/diff-highlight/Makefile | 5 ++ > contrib/diff-highlight/t/Makefile| 22 > contrib/diff-highlight/t/t9400-diff-highlight.sh | 62

Re: [PATCH v2 2/3] diff-highlight: add failing test for handling --graph output.

2016-08-17 Thread Junio C Hamano
Brian Henderson writes: > Signed-off-by: Brian Henderson > --- > contrib/diff-highlight/t/t9400-diff-highlight.sh | 13 +++ > contrib/diff-highlight/t/test-diff-highlight.sh | 43 > > 2 files changed, 56

[PATCH] imap-send: Tell cURL to use imap:// or imaps://

2016-08-17 Thread Anders Kaseorg
Right now the imap:// or imaps:// part of imap.host is not being passed on to cURL. Perhaps it was able to guess correctly under some circumstances, but I was not able to find one; it was just trying to make HTTP requests for me. It’s better to be explicit in any case. Signed-off-by: Anders

Re: Working from different machines.

2016-08-17 Thread Junio C Hamano
Tobiah writes: > In other words, I want to work from different machines, and always > sit down to the environment exactly as I last left it. You have several options, but it depends on untold expectations you have beyond "exactly as I last left it." So the following is only to

[PATCHv8 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Stefan Beller
When `--recursive` and `--reference` is given, it is reasonable to expect that the submodules are created with references to the submodules of the given alternate for the superproject. An initial attempt to do this was presented to the mailing list, which used flags that are passed around

[PATCH] git-multimail: update to release 1.4.0

2016-08-17 Thread Matthieu Moy
Changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Irfan Adilovic Signed-off-by: Matthieu Moy --- contrib/hooks/multimail/CHANGES | 59 ++

Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

2016-08-17 Thread Johannes Schindelin
Hi, On Tue, 16 Aug 2016, Remi Galan Alfonso wrote: > Stephen Morton writes: > > +if (multiple_commits) > > + advise(_("after resolving the conflicts, > > mark the corrected paths with 'git add ' or 'git rm '\n" > >

Re: Working with zip files

2016-08-17 Thread David Lang
On Tue, 16 Aug 2016, Nikolaus Rath wrote: On Aug 16 2016, David Lang wrote: On Tue, 16 Aug 2016, Nikolaus Rath wrote: I would like to store Simulink models in a Git repository. Unfortunately, the file format is binary. But luckily, the binary format happens to be a zipfile

Re: git-mergetool reverse file ordering

2016-08-17 Thread Johannes Sixt
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 inputs based on the orderFile isn't currently exposed in a way that mergetool could use it. Instead of using

Re: git-mergetool reverse file ordering

2016-08-17 Thread David Aguilar
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 inputs based on the orderFile >

Re: git-mergetool reverse file ordering

2016-08-17 Thread Johannes Sixt
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 order specified by "git rerere remaining". This is why I initially thought we needed a generic sort-like command. I see.

Re: [PATCH v2] rev-parse: respect core.hooksPath in --git-path

2016-08-17 Thread Remi Galan Alfonso
Junio C Hamano writes: > Remi Galan Alfonso > writes: > >> Johannes Schindelin writes: >>> Hi Rémi, >>> >>> On Tue, 16 Aug 2016, Remi Galan Alfonso wrote: >>> >>> > Johannes Schindelin

Re: [ANNOUNCE] Git v2.10.0-rc0

2016-08-17 Thread Torsten Bögershausen
On Mon, Aug 15, 2016 at 08:42:48AM -0700, Junio C Hamano wrote: > Torsten Bögershausen writes: > > > On 15.08.16 00:47, Junio C Hamano wrote: > >> Torsten Bögershausen (1): > >> convert: unify the "auto" handling of CRLF > > > > Should we mention this change in the release

Re: [PATCHv8 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-17 Thread Junio C Hamano
Stefan Beller writes: > and now with error handling of invalid options. Thanks. -- 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

[PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output

2016-08-17 Thread Jacob Keller
From: Jacob Keller Add an extension to git-diff and git-log (and any other graph-aware displayable output) such that "--line-prefix=" will print the additional line-prefix on every line of output. To make this work, we have to fix a few bugs in the graph API that force

[PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly

2016-08-17 Thread Jacob Keller
From: Jacob Keller Currently, do_submodule_path relies on read_gitfile, which will die() if it can't read from the specified gitfile. Unfortunately, this means that do_submodule_path will not work when given the path to a submodule which is checked out directly, such as a

[PATCH v7 5/7] submodule: correct output of submodule log format

2016-08-17 Thread Jacob Keller
From: Jacob Keller The submodule log diff output incorrectly states that the submodule is "not checked out" in cases where it wants to say the submodule is "not initialized". Change the wording to reflect the actual check being performed. Signed-off-by: Jacob Keller

[PATCH v7 1/7] diff.c: remove output_prefix_length field

2016-08-17 Thread Jacob Keller
From: Junio C Hamano "diff/log --stat" has a logic that determines the display columns available for the diffstat part of the output and apportions it for pathnames and diffstat graph automatically. 5e71a84a (Add output_prefix_length to diff_options, 2012-04-16) added the

[PATCH v7 7/7] diff: teach diff to display submodule difference with an inline diff

2016-08-17 Thread Jacob Keller
From: Jacob Keller Teach git-diff and friends a new format for displaying the difference of a submodule. The new format is an inline diff of the contents of the submodule between the commit range of the update. This allows the user to see the actual code change caused by

[PATCH v7 3/7] diff: prepare for additional submodule formats

2016-08-17 Thread Jacob Keller
From: Jacob Keller A future patch will add a new format for displaying the difference of a submodule. Make it easier by changing how we store the current selected format. Replace the DIFF_OPT flag with an enumeration, as each format will be mutually exclusive.

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

2016-08-17 Thread Jacob Keller
From: Jacob Keller A future patch is going to add a new submodule diff format which displays an inline diff of the submodule changes. To make this easier, and to ensure that both submodule diff formats use the same initial header, factor out show_submodule_header()

[PATCH v7 0/7] implement inline submodule diff format

2016-08-17 Thread Jacob Keller
From: Jacob Keller As suggested by Junio, I broke this patch into several pieces, and made a common helper function for the submodule header. Note that there are a couple of complicated modifications to the submodule header portion which (should) still result in the same