Re: Add an option to automatically submodule update on checkout

2017-05-08 Thread Junio C Hamano
"Randall S. Becker" writes: > I have to admit that I just assumed it would have to work that way > this would not be particularly useful. However, in thinking about > it, we might want to limit the depth of how far -b takes > effect. If the super module brings in

Re: Add an option to automatically submodule update on checkout

2017-05-08 Thread Stefan Beller
On Mon, May 8, 2017 at 10:08 AM, Brandon Williams wrote: >> >> >[submodule "gnulib"] >> >path=./gnulib >> >external = true # implies no branch for checkout -b --recurse-submodules >> >> >I think there are a couple more situations where such "external" submodules >>

Re: Add an option to automatically submodule update on checkout

2017-05-08 Thread Brandon Williams
2017 at 7:42 AM, Randall S. Becker <rsbec...@nexbridge.com> > >>>wrote: > >>>> On May 6, 2017 4:38 AM Ciro Santilli wrote: > >>>>> This is a must if you are working with submodules, otherwise every > >>>>> git checkout requires a git s

RE: Add an option to automatically submodule update on checkout

2017-05-08 Thread Randall S. Becker
>>wrote: >>>> On May 6, 2017 4:38 AM Ciro Santilli wrote: >>>>> This is a must if you are working with submodules, otherwise every >>>>> git checkout requires a git submodule update, and you forget it, >>>>> and things break, and you

Re: Add an option to automatically submodule update on checkout

2017-05-08 Thread Stefan Beller
li wrote: >>>> This is a must if you are working with submodules, otherwise every >>>> git checkout requires a git submodule update, and you forget it, and >>>> things break, and you understand, and you go to stack overflow >>>> questions >>>>

Re: Add an option to automatically submodule update on checkout

2017-05-08 Thread Brandon Williams
On 05/08, Stefan Beller wrote: > On Mon, May 8, 2017 at 7:42 AM, Randall S. Becker > <rsbec...@nexbridge.com> wrote: > > On May 6, 2017 4:38 AM Ciro Santilli wrote: > >> This is a must if you are working with submodules, otherwise every > >> git checkout requ

RE: Add an option to automatically submodule update on checkout

2017-05-08 Thread Randall S. Becker
On May 8, 2017 12:25 PM, Stefan Beller wrote: >On Mon, May 8, 2017 at 7:42 AM, Randall S. Becker <rsbec...@nexbridge.com> >wrote: >> On May 6, 2017 4:38 AM Ciro Santilli wrote: >>> This is a must if you are working with submodules, otherwise every >>> git chec

Re: Add an option to automatically submodule update on checkout

2017-05-08 Thread Stefan Beller
On Mon, May 8, 2017 at 7:42 AM, Randall S. Becker <rsbec...@nexbridge.com> wrote: > On May 6, 2017 4:38 AM Ciro Santilli wrote: >> This is a must if you are working with submodules, otherwise every git >> checkout requires a git submodule update, >> and you forget it

Re: [PATCH 0/7] Update the compat/regex engine from upstream

2017-05-08 Thread Junio C Hamano
e want to do with them >> once they are applied? Squash them all up, because these do not >> have their own explanations in their log message and it is not worth >> keeping them separate? > > Please squash them all up into this commit ("compat/regex: update the >

Re: [PATCH 0/7] Update the compat/regex engine from upstream

2017-05-08 Thread Ævar Arnfjörð Bjarmason
we can keep in sync with the upstream more easily"? Or is > there anything more to it, e.g. "and we need to update from the > upstream now to fix this and that issues"? It's just to bring us in line with upstream which as noted in that commit has fixed the issues we lo

Re: [PATCH 0/7] Update the compat/regex engine from upstream

2017-05-07 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > See the first patch for motivation & why. I do not think it quite explains the motivation, though. "Doing this way, we can keep in sync with the upstream more easily"? Or is there anything more to it, e.g. &quo

Add an option to automatically submodule update on checkout

2017-05-06 Thread Ciro Santilli
This is a must if you are working with submodules, otherwise every git checkout requires a git submodule update, and you forget it, and things break, and you understand, and you go to stack overflow questions http://stackoverflow.com/questions/22328053/why-doesnt-git-checkout-automatically-do-git

[PATCH v7 10/10] convert: Update subprocess_read_status to not die on EOF

2017-05-05 Thread Ben Peart
Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- con

[PATCH v7 07/10] convert: Update generic functions to only use generic data structures

2017-05-05 Thread Ben Peart
Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- convert.

[PATCH v2 8/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-05 Thread Ævar Arnfjörð Bjarmason
--- On Fri, May 5, 2017 at 7:54 AM, Johannes Sixt wrote: > GNU C Library 2016? Is this GPL v3 code? that would be incompatible with GPL > v2, I think. No, it's all under LGPL 2.1, the glibc license has not changed since 2010. As noted in patch 02 one amendmend to one of the LGPL

Re: [PATCH 3/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Johannes Sixt
Am 05.05.2017 um 00:00 schrieb Ævar Arnfjörð Bjarmason: --- compat/regex/regcomp.c | 356 + 1 file changed, 209 insertions(+), 147 deletions(-) diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index d8bde06f1a..a1fb2e400e 100644 ---

[PATCH 6/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
t_t *mctx, re_sift_context_t *sctx, dfa->nexts[node_idx])) /* The node can't accept the `multi byte', or the destination was already thrown away, then the node - couldn't accept the current input `multi byte'. */ + could't accept the current

[PATCH 7/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
--- compat/regex/intprops.h | 448 compat/regex/verify.h | 286 +++ 2 files changed, 734 insertions(+) create mode 100644 compat/regex/intprops.h create mode 100644 compat/regex/verify.h diff --git

[PATCH 3/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
dfa_t *dfa, re_token_t *token, int32_t elem, idx; elem = seek_collating_symbol_entry (br_elem->opr.name, sym_name_len); - if (symb_table[2 * elem] != 0) + if (elem != -1) {

[PATCH 5/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
--- compat/regex/regex_internal.c | 118 +- compat/regex/regex_internal.h | 118 ++ 2 files changed, 144 insertions(+), 92 deletions(-) diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c index

[PATCH 4/7] fixup! compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
--- compat/regex/regex.c | 32 ++-- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/compat/regex/regex.c b/compat/regex/regex.c index 5cb23e5d59..d6e525e567 100644 --- a/compat/regex/regex.c +++ b/compat/regex/regex.c @@ -1,5 +1,12 @@ +/* + * This is

[PATCH 2/7] compat/regex: update the gawk regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
Update the gawk regex engine from the upstream gawk.git as detailed in the README added in a previous change. This is from gawk.git's gawk-4.1.0-2558-gb2651a80 which is the same code as in the stable gawk-4.1.4 release, but with one trivial change on top added in commit 725d2f78 ("Add small

[PATCH 0/7] Update the compat/regex engine from upstream

2017-05-04 Thread Ævar Arnfjörð Bjarmason
say that here than to modify them all. Ævar Arnfjörð Bjarmason (7): compat/regex: add a README with a maintenance guide compat/regex: update the gawk regex engine from upstream fixup! compat/regex: update the gawk regex engine from upstream fixup! compat/regex: update the gawk regex engine

Re: [PATCH v5] l10n: de.po: update German translation

2017-05-04 Thread Matthias Rüster
Acked-by: Matthias Rüster <matthias.rues...@gmail.com> Am 04.05.2017 um 19:08 schrieb Ralf Thielow: > Translate 96 new messages came from git.pot update in dfc182b (l10n: > git.pot: v2.13.0 round 1 (96 new, 37 removed)). > > Signed-off-by: Ralf Thielow <ralf.thie...@gmail.c

[PATCH v5] l10n: de.po: update German translation

2017-05-04 Thread Ralf Thielow
Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> --- po/de.po | 325 --- 1 file changed, 143 insertions(+

[PATCH v4 18/25] receive-pack: plug memory leak in update()

2017-05-04 Thread Johannes Schindelin
eceive-pack.c +++ b/builtin/receive-pack.c @@ -986,7 +986,8 @@ static const char *update(struct command *cmd, struct shallow_info *si) { const char *name = cmd->ref_name; struct strbuf namespaced_name_buf = STRBUF_INIT; - const char *namespaced_name, *ret; + st

Re: [PATCH v3] l10n: de.po: update German translation

2017-05-04 Thread Ralf Thielow
2017-05-03 21:27 GMT+02:00 Christian Brabandt : > On Mi, 03 Mai 2017, Ralf Thielow wrote: > >> Ref or Reference is translated as "Referenz" while >> Rev or Revision is translated as "Commit" so I think >> the translation is correct. > > Oh right. I also noticed that sometimes

Re: [PATCH v4] l10n: de.po: update German translation

2017-05-04 Thread Ralf Thielow
2017-05-03 19:29 GMT+02:00 Matthias Rüster : > Hi Ralf, > > thanks again for your work! > > >> >> #: ref-filter.c:565 >> -#, fuzzy, c-format >> +#, c-format >> msgid "format: %%(then) atom used after %%(else)" >> -msgstr "Format: %%(end) Atom fehlt" >> +msgstr

Re: [PATCH v3] l10n: de.po: update German translation

2017-05-03 Thread Christian Brabandt
On Mi, 03 Mai 2017, Ralf Thielow wrote: > Ref or Reference is translated as "Referenz" while > Rev or Revision is translated as "Commit" so I think > the translation is correct. Oh right. I also noticed that sometimes complete sentences were used and sometimes not. It would be nice to have a

Re: [PATCH v4] l10n: de.po: update German translation

2017-05-03 Thread Matthias Rüster
Hi Ralf, thanks again for your work! > > #: ref-filter.c:565 > -#, fuzzy, c-format > +#, c-format > msgid "format: %%(then) atom used after %%(else)" > -msgstr "Format: %%(end) Atom fehlt" > +msgstr "format: %%(then) nach %%(else) verwendet" > Is there a "Atom" missing? "format: %%(then)

[PATCH v4] l10n: de.po: update German translation

2017-05-03 Thread Ralf Thielow
Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> --- po/de.po | 323 --- 1 file changed, 142 insertions(+

Re: [PATCH v3] l10n: de.po: update German translation

2017-05-03 Thread Ralf Thielow
Am 3. Mai 2017 um 14:38 schrieb Christian Brabandt : > Hallo Ralf! > > Ralf Thielow schrieb am Dienstag, den 02. Mai 2017: > >> @@ -1260,6 +1260,8 @@ msgstr "Speicher verbraucht" >> #: config.c:191 >> msgid "relative config include conditionals must come from files" >> msgstr

Re: [PATCH v3] l10n: de.po: update German translation

2017-05-03 Thread Christian Brabandt
Hallo Ralf! Ralf Thielow schrieb am Dienstag, den 02. Mai 2017: > @@ -1260,6 +1260,8 @@ msgstr "Speicher verbraucht" > #: config.c:191 > msgid "relative config include conditionals must come from files" > msgstr "" > +"Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden >

[PATCH v3] l10n: de.po: update German translation

2017-05-02 Thread Ralf Thielow
Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> --- po/de.po | 323 --- 1 file changed, 142 insertions(+

Re: [PATCH v2] l10n: de.po: update German translation

2017-05-02 Thread Ralf Thielow
2017-05-01 14:19 GMT+02:00 Simon Ruderich : > On Sun, Apr 30, 2017 at 09:11:49PM +0200, Ralf Thielow wrote: >> #: config.c:1952 >> #, c-format >> msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" >> -msgstr "" >> +msgstr "Unbekannter Wert '%s' in

[PATCH v3 18/25] receive-pack: plug memory leak in update()

2017-05-02 Thread Johannes Schindelin
eceive-pack.c +++ b/builtin/receive-pack.c @@ -986,7 +986,8 @@ static const char *update(struct command *cmd, struct shallow_info *si) { const char *name = cmd->ref_name; struct strbuf namespaced_name_buf = STRBUF_INIT; - const char *namespaced_name, *ret; + st

Re: [PATCH v2] l10n: de.po: update German translation

2017-05-01 Thread Simon Ruderich
On Sun, Apr 30, 2017 at 09:11:49PM +0200, Ralf Thielow wrote: > #: config.c:1952 > #, c-format > msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" > -msgstr "" > +msgstr "Unbekannter Wert '%s' in core.untrackedCache; benutze Stardardwert > 'keep'"

Re: [PATCH] doc: update SubmittingPatches

2017-04-30 Thread Junio C Hamano
René Genz writes: > -use US English spelling > -minor wording change for better readability > > Helped-by: Stefan Beller > Signed-off-by: René Genz > --- Thanks, will apply. > Documentation/SubmittingPatches | 12

[PATCH v2] l10n: de.po: update German translation

2017-04-30 Thread Ralf Thielow
Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> --- :/ It turned out de.po was not up-to-date with the git.pot update mentioned. So here we go again. po/de.po

[PATCH] l10n: de.po: update German translation

2017-04-30 Thread Ralf Thielow
Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> --- po/de.po | 309 +++ 1 file changed, 134 insertions(+

[PATCH] doc: update SubmittingPatches

2017-04-30 Thread René Genz
-use US English spelling -minor wording change for better readability Helped-by: Stefan Beller Signed-off-by: René Genz --- Documentation/SubmittingPatches | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[PATCH v2 18/25] receive-pack: plug memory leak in update()

2017-04-28 Thread Johannes Schindelin
eceive-pack.c +++ b/builtin/receive-pack.c @@ -986,7 +986,8 @@ static const char *update(struct command *cmd, struct shallow_info *si) { const char *name = cmd->ref_name; struct strbuf namespaced_name_buf = STRBUF_INIT; - const char *namespaced_name, *ret; + st

[PATCH 19/26] receive-pack: plug memory leak in update()

2017-04-26 Thread Johannes Schindelin
eceive-pack.c +++ b/builtin/receive-pack.c @@ -986,7 +986,8 @@ static const char *update(struct command *cmd, struct shallow_info *si) { const char *name = cmd->ref_name; struct strbuf namespaced_name_buf = STRBUF_INIT; - const char *namespaced_name, *ret; + st

Re: [PATCH] doc: update SubmittingPatches

2017-04-23 Thread Junio C Hamano
René Genz writes: (updates for minor irritations skipped as I do not have strong opinions against them). > @@ -261,7 +261,7 @@ smaller project it is a good discipline to follow it. > The sign-off is a simple line at the end of the explanation for > the patch, which

[PATCH] doc: update SubmittingPatches

2017-04-23 Thread René Genz
-use US English spelling -based on my own experience: * add commands used to contribute a patch * minor wording change for better readability Thanks-to: Stefan Beller --- Documentation/SubmittingPatches | 31 +-- 1 file changed, 25

[PATCH v6 8/8] convert: Update subprocess_read_status to not die on EOF

2017-04-21 Thread Ben Peart
Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- con

[PATCH v6 5/8] convert: Update generic functions to only use generic data structures

2017-04-21 Thread Ben Peart
Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- convert.

Re: [PATCH 0/6] nd/worktree-move update

2017-04-21 Thread Jeff King
On Thu, Apr 20, 2017 at 05:10:18PM +0700, Nguyễn Thái Ngọc Duy wrote: > - fixes the compile problem on latest master (because prefix_filename >takes one argument less) It also now returns an allocated buffer. So: > --- a/builtin/worktree.c > +++ b/builtin/worktree.c > @@ -561,9 +561,7 @@

[PATCH 6/6] docs/bisect-lk2009: update java code conventions link

2017-04-20 Thread Jeff King
The old link just redirects to a big index page. I was able to find a new link for the original document via Google. Signed-off-by: Jeff King --- Documentation/git-bisect-lk2009.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 5/6] docs/bisect-lk2009: update nist report link

2017-04-20 Thread Jeff King
The original NIST press release linked here is no longer available. But it was just a one-page summary of a larger planning report; we can link to the report and point people to the executive summary, which contains the same information. Ideally we'd cite it with a DOI, but I couldn't dig one up

[PATCH 3/6] gitcore-tutorial: update broken link

2017-04-20 Thread Jeff King
The slides for the Linux-mentoring presentation are no longer available. Let's point to the wayback version of the page, which works. Note that the referenced diagram is also available on page 15 of [1]. We could link to that instead, but it's not clear from the URL scheme ("uploads") whether

[PATCH 0/6] nd/worktree-move update

2017-04-20 Thread Nguyễn Thái Ngọc Duy
This - squashes in Johannes' fix (that's already on jch/nd/worktree-move) - fixes the compile problem on latest master (because prefix_filename takes one argument less) - fixes the test failure because real_path() is called twice (the first one hidden in read_gitfile_gently) but the

[PATCH v6 01/11] t5550: use write_script to generate post-update hook

2017-04-19 Thread Brandon Williams
The post-update hooks created in t5550-http-fetch-dumb.sh is missing the "!#/bin/sh" line which can cause issues with portability. Instead create the hook using the 'write_script' function which includes the proper "#!" line. Signed-off-by: Brandon Williams <bmw...@google

[PATCH v5 01/11] t5550: use write_script to generate post-update hook

2017-04-18 Thread Brandon Williams
The post-update hooks created in t5550-http-fetch-dumb.sh is missing the "!#/bin/sh" line which can cause issues with portability. Instead create the hook using the 'write_script' function which includes the proper "#!" line. Signed-off-by: Brandon Williams <bmw...@google

[PATCH v4 01/10] t5550: use write_script to generate post-update hook

2017-04-17 Thread Brandon Williams
The post-update hooks created in t5550-http-fetch-dumb.sh is missing the "!#/bin/sh" line which can cause issues with portability. Instead create the hook using the 'write_script' function which includes the proper "#!" line. Signed-off-by: Brandon Williams <bmw...@google

Re: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-17 Thread Duy Nguyen
On Sun, Apr 16, 2017 at 11:25 AM, Duy Nguyen wrote: >> Because this is a reset --mixed it will never run through unpack_trees and >> The entries are never marked with CE_REMOVE. > > I know. But in my view, it should. All updates from a tree object to > the index should happen

Re: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-15 Thread Duy Nguyen
: Kevin Willford <kewi...@microsoft.com> >> Cc: Kevin Willford <kcwillf...@gmail.com>; git@vger.kernel.org; >> gits...@pobox.com; p...@peff.net >> Subject: Re: [PATCH 3/3] reset.c: update files when using sparse to avoid >> data loss. >> >> On Wed,

[PATCH v3 01/10] t5550: use write_script to generate post-update hook

2017-04-14 Thread Brandon Williams
The post-update hooks created in t5550-http-fetch-dumb.sh is missing the "!#/bin/sh" line which can cause issues with portability. Instead create the hook using the 'write_script' function which includes the proper "#!" line. Signed-off-by: Brandon Williams <bmw...@google

Re: [PATCH v2 1/6] t5550: use write_script to generate post-update hook

2017-04-13 Thread Eric Wong
Brandon Williams <bmw...@google.com> wrote: > On 04/13, Eric Wong wrote: > > Jonathan Nieder <jrnie...@gmail.com> wrote: > > > Brandon Williams wrote: > > > > The post-update hooks created in t5550-http-fetch-dumb.sh is missing the > > > > &q

Re: [PATCH v2 1/6] t5550: use write_script to generate post-update hook

2017-04-13 Thread Brandon Williams
On 04/13, Eric Wong wrote: > Jonathan Nieder <jrnie...@gmail.com> wrote: > > Brandon Williams wrote: > > > The post-update hooks created in t5550-http-fetch-dumb.sh is missing the > > > "!#/bin/sh" line which can cause issues with portability. Instead &g

Re: [PATCH v2 1/6] t5550: use write_script to generate post-update hook

2017-04-13 Thread Eric Wong
Jonathan Nieder <jrnie...@gmail.com> wrote: > Brandon Williams wrote: > > The post-update hooks created in t5550-http-fetch-dumb.sh is missing the > > "!#/bin/sh" line which can cause issues with portability. Instead > > create the hook using the '

Re: [PATCH v2 1/6] t5550: use write_script to generate post-update hook

2017-04-13 Thread Jonathan Nieder
Hi, Brandon Williams wrote: > The post-update hooks created in t5550-http-fetch-dumb.sh is missing the > "!#/bin/sh" line which can cause issues with portability. Instead > create the hook using the 'write_script' function which includes the > proper "#!"

[PATCH v2 1/6] t5550: use write_script to generate post-update hook

2017-04-13 Thread Brandon Williams
The post-update hooks created in t5550-http-fetch-dumb.sh is missing the "!#/bin/sh" line which can cause issues with portability. Instead create the hook using the 'write_script' function which includes the proper "#!" line. Signed-off-by: Brandon Williams <bmw...@google

RE: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-12 Thread Kevin Willford
ernel.org; > gits...@pobox.com; p...@peff.net > Subject: Re: [PATCH 3/3] reset.c: update files when using sparse to avoid > data loss. > > On Wed, Apr 12, 2017 at 5:30 AM, Kevin Willford <kewi...@microsoft.com> > wrote: > > The loss of the skip-worktree bits is par

Re: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-12 Thread Duy Nguyen
On Wed, Apr 12, 2017 at 5:30 AM, Kevin Willford wrote: > The loss of the skip-worktree bits is part of the problem if you are talking > about modified files. The other issue that I was having is when running a > reset > and there were files added in the commit that is

RE: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-11 Thread Kevin Willford
Subject: Re: [PATCH 3/3] reset.c: update files when using sparse to avoid > data loss. > > On Fri, Apr 07, 2017 at 12:23:57PM -0700, Kevin Willford wrote: > > When using the sparse checkout feature the git reset command will add > > "git reset" has three different mod

Re: [PATCH v5 8/8] convert: Update subprocess_read_status to not die on EOF

2017-04-10 Thread Lars Schneider
> On 07 Apr 2017, at 14:03, Ben Peart <peart...@gmail.com> wrote: > > Enable sub-processes to gracefully handle when the process dies by > updating subprocess_read_status to return an error on EOF instead of > dying. > > Update apply_multi_file_filter to ta

Re: [PATCH v5 5/8] convert: Update generic functions to only use generic data structures

2017-04-10 Thread Lars Schneider
> On 07 Apr 2017, at 14:03, Ben Peart <peart...@gmail.com> wrote: > > Update all functions that are going to be moved into a reusable module > so that they only work with the reusable data structures. Move code > that is specific to the filter out into the filter specific f

Re: [PATCH 1/3] merge-recursive.c: conflict using sparse should update file

2017-04-10 Thread Duy Nguyen
On Fri, Apr 07, 2017 at 12:23:55PM -0700, Kevin Willford wrote: > Update the file when there is a conflict with a modify/delete scenario > when using the sparse-checkout feature since the file might not be on disk > because the skip-worktree bit is on and the user will need the file and

Re: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-10 Thread Duy Nguyen
On Fri, Apr 07, 2017 at 12:23:57PM -0700, Kevin Willford wrote: > When using the sparse checkout feature the git reset command will add "git reset" has three different modes. It would be good if you mention what mode is affected here. The tests are for --mixed only. I wonder if we need to do

Re: [PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-07 Thread Stefan Beller
On Fri, Apr 7, 2017 at 12:23 PM, Kevin Willford wrote: > When using the sparse checkout feature the git reset command will add > entries to the index that will have the skip-worktree bit off but will > leave the working directory empty. File data is lost because the index >

[PATCH 3/3] reset.c: update files when using sparse to avoid data loss.

2017-04-07 Thread Kevin Willford
When using the sparse checkout feature the git reset command will add entries to the index that will have the skip-worktree bit off but will leave the working directory empty. File data is lost because the index version of the files has been changed but there is nothing that is in the working

[PATCH 1/3] merge-recursive.c: conflict using sparse should update file

2017-04-07 Thread Kevin Willford
Update the file when there is a conflict with a modify/delete scenario when using the sparse-checkout feature since the file might not be on disk because the skip-worktree bit is on and the user will need the file and content to determine how to resolve the conflict. Signed-off-by: Kevin Willford

[PATCH v5 8/8] convert: Update subprocess_read_status to not die on EOF

2017-04-07 Thread Ben Peart
Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- con

[PATCH v5 5/8] convert: Update generic functions to only use generic data structures

2017-04-07 Thread Ben Peart
Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- convert.

Re: Bug? git submodule update --reference doesn't use the referenced repository

2017-04-03 Thread Maxime Viargues
On 04-Apr-17 4:32 AM, Stefan Beller wrote: On Sun, Apr 2, 2017 at 8:13 PM, Maxime Viargues <maxime.viarg...@serato.com> wrote: Hi there, I have been trying to use the --reference option to clone a big repository using a local copy, but I can't manage to make it work using sub-module upd

Re: Bug? git submodule update --reference doesn't use the referenced repository

2017-04-03 Thread Stefan Beller
On Sun, Apr 2, 2017 at 8:13 PM, Maxime Viargues <maxime.viarg...@serato.com> wrote: > Hi there, > > I have been trying to use the --reference option to clone a big repository > using a local copy, but I can't manage to make it work using sub-module > update. I believe th

Bug? git submodule update --reference doesn't use the referenced repository

2017-04-02 Thread Maxime Viargues
Hi there, I have been trying to use the --reference option to clone a big repository using a local copy, but I can't manage to make it work using sub-module update. I believe this is a bug, unless I missed something. I am on Windows, Git 2.12.0 So the problem is as follow: - I have got

[PATCH v3 20/20] Documentation: update and rename api-sha1-array.txt

2017-03-30 Thread brian m. carlson
Since the structure and functions have changed names, update the code examples and the documentation. Rename the file to match the new name of the API. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- .../{api-sha1-array.txt => api-oid-array.txt}

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

2017-03-30 Thread Stefan Beller
On Thu, Mar 30, 2017 at 10:33 AM, Junio C Hamano wrote: >> >> Coverity points out that this is a leak (xgetcwd returns an allocated >> buffer). > > I saw that quite recently and was wondering why it reported it this > late. It has been in 'master' for more than a month.

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

2017-03-30 Thread Junio C Hamano
Jeff King <p...@peff.net> writes: > On Wed, Jan 27, 2016 at 07:58:00AM +0100, Christian Couder wrote: > >> diff --git a/builtin/update-index.c b/builtin/update-index.c >> index 6dd..369c207 100644 >> --- a/builtin/update-index.c >> +++ b/builtin/update-i

[PATCH v4 8/8] convert: Update subprocess_read_status to not die on EOF

2017-03-30 Thread Ben Peart
Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- con

[PATCH v4 5/8] convert: Update generic functions to only use generic data structures

2017-03-30 Thread Ben Peart
Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- convert.

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

2017-03-30 Thread Christian Couder
On Thu, Mar 30, 2017 at 5:28 AM, Jeff King <p...@peff.net> wrote: > On Wed, Jan 27, 2016 at 07:58:00AM +0100, Christian Couder wrote: > >> diff --git a/builtin/update-index.c b/builtin/update-index.c >> index 6dd..369c207 100644 >> --- a/builtin/update-index.c &

Re: [PATCH] update-index: fix xgetcwd() related memory leak

2017-03-30 Thread Jeff King
y: Christian Couder <chrisc...@tuxfamily.org> > --- > builtin/update-index.c | 6 +- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/builtin/update-index.c b/builtin/update-index.c > index d74d72cc7f..ebfc09faa0 100644 > --- a/builtin/update-index.c > ++

[PATCH] update-index: fix xgetcwd() related memory leak

2017-03-30 Thread Christian Couder
As xgetcwd() returns an allocated buffer, we should free this buffer when we don't need it any more. This was found by Coverity. Reported-by: Jeff King <p...@peff.net> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 6 +- 1 file changed,

Re: [PATCH v8 04/11] update-index: add untracked cache notifications

2017-03-29 Thread Jeff King
On Wed, Jan 27, 2016 at 07:58:00AM +0100, Christian Couder wrote: > diff --git a/builtin/update-index.c b/builtin/update-index.c > index 6dd..369c207 100644 > --- a/builtin/update-index.c > +++ b/builtin/update-index.c > @@ -130,7 +130,7 @@ static int test_if_untracked_cache_is

[PATCH v3 5/8] convert: Update generic functions to only use generic data structures

2017-03-29 Thread Ben Peart
Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter functions. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- convert.

[PATCH v3 2/8] convert: Update convert to use new packet_writel() function

2017-03-29 Thread Ben Peart
convert.c had it's own packet_write_list() function that can now be replaced with the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/convert.c

[PATCH v3 8/8] convert: Update subprocess_read_status to not die on EOF

2017-03-29 Thread Ben Peart
Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- con

[PATCH v2 21/21] Documentation: update and rename api-sha1-array.txt

2017-03-26 Thread brian m. carlson
Since the structure and functions have changed names, update the code examples and the documentation. Rename the file to match the new name of the API. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- .../{api-sha1-array.txt => api-oid-array.txt}

Re: [PATCH] branch doc: update description for `--list`

2017-03-24 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 24, 2017 at 5:56 AM, Junio C Hamano wrote: > The paragraph begins with a sample command line `git branch ` > that has nothing to do with the option being described. Remove it, > but use the space to instead show that multiple patterns can be > given. > > Also

Re: [PATCH] branch doc: update description for `--list`

2017-03-23 Thread Jonathan Nieder
Junio C Hamano wrote: > Signed-off-by: Junio C Hamano > --- > Documentation/git-branch.txt | 9 +++-- > 1 file changed, 7 insertions(+), 2 deletions(-) Reviewed-by: Jonathan Nieder Thanks.

[PATCH] branch doc: update description for `--list`

2017-03-23 Thread Junio C Hamano
The paragraph begins with a sample command line `git branch ` that has nothing to do with the option being described. Remove it, but use the space to instead show that multiple patterns can be given. Also mention the unfortunate `-l` that can be easily confused with it. Helped-by: Jonathan

Re: [PATCH] t7406: correct test case for submodule-update initial population

2017-03-22 Thread Stefan Beller
I do not think it is particularly useful skill to be able to >> spot '\'' as a logical unit, either). ${sq} thing may make it easier >> to read but I think the one you did in the first quoted part in this >> reply is good enough. > > Sounds good. > >> -- >

Re: [PATCH] t7406: correct test case for submodule-update initial population

2017-03-22 Thread Jeff King
t easier > to read but I think the one you did in the first quoted part in this > reply is good enough. Sounds good. > -- >8 -- > Subject: t7406: correct test case for submodule-update initial population > > There are three issues with the test: > > * The syntax of the

Re: [PATCH] t7406: correct test case for submodule-update initial population

2017-03-22 Thread Jonathan Nieder
Stefan Beller wrote: > On Wed, Mar 22, 2017 at 2:59 PM, Jeff King wrote: >> sq=\' >> test_expect_success '...' ' >> cat >expect <<-EOF >> Execution of ${sq}false $submodulesha1${sq} ... >> ' >> >> but I'm not sure if that is any more readable. > > If I recall

Re: [PATCH] t7406: correct test case for submodule-update initial population

2017-03-22 Thread Junio C Hamano
useful skill to be able to spot '\'' as a logical unit, either). ${sq} thing may make it easier to read but I think the one you did in the first quoted part in this reply is good enough. -- >8 -- Subject: t7406: correct test case for submodule-update initial population There are three

Re: [PATCH] t7406: correct test case for submodule-update initial population

2017-03-22 Thread Jeff King
On Wed, Mar 22, 2017 at 03:07:45PM -0700, Stefan Beller wrote: > > Neither of those is true, but I think: > > > > cat >expect <<-EOF && > > Execution of '\''false $submodulesha1'\'' failed in ... > > EOF > > > > is safer and less surprising. The single-quote handling is unfortunate and > >

Re: [PATCH] t7406: correct test case for submodule-update initial population

2017-03-22 Thread Stefan Beller
On Wed, Mar 22, 2017 at 2:59 PM, Jeff King wrote: > On Wed, Mar 22, 2017 at 02:49:48PM -0700, Stefan Beller wrote: > >> * The syntax of the here-doc was wrong, such that the entire test was >> sucked into the here-doc, which is why the test succeeded successfully. > > As opposed

<    3   4   5   6   7   8   9   10   11   12   >