Re: [PATCH] mailmap: update brian m. carlson's email address

2018-05-07 Thread brian m. carlson
On Mon, May 07, 2018 at 12:37:05PM +0900, Junio C Hamano wrote: > I initially reacted to "was reversed" with "yikes, did we break the > mailmap reader and we need to update the file?", but apparently that > is not what this patch is about. I think what is happ

Re: [PATCH] mailmap: update brian m. carlson's email address

2018-05-07 Thread Stefan Beller
ly reacted to "was reversed" with "yikes, did we break the > mailmap reader and we need to update the file?", but apparently that > is not what this patch is about. I think what is happening here is > that cdb6b5ac (".mailmap: Combine more (name, email) to i

Re: [PATCH] mailmap: update brian m. carlson's email address

2018-05-06 Thread Junio C Hamano
order of > the addresses so that git log displays the correct address. > > Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> > --- I initially reacted to "was reversed" with "yikes, did we break the mailmap reader and we need to update the file?"

[PATCH] mailmap: update brian m. carlson's email address

2018-05-06 Thread brian m. carlson
The order of addresses in the mailmap file was reversed, leading to git preferring the crustytoothpaste.ath.cx address, which is obsolete, over the crustytoothpaste.net address, which is current. Switch the order of the addresses so that git log displays the correct address. Signed-off-by: brian

Re: git update-ref fails to create reference. (bug)

2018-05-05 Thread Rafael Ascensão
ar about having the "old sha" set to 40 zeros or the empty string. So I guess we should add some extra tests to cover the variations of these two cases. e.g. test_expect_success "create PSEUDOREF" ' git update-ref PSEUDOREF $A 00

Re: git update-ref fails to create reference. (bug)

2018-05-04 Thread Martin Ågren
a) $ echo -e option no-deref\\nupdate REF $(git hash-object -t > tree /dev/null) 0000 | git > update-ref --stdin > b) $ git update-ref --no-deref REF $(git hash-object -t tree > /dev/null) 0

git update-ref fails to create reference. (bug)

2018-05-04 Thread Rafael Ascensão
) | git update-ref --stdin b) $ git update-ref --no-deref REF $(git hash-object -t tree /dev/null) While a) works, b) will throw: fatal: could not read ref 'REF' Bisect seems to point to: 2c3aed138 (pseudoref: check return

Re: [PATCH 39/41] Update shell scripts to compute empty tree object ID

2018-05-03 Thread brian m. carlson
On Tue, May 01, 2018 at 12:42:57PM +0200, Duy Nguyen wrote: > On Mon, Apr 23, 2018 at 11:39:49PM +, brian m. carlson wrote: > > Several of our shell scripts hard-code the object ID of the empty tree. > > To avoid any problems when changing hashes, compute this value on > > startup of the

[PATCH v2 1/6] sequencer: extract helper to update active_cache_tree

2018-05-03 Thread Johannes Schindelin
This patch extracts the code from is_index_unchanged() to initialize or update the index' cache tree (i.e. a tree object reflecting the current index' top-level tree). The new helper will be used in the upcoming code to support `git rebase -i --root` via the sequencer. Signed-off-by: Johannes

[PATCH v4 3/3] submodule: add --dissociate option to add/update commands

2018-05-03 Thread Casey Fitzpatrick
Add --dissociate option to add and update commands, both clone helper commands that already have the --reference option --dissociate pairs with. Signed-off-by: Casey Fitzpatrick <kcgh...@gmail.com> --- Documentation/git-submodule.txt | 10 +- builtin/submodule--helper.c

[PATCH v4 1/3] merge: update documentation for {merge,diff}.renameLimit

2018-05-02 Thread Ben Peart
Update the documentation to better indicate that the renameLimit setting is ignored if rename detection is turned off via command line options or config settings. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- Documentation/diff-config.txt | 3 ++- Documentation/merge-config.t

Re: [PATCH v4 10/10] commit-graph.txt: update design document

2018-05-02 Thread Jakub Narebski
Derrick Stolee writes: > On 4/30/2018 7:32 PM, Jakub Narebski wrote: >> Derrick Stolee writes: [...] >>> - After computing and storing generation numbers, we must make graph >>> walks aware of generation numbers to gain the performance benefits

[PATCH 3/3] submodule: add --dissociate option to add/update commands

2018-05-01 Thread Casey Fitzpatrick
Add --dissociate option to add and update commands, both clone helper commands that already have the --reference option --dissociate pairs with. Signed-off-by: Casey Fitzpatrick <kcgh...@gmail.com> --- Documentation/git-submodule.txt | 10 +- builtin/submodule--helper.c

Re: [PATCH 3/3] submodule: add --dissociate option to add/update commands

2018-05-01 Thread Casey Fitzpatrick
Just noticed I missed the other 'test_must_fail'. Resubmitting in a few moments. On Tue, May 1, 2018 at 8:27 PM, Casey Fitzpatrick <kcgh...@gmail.com> wrote: > Add --dissociate option to add and update commands, both clone helper commands > that already have the --reference option

[PATCH 3/3] submodule: add --dissociate option to add/update commands

2018-05-01 Thread Casey Fitzpatrick
Add --dissociate option to add and update commands, both clone helper commands that already have the --reference option --dissociate pairs with. Signed-off-by: Casey Fitzpatrick <kcgh...@gmail.com> --- Documentation/git-submodule.txt | 10 +- builtin/submodule--helper.c

[PATCH v2 16/42] Update struct index_state to use struct object_id

2018-05-01 Thread brian m. carlson
Adjust struct index_state to use struct object_id instead of unsigned char [20]. Signed-off-by: brian m. carlson --- cache.h | 2 +- read-cache.c | 16 t/helper/test-dump-split-index.c | 2 +-

[PATCH v2 40/42] Update shell scripts to compute empty tree object ID

2018-05-01 Thread brian m. carlson
Several of our shell scripts hard-code the object ID of the empty tree. To avoid any problems when changing hashes, compute this value on startup of the script. For performance, store the value in a variable and reuse it throughout the life of the script. Signed-off-by: brian m. carlson

Re: [PATCH 2/2] submodule: Add --dissociate option to add/update commands

2018-05-01 Thread Casey Fitzpatrick
c Sunshine <sunsh...@sunshineco.com> wrote: > On Tue, May 1, 2018 at 2:09 PM, Casey Fitzpatrick <kcgh...@gmail.com> wrote: >> submodule: Add --dissociate option to add/update commands > > s/Add/add/ > >> Add --dissociate option to add and update commands, both

Re: [PATCH 2/2] submodule: Add --dissociate option to add/update commands

2018-05-01 Thread Eric Sunshine
On Tue, May 1, 2018 at 2:09 PM, Casey Fitzpatrick <kcgh...@gmail.com> wrote: > submodule: Add --dissociate option to add/update commands s/Add/add/ > Add --dissociate option to add and update commands, both clone helper commands > that already have the --reference option --d

Re: [PATCH 2/2] submodule: Add --dissociate option to add/update commands

2018-05-01 Thread Stefan Beller
On Tue, May 1, 2018 at 11:09 AM, Casey Fitzpatrick wrote: > > +test_expect_success 'submodule add --reference with --dissociate doesnt use > alternates' ' > + ( > + cd super && > + git submodule add --reference ../B --dissociate >

[PATCH 2/2] submodule: Add --dissociate option to add/update commands

2018-05-01 Thread Casey Fitzpatrick
Add --dissociate option to add and update commands, both clone helper commands that already have the --reference option --dissociate pairs with. Add documentation. Add tests. Signed-off-by: Casey Fitzpatrick <kcgh...@gmail.com> --- Documentation/git-submodule.txt | 10 +- b

[PATCH v5 11/11] commit-graph.txt: update design document

2018-05-01 Thread Derrick Stolee
We now calculate generation numbers in the commit-graph file and use them in paint_down_to_common(). Expand the section on generation numbers to discuss how the three special generation numbers GENERATION_NUMBER_INFINITY, _ZERO, and _MAX interact with other generation numbers. Signed-off-by:

Re: [PATCH v4 10/10] commit-graph.txt: update design document

2018-05-01 Thread Derrick Stolee
On 4/30/2018 7:32 PM, Jakub Narebski wrote: Derrick Stolee writes: We now calculate generation numbers in the commit-graph file and use them in paint_down_to_common(). Expand the section on generation numbers to discuss how the three special generation numbers

Re: [PATCH 39/41] Update shell scripts to compute empty tree object ID

2018-05-01 Thread Duy Nguyen
On Mon, Apr 23, 2018 at 11:39:49PM +, brian m. carlson wrote: > Several of our shell scripts hard-code the object ID of the empty tree. > To avoid any problems when changing hashes, compute this value on > startup of the script. For performance, store the value in a variable > and reuse it

Re: [PATCH v4 10/10] commit-graph.txt: update design document

2018-04-30 Thread Jakub Narebski
Derrick Stolee writes: > We now calculate generation numbers in the commit-graph file and use > them in paint_down_to_common(). > > Expand the section on generation numbers to discuss how the three > special generation numbers GENERATION_NUMBER_INFINITY, _ZERO, and > _MAX

Re: [PATCH 1/6] sequencer: extract helper to update active_cache_tree

2018-04-28 Thread Stefan Beller
Hi Johannes, On Fri, Apr 27, 2018 at 3:30 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > This patch extracts the code from is_index_unchanged() to initialize or > update the index' cache tree (i.e. a tree object reflecting the current > index' top-level tree). >

[PATCH 1/6] sequencer: extract helper to update active_cache_tree

2018-04-27 Thread Johannes Schindelin
This patch extracts the code from is_index_unchanged() to initialize or update the index' cache tree (i.e. a tree object reflecting the current index' top-level tree). The new helper will be used in the upcoming code to support `git rebase -i --root` via the sequencer. Signed-off-by: Johannes

Re: [PATCH v3 1/3] merge: update documentation for {merge,diff}.renameLimit

2018-04-26 Thread Jonathan Tan
On Thu, 26 Apr 2018 16:11:50 -0700 Elijah Newren wrote: > Patch looks fine, but it's hard for me not to notice a separate issue > in this area independent of your series: I'm curious if we should > document that the value of 0 is special here (as per Jonathan Tan's > commit

Re: [PATCH v3 1/3] merge: update documentation for {merge,diff}.renameLimit

2018-04-26 Thread Elijah Newren
On Thu, Apr 26, 2018 at 1:52 PM, Ben Peart <ben.pe...@microsoft.com> wrote: > Update the documentation to better indicate that the renameLimit setting is > ignored if rename detection is turned off via command line options or config > settings. > > Signed-off-by: Ben Peart &l

[PATCH v3 1/3] merge: update documentation for {merge,diff}.renameLimit

2018-04-26 Thread Ben Peart
Update the documentation to better indicate that the renameLimit setting is ignored if rename detection is turned off via command line options or config settings. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- Documentation/diff-config.txt | 3 ++- Documentation/merge-config.t

[PATCH v4 10/10] commit-graph.txt: update design document

2018-04-25 Thread Derrick Stolee
We now calculate generation numbers in the commit-graph file and use them in paint_down_to_common(). Expand the section on generation numbers to discuss how the three special generation numbers GENERATION_NUMBER_INFINITY, _ZERO, and _MAX interact with other generation numbers. Signed-off-by:

[PATCH 39/41] Update shell scripts to compute empty tree object ID

2018-04-23 Thread brian m. carlson
Several of our shell scripts hard-code the object ID of the empty tree. To avoid any problems when changing hashes, compute this value on startup of the script. For performance, store the value in a variable and reuse it throughout the life of the script. Signed-off-by: brian m. carlson

[PATCH 16/41] Update struct index_state to use struct object_id

2018-04-23 Thread brian m. carlson
Adjust struct index_state to use struct object_id instead of unsigned char [20]. Signed-off-by: brian m. carlson --- cache.h | 2 +- read-cache.c | 16 t/helper/test-dump-split-index.c | 2 +-

Re: [RFC PATCH 12/12] commit-graph: update design document

2018-04-20 Thread Jakub Narebski
Derrick Stolee writes: > The commit-graph feature is now integrated with 'fsck' and 'gc', > so remove those items from the "Future Work" section of the > commit-graph design document. See comments below, but this looks good to me. What is missing from the "Future Work"

[PATCH] doc/clone: update caption for GIT URLS cross-reference

2018-04-19 Thread Todd Zullinger
oid any confusion. Signed-off-by: Todd Zullinger <t...@pobox.com> --- Martin Ågren wrote: > On 18 April 2018 at 22:56, Todd Zullinger <t...@pobox.com> wrote: >> Subject: [PATCH] doc/clone: update caption for GIT URLS cross-reference >> >> The description of the arg

Re: [PATCH v3 4/9] commit-graph.txt: update design document

2018-04-18 Thread Jakub Narebski
Derrick Stolee writes: > We now calculate generation numbers in the commit-graph file and use > them in paint_down_to_common(). All right. > > Expand the section on generation numbers to discuss how the three > special generation numbers GENERATION_NUMBER_INFINITY,

[RFC PATCH 12/12] commit-graph: update design document

2018-04-17 Thread Derrick Stolee
The commit-graph feature is now integrated with 'fsck' and 'gc', so remove those items from the "Future Work" section of the commit-graph design document. Signed-off-by: Derrick Stolee --- Documentation/technical/commit-graph.txt | 9 - 1 file changed, 9

[PATCH v3 4/9] commit-graph.txt: update design document

2018-04-17 Thread Derrick Stolee
We now calculate generation numbers in the commit-graph file and use them in paint_down_to_common(). Expand the section on generation numbers to discuss how the three special generation numbers GENERATION_NUMBER_INFINITY, _ZERO, and _MAX interact with other generation numbers. Signed-off-by:

Re: [PATCH v2 0/7] nd/repack-keep-pack update

2018-04-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > On Sat, Apr 14, 2018 at 9:47 PM, Ævar Arnfjörð Bjarmason > wrote: >> The only (trivial) issue I found in the patches themselves was that >> between 4/5 and 5/7 you're adding an empty line to config.txt in 4/7 >> just to erase

[PATCH v2 0/7] nd/repack-keep-pack update

2018-04-15 Thread Nguyễn Thái Ngọc Duy
On Sat, Apr 14, 2018 at 9:47 PM, Ævar Arnfjörð Bjarmason wrote: > The only (trivial) issue I found in the patches themselves was that > between 4/5 and 5/7 you're adding an empty line to config.txt in 4/7 > just to erase it in 5/7, better not to add it to begin with, but >

Re: [PATCH 0/7] nd/repack-keep-pack update

2018-04-14 Thread Junio C Hamano
On Sun, Apr 15, 2018 at 4:47 AM, Ævar Arnfjörð Bjarmason wrote: > > The only (trivial) issue I found in the patches themselves was that > between 4/5 and 5/7 you're adding an empty line to config.txt in 4/7 > just to erase it in 5/7, better not to add it to begin with, but >

Re: [PATCH 0/7] nd/repack-keep-pack update

2018-04-14 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 14 2018, Nguyễn Thái Ngọc Duy wrote: > This is basically a resend from the last round but rebased on > 'master'. The old base results in some conflicts with packfile and oid > conversion series. This one should reduce merge conflicts on 'pu' to > trivial ones. Thanks. I've been

[PATCH 00/15] nd/pack-objects-pack-struct update

2018-04-14 Thread Nguyễn Thái Ngọc Duy
This is basically a resend from the last round but rebased on latest master to take advantage of new object-store and oid changes. One minor change is t/README now mentions about git-config when a variable accepts a boolean value. Nguyễn Thái Ngọc Duy (15): read-cache.c: make

[PATCH 0/7] nd/repack-keep-pack update

2018-04-14 Thread Nguyễn Thái Ngọc Duy
This is basically a resend from the last round but rebased on 'master'. The old base results in some conflicts with packfile and oid conversion series. This one should reduce merge conflicts on 'pu' to trivial ones. Nguyễn Thái Ngọc Duy (7): t7700: have closing quote of a test at the beginning

Re: [PATCH v2 07/10] commit-graph.txt: update future work

2018-04-13 Thread Jakub Narebski
Derrick Stolee writes: > On 4/12/2018 5:12 AM, Junio C Hamano wrote: >> Derrick Stolee writes: >> >>> +Here is a diagram to visualize the shape of the full commit graph, and >>> +how different generation numbers relate: >>> + >>> +

Re: [PATCH v2 07/10] commit-graph.txt: update future work

2018-04-12 Thread Derrick Stolee
On 4/12/2018 5:12 AM, Junio C Hamano wrote: Derrick Stolee writes: +Here is a diagram to visualize the shape of the full commit graph, and +how different generation numbers relate: + ++-+ +| GENERATION_NUMBER_INFINITY =

Re: [PATCH v2 07/10] commit-graph.txt: update future work

2018-04-12 Thread Junio C Hamano
Derrick Stolee writes: > +Here is a diagram to visualize the shape of the full commit graph, and > +how different generation numbers relate: > + > ++-+ > +| GENERATION_NUMBER_INFINITY = 0x | > +

[PATCH v2 07/10] commit-graph.txt: update future work

2018-04-09 Thread Derrick Stolee
We now calculate generation numbers in the commit-graph file and use them in paint_down_to_common(). Expand the section on generation numbers to discuss how the two "special" generation numbers GENERATION_NUMBER_INFINITY and *_ZERO interact with other generation numbers. Signed-off-by: Derrick

Re: [PATCH 6/6] commit-graph.txt: update future work

2018-04-03 Thread Jonathan Tan
On Tue, 3 Apr 2018 12:51:43 -0400 Derrick Stolee wrote: > We now calculate generation numbers in the commit-graph file and use > them in paint_down_to_common(). For completeness, I'll mention that I don't see any issues with this patch, of course. Thanks for this

[PATCH 6/6] commit-graph.txt: update future work

2018-04-03 Thread Derrick Stolee
We now calculate generation numbers in the commit-graph file and use them in paint_down_to_common(). Signed-off-by: Derrick Stolee --- Documentation/technical/commit-graph.txt | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git

[PATCH v2 5/5] refs: use chdir_notify to update cached relative paths

2018-03-30 Thread Jeff King
() and chdir to the root of the working tree - further calls to the ref code will use the stored git directory, but relative paths will now point to the wrong place The new test in t1501 demonstrates one such instance (the bug causes us to write the ref update to the nonsense "rel

[PATCH 4/4] refs: use chdir_notify to update cached relative paths

2018-03-28 Thread Jeff King
() and chdir to the root of the working tree - further calls to the ref code will use the stored git directory, but relative paths will now point to the wrong place The new test in t1501 demonstrates one such instance (the bug causes us to write the ref update to the nonsense "rel

Re: git submodule update - reset instead of checkout?

2018-03-26 Thread Stefan Beller
- with git submodule update, > is it necessary to detach the head to the current (or upstream) > head, instead of resetting the current branch to that state? Try "git checkout --recurse-submodules" or "git reset --recurse-submodules" (there is also the submodule.recurse o

[RFC PATCH v5 2/8] rebase: update invocation of rebase dot-sourced scripts

2018-03-23 Thread Wink Saville
Due to historical reasons, the backend scriptlets for "git rebase" are structured a bit unusually. As originally designed, dot-sourcing them from "git rebase" was sufficient to invoke the specific backend. However, it was later discovered that some shell implementations (e.g. FreeBSD 9.x)

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Eric Sunshine
On Fri, Mar 23, 2018 at 5:01 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> (despite the run-on sentence in the first paragraph and the apparent >> incorrect explanation of top-level "return" misbehavior -- the in-code >> comment says top-level

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 1:51 PM, Junio C Hamano wrote: > Wink Saville writes: > >> Here is one possibility: >> >> git format-patch --cover-letter --rfc --thread -v 5 >> --to=git@vger.kernel.org --cc=sunsh...@sunshineco.com >> --cc=johannes.schinde...@gmx.de

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Junio C Hamano
Eric Sunshine writes: >> When it was discovered that some shell implementations > ... > ECANTPARSE: This paragraph is grammatically corrupt. > > ECANTPARSE: Grammatically corrupt. > ... > (despite the run-on sentence in the first paragraph and the apparent > incorrect

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Junio C Hamano
Wink Saville writes: > Here is one possibility: > > git format-patch --cover-letter --rfc --thread -v 5 > --to=git@vger.kernel.org --cc=sunsh...@sunshineco.com > --cc=johannes.schinde...@gmx.de -o patches/v5 master..v5-2 Sounds sensible. > If this was the first version then

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Wink Saville
On Fri, Mar 23, 2018 at 10:12 AM, Johannes Schindelin wrote: > Hi Wink, > > On Thu, 22 Mar 2018, Wink Saville wrote: > >> The backend scriptlets for "git rebase" were structured in a >> bit unusual way for historical reasons. Originally, it was >> designed in such a

Re: [PATCH v2 3/5] fast-import: update pool_* functions to work on local pool

2018-03-23 Thread Junio C Hamano
Jameson Miller <jam...@microsoft.com> writes: > Update memory pool functions to work on a passed in mem_pool instead of > the global mem_pool type. This is in preparation for making the memory > pool logic reusable. This should be part of 2/5; the same comments to 2/5 I just sent

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Johannes Schindelin
Hi Wink, On Thu, 22 Mar 2018, Wink Saville wrote: > The backend scriptlets for "git rebase" were structured in a > bit unusual way for historical reasons. Originally, it was > designed in such a way that dot-sourcing them from "git > rebase" would be sufficient to invoke the specific backend. >

[PATCH v2 3/5] fast-import: update pool_* functions to work on local pool

2018-03-23 Thread Jameson Miller
Update memory pool functions to work on a passed in mem_pool instead of the global mem_pool type. This is in preparation for making the memory pool logic reusable. Signed-off-by: Jameson Miller <jam...@microsoft.com> --- fast-import.c | 52 ++---

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-23 Thread Eric Sunshine
, Mar 23, 2018 at 12:39 AM, Wink Saville <w...@saville.com> wrote: > rebase: Update invocation of rebase dot-sourced scripts Nit: On this project, the summary line is not capitalized, so: s/Update/update/ > The backend scriptlets for "git rebase" were structured in a O

[RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

2018-03-22 Thread Wink Saville
The backend scriptlets for "git rebase" were structured in a bit unusual way for historical reasons. Originally, it was designed in such a way that dot-sourcing them from "git rebase" would be sufficient to invoke the specific backend. When it was discovered that some shell implementations (e.g.

[GSoC][PATCH 2/2] git-ci: update .pylintrc to ignore current warning

2018-03-13 Thread Viet Hung Tran
pylint's check for unused variables, global statements, redefined builtins, undefined loop variables, and unused imports are disabled. The current configuration allows git-p4.py to pass the check in Travis CI in my forked repository. Here is the link for the successful built:

git submodule update - reset instead of checkout?

2018-03-09 Thread Andreas Krey
Hi everyone, I've been reading up on the current state of git submodules (our customer's customers want to use them, causing a slight groan from our customer). The usability thing I wonder about - with git submodule update, is it necessary to detach the head to the current (or upstream) head

I got a forced update after I run git pull --rebase

2018-03-07 Thread ZhenTian
I can't reproduct my issue, this is my first time, but my colleague came across this issue several weeks ago. After I pushed my commit to git server without rejection. I run git pull --rebase, then I got a forced update, and my last commit is missing. I have asked a question on StackOverflow

git-scm.com update

2018-03-06 Thread Jeff King
you to everybody who responded. Here's an update on what happened since then: - we now have a small group of maintainers able to triage incoming bug reports and patches, and generate some fixes. Thanks especially to Jean-Noël Avila, Pedro Rijo, and Samuel Lijin for their work over

[PATCH 1/2] object.h: update flag allocation comment

2018-03-06 Thread Nguyễn Thái Ngọc Duy
1 deletion(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 7e3e1a461c..b4239a633c 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -49,6 +49,7 @@ struct thread_local { int pack_fd; }; +/* Remember to update object flag allocation in object.h */

[PATCH v3 07/13] perl: update our ancient copy of Error.pm

2018-03-03 Thread Ævar Arnfjörð Bjarmason
The Error.pm shipped with Git as a fallback if there was no Error.pm on the system was released in April 2006. There's been dozens of releases since then, the latest at August 7, 2017. Let's update to that. I don't know of anything we need from this new release or which this fixes. This change

[PATCH v3 08/13] perl: update our copy of Mail::Address

2018-03-03 Thread Ævar Arnfjörð Bjarmason
Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan 23, 2018). Like the preceding Error.pm update this is done simply to keep up-to-date with upstream, and as can be shown from the diff there's no functional changes. The updated source was retrieved from https

[PATCH v2 07/13] perl: update our ancient copy of Error.pm

2018-02-25 Thread Ævar Arnfjörð Bjarmason
The Error.pm shipped with Git as a fallback if there was no Error.pm on the system was released in April 2006. There's been dozens of releases since then, the latest at August 7, 2017. Let's update to that. I don't know of anything we need from this new release or which this fixes. This change

[PATCH v2 08/13] perl: update our copy of Mail::Address

2018-02-25 Thread Ævar Arnfjörð Bjarmason
Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan 23, 2018). Like the preceding Error.pm update this is done simply to keep up-to-date with upstream, and as can be shown from the diff there's no functional changes. The updated source was retrieved from https

Re: [PATCH 4/8] perl: update our ancient copy of Error.pm

2018-02-15 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 14 2018, Jonathan Nieder jotted: > Ævar Arnfjörð Bjarmason wrote: > >> The Error.pm shipped with Git as a fallback if there was no Error.pm >> on the system was released in April 2006, there's been dozens of >> releases since then, the latest at Augu

Re: [PATCH 5/8] perl: update our copy of Mail::Address

2018-02-15 Thread Ævar Arnfjörð Bjarmason
On Thu, Feb 15 2018, Matthieu Moy jotted: > "Jonathan Nieder" <jrnie...@gmail.com> wrote: > >> Ævar Arnfjörð Bjarmason wrote: >> >> > Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan >> > 23, 2018). This should be a triv

Re: [PATCH 5/8] perl: update our copy of Mail::Address

2018-02-15 Thread Matthieu Moy
"Jonathan Nieder" <jrnie...@gmail.com> wrote: > Ævar Arnfjörð Bjarmason wrote: > > > Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan > > 23, 2018). This should be a trivial update[1] but it seems the version > > Matthieu Moy imported

Re: [PATCH v3 23/23] cat-file: update of docs

2018-02-14 Thread Jeff King
On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > Update the docs for cat-file command. Some new formatting atoms added > because of reusing ref-filter code. > We do not support cat-file atoms in general formatting logic > (there is just the support for cat-file),

Re: [PATCH 5/8] perl: update our copy of Mail::Address

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan > 23, 2018). This should be a trivial update[1] but it seems the version > Matthieu Moy imported in bd869f67b9 ("send-email: add and use a local > copy of Mail::Address"

Re: [PATCH 4/8] perl: update our ancient copy of Error.pm

2018-02-14 Thread Jonathan Nieder
Ævar Arnfjörð Bjarmason wrote: > The Error.pm shipped with Git as a fallback if there was no Error.pm > on the system was released in April 2006, there's been dozens of > releases since then, the latest at August 7, 2017, let's update to > that. Comma splices: s/, there's/. There's

[PATCH 5/8] perl: update our copy of Mail::Address

2018-02-14 Thread Ævar Arnfjörð Bjarmason
Update our copy of Mail::Address from 2.19 (Aug 22, 2017) to 2.20 (Jan 23, 2018). This should be a trivial update[1] but it seems the version Matthieu Moy imported in bd869f67b9 ("send-email: add and use a local copy of Mail::Address", 2018-01-05) doesn't correspond to any 2.19 ver

[PATCH 4/8] perl: update our ancient copy of Error.pm

2018-02-14 Thread Ævar Arnfjörð Bjarmason
The Error.pm shipped with Git as a fallback if there was no Error.pm on the system was released in April 2006, there's been dozens of releases since then, the latest at August 7, 2017, let's update to that. This undoes a local hack we'd accumulated in 96bc4de85c ("Eliminate Scalar::Util

Re: [PATCH v1] fsmonitor: update documentation to remove reference to invalid config settings

2018-02-14 Thread Junio C Hamano
for this long. Will apply. > > Notes: > Base Ref: master > Web-Diff: https://github.com/benpeart/git/commit/4b7ec2c11e > Checkout: git fetch https://github.com/benpeart/git fsmonitor_docs-v1 && > git checkout 4b7ec2c11e > > Documentation/git-upda

[PATCH v1] fsmonitor: update documentation to remove reference to invalid config settings

2018-02-14 Thread Ben Peart
ub.com/benpeart/git fsmonitor_docs-v1 && git checkout 4b7ec2c11e Documentation/git-update-index.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index bdb0342593..ad2383d7ed 100644 --- a/Doc

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

2018-02-13 Thread Jonathan Tan
On Thu, 8 Feb 2018 15:37:31 -0500 Derrick Stolee wrote: > It is possible to have multiple commit graph files in a pack directory, > but only one is important at a time. Use a 'graph_head' file to point > to the important file. Teach git-commit-graph to write 'graph_head' upon

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

2018-02-12 Thread Derrick Stolee
mes to determine which graph file to use. 2. If we write a new graph file while another git process is reading the existing graph file, we can update the graph_head pointer without deleting the file that is currently memory-mapped. (This is why we cannot just rely on a canonical file name, such

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

2018-02-12 Thread Junio C Hamano
Junio C Hamano writes: > Derrick Stolee writes: > >> It is possible to have multiple commit graph files in a pack directory, >> but only one is important at a time. Use a 'graph_head' file to point >> to the important file. Teach git-commit-graph to write

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

2018-02-12 Thread Junio C Hamano
Derrick Stolee writes: > It is possible to have multiple commit graph files in a pack directory, > but only one is important at a time. Use a 'graph_head' file to point > to the important file. Teach git-commit-graph to write 'graph_head' upon > writing a new commit graph file.

[PATCH v3 23/23] cat-file: update of docs

2018-02-12 Thread Olga Telezhnaya
Update the docs for cat-file command. Some new formatting atoms added because of reusing ref-filter code. We do not support cat-file atoms in general formatting logic (there is just the support for cat-file), that is why some of the atoms are still explained in cat-file docs. We need to move

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >>> Will queue with the above typofix, together with the other one. I >>> am not sure if we want to say "Before 2.17", though. >> >> I'm just keeping in mind the user who later on upgrades git

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> Will queue with the above typofix, together with the other one. I >> am not sure if we want to say "Before 2.17", though. > > I'm just keeping in mind the user who later on upgrades git from say > 2.14 to 2.18 or something, and is able to

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> +Before 2.17, the untracked cache had a bug where replacing a directory >> +with a symlink to another directory could cause it to incorrectly show >> +files tracked by git as untracked. See

Re: [PATCH 0/2] update-index doc: note new caveats in 2.17

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> When users upgrade to 2.17 they're going to have git yelling at them >> (as my users did) on existing checkouts, with no indication whatsoever >> that it's due to the UC or how to fix it. > >

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > +Before 2.17, the untracked cache had a bug where replacing a directory > +with a symlink to another directory could cause it to incorrectly show > +files tracked by git as untracked. See the "status: add a failing test > +showing a

Re: [PATCH 0/2] update-index doc: note new caveats in 2.17

2018-02-09 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > When users upgrade to 2.17 they're going to have git yelling at them > (as my users did) on existing checkouts, with no indication whatsoever > that it's due to the UC or how to fix it. Wait. Are you saying that the new warning is "warning"

[PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Ævar Arnfjörð Bjarmason
s to focus on the symlink case only. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com> --- Documentation/git-update-index.txt | 16 1 file changed,

[PATCH 0/2] update-index doc: note new caveats in 2.17

2018-02-09 Thread Ævar Arnfjörð Bjarmason
room to quibble about whether to include 1/2 at all since it's a relatively obscure edge case. 2/2 however is something I think a *lot* of users are going to hit. I just skimmed the relevant bits of git-config and git-update-index now, and nothing describes the UC as an experimental feature, and it's b

[PATCH 2/2] update-index doc: note the caveat with "could not open..."

2018-02-09 Thread Ævar Arnfjörð Bjarmason
ded git to a version with this series at Booking.com, and other users have doubtless enabled the UC extension and are in for a surprise when they upgrade. Let's give them a headsup in the docs. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-update-index.txt | 10

[PATCH v3 07/14] commit-graph: update graph-head during write

2018-02-08 Thread Derrick Stolee
h file based on the commits found in packfiles. Includes all commits from the existing commit graph file. Outputs the checksum hash of the written file. - ++ +With `--update-head` option, update the graph-head file to point +to the written graph file. 'read':: @@ -53,6 +55,13 @@ EXAMPLES

[PATCH v2] hash: update obsolete reference to SHA1_HEADER

2018-02-07 Thread brian m. carlson
We moved away from SHA1_HEADER to a preprocessor if chain, but didn't update the comment discussing the platform defines. Update this comment so it reflects the current state of our codebase. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- hash.h | 4 ++-- 1 file chan

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

2018-02-05 Thread Derrick Stolee
--read, consider the graph file graph-.graph. + +--write:: + Write a new graph file to the pack directory. (Cannot be combined + with --read.) I think this should also mention that it prints the generated graph file's checksum. + +--update-head:: + When used with --write, update the

<    1   2   3   4   5   6   7   8   9   10   >