[PATCH] doc: am --show-current-patch gives an entire e-mail message

2019-10-22 Thread Junio C Hamano
The existing wording gives an impression that it only gives the contents of the $GIT_DIR/rebase-apply/patch file, i.e. the patch proper, but the option actually emits the entire e-mail message being processed (iow, one of the output files from "git mailsplit"). Signed-off-by: Junio C Hamano ---

[PATCH v3 1/1] config: move documentation to config.h

2019-10-22 Thread Heba Waly via GitGitGadget
From: Heba Waly Move the documentation from Documentation/technical/api-config.txt into config.h as it's easier for the developers to find the usage information beside the code instead of looking for it in another doc file, also documentation/technical/api-config.txt is removed because the inform

[PATCH v3 0/1] [Outreachy] config: move documentation to config.h

2019-10-22 Thread Heba Waly via GitGitGadget
Move the documentation from Documentation/technical/api-config.txt into config.h as it's easier for the developers to find the usage information beside the code instead of looking for it in another doc file, also documentation/technical/api-config.txt is removed because the information it has is no

Re: [PATCH] pretty: Add "%aU"|"%au" option to output author's username

2019-10-22 Thread Jeff King
On Tue, Oct 22, 2019 at 07:28:47PM -0400, Prarit Bhargava wrote: > In many projects the number of contributors is low enough that users know > each other and the full email address doesn't need to be displayed. > Displaying only the author's username saves a lot of columns on the screen. > For exa

Re: [PATCH v2 1/1] config: move documentation to config.h

2019-10-22 Thread Heba Waly
On Wed, Oct 23, 2019 at 9:59 AM Emily Shaffer wrote: > > On Tue, Oct 22, 2019 at 07:05:06AM +, Heba Waly via GitGitGadget wrote: > > From: Heba Waly > > > > Move the documentation from Documentation/technical/api-config.txt into > > config.h > > This is still a little thin for what we usually

Re: [Git Developer Blog] [PATCH] post: a tour of git's object types

2019-10-22 Thread Junio C Hamano
Emily Shaffer writes: > +# Commit > + > +This is the one we're all familiar with - commits are those things we write > at > +1am, angry at a pesky bug, and label with something like "really fix it this > +time", right? > + > +A commit references exactly one tree. That's the root directory of you

Re: [RFC/WIP] range-diff: show old/new blob OIDs in comments

2019-10-22 Thread Junio C Hamano
Eric Wong writes: > What Konstantin said about git repos being transient. > It wasn't too much work to recreate those blobs from > scratch since git-apply has done it since 2005. ;-) > We could get around transient repos with automatic mirroring > bots which never deletes or overwrites anything

Re: [PATCH 5/5] path.c: don't call the match function without value in trie_find()

2019-10-22 Thread Junio C Hamano
SZEDER Gábor writes: >> - b9317d55a3 added two new keys to the trie: 'logs/refs/rewritten' >> and 'logs/refs/worktree', next to the already existing >> 'logs/refs/bisect'. This resulted in a trie node with the path >> 'logs/refs', which didn't exist before, and which doesn't have a

Re: [PATCH v5 00/17] New sparse-checkout builtin and "cone" mode

2019-10-22 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > V4 UPDATE: Rebased on latest master to include ew/hashmap and > ds/include-exclude in the base. > > This series makes the sparse-checkout feature more user-friendly. While > there, I also present a way to use a limited set of patterns to gain a > signif

Re: [PATCH v5 13/17] read-tree: show progress by default

2019-10-22 Thread Junio C Hamano
Derrick Stolee writes: >> I'm slightly wary of changing the output of plumbing commands >> like this. If a script wants progress output it can already get >> it by passing --verbose. With this change a script that does not >> want that output now has to pass --no-verbose. > > If a script is calli

Re: [PATCH v3 2/2] git_path(): handle `.lock` files correctly

2019-10-22 Thread Junio C Hamano
SZEDER Gábor writes: >> +char *base = buf->buf + git_dir_len, *base2 = NULL; >> + >> +if (ends_with(base, ".lock")) >> +base = base2 = xstrndup(base, strlen(base) - 5); > > Hm, this adds the magic number 5 and calls strlen(base) twice, because > ends_with() calls strip_suffix(

Re: [PATCH 0/3] commit: fix advice for empty commits during rebases

2019-10-22 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), we > introduced a helpful message that suggests to run git cherry-pick --skip > (instead of the previous message that talked about git reset) when a > cherry-pick failed due to

Re: [PATCH 3/3] commit: give correct advice for empty commit during a rebase

2019-10-22 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > Note: we take pains to handle the situation when a user runs a `git > cherry-pick` _during_ a rebase. This is quite valid (e.g. in an `exec` > line in an interactive rebase). On the other hand, it is not possible to > run a rebase during a cherry-p

Re: [BUG] "--show-current-patch" return a mail instead of a patch

2019-10-22 Thread Junio C Hamano
Jerome Pouiller writes: > Hello all, > > I try to use "git am" to apply a patch sent using "git send-email". This > patch does not apply properly. I try to use "git am --show-current-patch" > to understand the problem. However, since original mail is encoded in quoted- > printable, data returned

Re: [PATCH] t7419: change test_must_fail to ! for grep

2019-10-22 Thread Junio C Hamano
Denton Liu writes: > According to t/README, test_must_fail() should only be used to test for > failure in Git commands. Replace the invocations of > `test_must_fail grep` with `! grep`. > > Signed-off-by: Denton Liu > --- > *sigh* Here's another cleanup patch for 'dl/submodule-set-branch'. It's

Re: [PATCH v2 1/1] config: move documentation to config.h

2019-10-22 Thread Junio C Hamano
Emily Shaffer writes: >> ... >> +/** >> + * The config API gives callers a way to access Git configuration files >> + * (and files which have the same syntax). See linkgit:git-config[1] for a > > Ah, here's another place where the Asciidoc link isn't going to do > anything anymore. > > Otherwise

Re: [PATCH v2 2/2] git_path(): handle `.lock` files correctly

2019-10-22 Thread Junio C Hamano
Johannes Schindelin writes: > However, I think this is _really_ ugly and intrusive. The opposite of > what my goals were. > > So I think I'll just bite the bullet and use a temporary copy if the > argument ends in `.lock`. Sounds like a quite sensible design decision to me.

Re: [PATCH v5 1/2] format-patch: create leading components of output directory

2019-10-22 Thread Junio C Hamano
Bert Wesarg writes: > Please ignore this. Will rebase on 2.24-rc0 and will only include the > test changes. Thanks.

Re: [PATCH v2 0/2] Fix the speed of the CI (Visual Studio) tests

2019-10-22 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > Changes since v1: > > * Fixed typo "nore" -> "nor" in the commit message. > > Johannes Schindelin (2): > ci(visual-studio): use strict compile flags, and optimization > ci(visual-studio): actually run the tests in parallel > > azure-pipelines

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-22 Thread Junio C Hamano
Jeff King writes: > But here's where it gets tricky. In addition to catching any size > mismatches, this will also catch signedness problems. I.e., if we make > OPT_INTEGER() use "intp", then everybody passing in &unsigned_var now > gets a compiler warning. Which maybe is a good thing, I dunno.

Re: [RFC/WIP] range-diff: show old/new blob OIDs in comments

2019-10-22 Thread Eric Wong
Johannes Schindelin wrote: > Hi Eric, > > > On Thu, 17 Oct 2019, Eric Wong wrote: > > > (WIP, mostly stream-of-concious notes + reasoning) > > > > When using "git format-patch --range-diff", the pre and > > post-image blob OIDs are in each email, while the exact > > commit OIDs are rarely share

Re: [PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread Jeff King
On Tue, Oct 22, 2019 at 08:48:20PM -0400, Jeff King wrote: > I admit I am puzzled, though, _why_ the presence of the submodule > matters. That is, from your explanation, I thought the issue was simply > that `fetch` walked (and marked) some commits, and the flags overlapped > with what the commit-

Re: [PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread Jeff King
On Tue, Oct 22, 2019 at 08:35:57PM -0400, Derrick Stolee wrote: > > In the cover letter Derrick mentioned that he used > > https://github.com/derrickstolee/numbers for testing, and that repo > > has a submodule as well. > > I completely forgot that I put a submodule in that repo. It makes sense >

Re: [PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread Derrick Stolee
On 10/22/2019 7:35 PM, SZEDER Gábor wrote: > On Tue, Oct 22, 2019 at 05:45:54PM -0400, Jeff King wrote: >> Puzzling... > > Submodules? > > $ cd ~/src/git/ > $ git quotelog 86cfd61e6b > 86cfd61e6b (sha1dc: optionally use sha1collisiondetection as a submodule, > 2017-07-01) > $ git init

[PATCH 1/1] Documentation: fix a bunch of typos, both old and new

2019-10-22 Thread Elijah Newren via GitGitGadget
From: Elijah Newren Signed-off-by: Elijah Newren --- Documentation/CodingGuidelines | 2 +- Documentation/RelNotes/1.7.0.2.txt | 2 +- Documentation/RelNotes/1.7.10.4.txt| 2 +- Documentation/RelNotes/1.7.12.3.txt| 2 +- Do

[PATCH 0/1] Thyme two ficks sum Documentaton tyops and speling erors!

2019-10-22 Thread Elijah Newren via GitGitGadget
We have a number of typos and spelling errors that I spotted under Documentation/. It'd be nice if someone could double check that I placed the missing right parenthesis correctly in Documentation/technical/api-trace2.txt. Also, not sure if folks would be happy or unhappy with me un-splitting a wo

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-22 Thread SZEDER Gábor
On Wed, Oct 23, 2019 at 01:23:25AM +0200, Johannes Schindelin wrote: > On Fri, 18 Oct 2019, SZEDER Gábor wrote: > > > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via > > GitGitGadget wrote: > > > From: Johannes Schindelin > > > > > > The CI builds are failing for Mac OS X due t

[PATCH v3 0/1] ci: update caskroom/cask/perforce to new location

2019-10-22 Thread Derrick Stolee via GitGitGadget
Running CI on Mac OS X in Azure Pipelines is currently broken due to a moved homebrew package. Change since v2: * The commit message was improved (thanks Gábor). Change since v1: -The step is now more robust (by pulling homebrew-cask and trying again if the pull failed). Thanks, -Stolee Johan

[PATCH v3 1/1] ci(osx): use new location of the `perforce` cask

2019-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The Azure Pipelines builds are failing for macOS due to a change in the location of the perforce cask. The command outputs the following error: + brew install caskroom/cask/perforce Error: caskroom/cask was moved. Tap homebrew/cask-cask instead. So let's try to

Re: [PATCH 1/1] documentation: remove empty doc files

2019-10-22 Thread Junio C Hamano
Emily Shaffer writes: > As for the content of this change, I absolutely approve. I've stumbled > across some of these empty docs while looking for answers before and > found it really demoralizing - the community is so interested in > teaching me how to contribute that they've sat on a TODO for 1

Re: [PATCH] pretty: Add "%aU"|"%au" option to output author's username

2019-10-22 Thread brian m. carlson
On 2019-10-22 at 23:28:47, Prarit Bhargava wrote: > In many projects the number of contributors is low enough that users know > each other and the full email address doesn't need to be displayed. > Displaying only the author's username saves a lot of columns on the screen. > For example displaying

Re: [PATCH] pretty: Add "%aU"|"%au" option to output author's username

2019-10-22 Thread Junio C Hamano
Prarit Bhargava writes: > Subject: Re: [PATCH] pretty: Add "%aU"|"%au" option to output author's > username Downcase "Add" (see "git shortlog --no-merges -100 master" and mimick the project convention). > Add a "%aU"|"%au" option that outputs the author's email username. Even though I persona

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-22 Thread Junio C Hamano
Johannes Schindelin writes: >> This is already in 'next' X-<; reverting a merge is cheap but I >> prefer to do so when we already have a replacement. > > I force-pushed (see https://github.com/gitgitgadget/git/pull/400), and > once Stolee approves, he will submit v3. This will only change the > c

Re: [PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread SZEDER Gábor
On Tue, Oct 22, 2019 at 05:45:54PM -0400, Jeff King wrote: > On Tue, Oct 22, 2019 at 04:33:16PM -0400, Jeff King wrote: > > > > I have failed to produce a test using the file:// protocol that > > > demonstrates this bug. > > > > Hmm, from the description, it sounds like it should be easy. I might

Re: [RFC PATCH 1/7] Makefile: alphabetically sort += lists

2019-10-22 Thread Johannes Schindelin
Hi, On Mon, 21 Oct 2019, Denton Liu wrote: > Hi Johannes, > > On Mon, Oct 21, 2019 at 08:44:40PM +0200, Johannes Schindelin wrote: > > Hi Junio, > > > > On Fri, 18 Oct 2019, Junio C Hamano wrote: > > > > > Denton Liu writes: > > > > > > > There are many += lists in the Makefile and, over time, t

[PATCH 2/3] sequencer: export the function to get the path of `.git/rebase-merge/`

2019-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The presence of this path will be used in the next commit to fix an incorrect piece of advice in `git commit` when in the middle of a rebase. Signed-off-by: Johannes Schindelin --- sequencer.c | 4 ++-- sequencer.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(

[PATCH 0/3] commit: fix advice for empty commits during rebases

2019-10-22 Thread Johannes Schindelin via GitGitGadget
In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), we introduced a helpful message that suggests to run git cherry-pick --skip (instead of the previous message that talked about git reset) when a cherry-pick failed due to an empty patch. However, the same message is displayed d

[PATCH 3/3] commit: give correct advice for empty commit during a rebase

2019-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), `git commit` learned to suggest to run `git cherry-pick --skip` when trying to cherry-pick an empty patch. However, it was overlooked that there are more conditions than just a `git cherry-pick` when

[PATCH 1/3] cherry-pick: add test for `--skip` advice in `git commit`

2019-10-22 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), `git commit` learned to suggest to run `git cherry-pick --skip` when trying to cherry-pick an empty patch, but that was never tested for. Here is a test that verifies that a message is given to the us

[PATCH] pretty: Add "%aU"|"%au" option to output author's username

2019-10-22 Thread Prarit Bhargava
In many projects the number of contributors is low enough that users know each other and the full email address doesn't need to be displayed. Displaying only the author's username saves a lot of columns on the screen. For example displaying "prarit" instead of "pra...@redhat.com" saves 11 columns.

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-22 Thread Johannes Schindelin
Hi Junio, On Mon, 21 Oct 2019, Junio C Hamano wrote: > SZEDER Gábor writes: > > > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via > > GitGitGadget wrote: > >> From: Johannes Schindelin > >> > >> The CI builds are failing for Mac OS X due to a change in the > > > > s/CI/Azure

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-22 Thread Johannes Schindelin
Hi Gábor, On Fri, 18 Oct 2019, SZEDER Gábor wrote: > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via > GitGitGadget wrote: > > From: Johannes Schindelin > > > > The CI builds are failing for Mac OS X due to a change in the > > s/CI/Azure Pipelines/ > > Our Travis CI builds are

Re: [PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread Jeff King
On Tue, Oct 22, 2019 at 04:33:16PM -0400, Jeff King wrote: > > I have failed to produce a test using the file:// protocol that > > demonstrates this bug. > > Hmm, from the description, it sounds like it should be easy. I might > poke at it a bit. Hmph. I can reproduce it here, but it seems to de

[PATCH v2 0/3] Dir rename fixes

2019-10-22 Thread Elijah Newren via GitGitGadget
This series improves a couple things found after looking into things Dscho flagged: * clarify and slightly restructure code in the get_renamed_dir_portion() function * extend support of detecting renaming/merging of one directory into another to support the root directory as a target direc

[PATCH v2 2/3] merge-recursive: fix merging a subdirectory into the root directory

2019-10-22 Thread Elijah Newren via GitGitGadget
From: Elijah Newren We allow renaming all entries in e.g. a directory named z/ into a directory named y/ to be detected as a z/ -> y/ rename, so that if the other side of history adds any files to the directory z/ in the mean time, we can provide the hint that they should be moved to y/. There i

[PATCH v2 3/3] t604[236]: do not run setup in separate tests

2019-10-22 Thread Elijah Newren via GitGitGadget
From: Elijah Newren Transform the setup "tests" to setup functions, and have the actual tests call the setup functions. Advantages: * Should make life easier for people working with webby CI/PR builds who have to abuse mice (and their own index finger as well) in order to switch from

[PATCH v2 1/3] merge-recursive: clean up get_renamed_dir_portion()

2019-10-22 Thread Elijah Newren via GitGitGadget
From: Elijah Newren Dscho noted a few things making this function hard to follow. Restructure it a bit and add comments to make it easier to follow. The restructurings include: * There was a special case if-check at the end of the function checking whether someone just renamed a file with

Re: Git in Outreachy December 2019?

2019-10-22 Thread Emily Shaffer
On Fri, Sep 20, 2019 at 06:47:01PM -0700, Emily Shaffer wrote: > On Fri, Sep 20, 2019 at 10:04:48AM -0700, Jonathan Tan wrote: > > > Prospective mentors need to sign up on that site, and should propose a > > > project they'd be willing to mentor. > > > > [snip] > > > > > I'm happy to discuss poss

Re: [PATCH 1/1] documentation: remove empty doc files

2019-10-22 Thread Emily Shaffer
On Tue, Oct 22, 2019 at 06:19:35PM +, Heba Waly via GitGitGadget wrote: > From: Heba Waly > > Remove empty and redundant documentation files from the > Documentation/technical/ directory. > > As part of moving the documentation from Documentation/technical/api-* to > header files, the follow

Re: [PATCH v2 1/1] config: move documentation to config.h

2019-10-22 Thread Emily Shaffer
On Tue, Oct 22, 2019 at 07:05:06AM +, Heba Waly via GitGitGadget wrote: > From: Heba Waly > > Move the documentation from Documentation/technical/api-config.txt into > config.h This is still a little thin for what we usually want from commit messages. Try to imagine that five years from now,

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-22 Thread Emily Shaffer
On Sun, Oct 20, 2019 at 09:35:17PM +1300, Heba Waly wrote: > On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer > wrote: > > > > On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote: > > > From: Heba Waly > > > > Hi Heba, > > > > Thanks for the patch! > > > > I'd like to highli

Re: is commitGraph useful on the server side?

2019-10-22 Thread Konstantin Ryabitsev
On Tue, Oct 22, 2019 at 04:06:16PM -0400, Jeff King wrote: I'm biased, but I think the commit-graph is generally really good to have in almost all cases. I actually do not know of a good reason to _not_ have it. A lot depends on how much you do on the server. If you're serving a web interface

Re: [PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread Jeff King
On Tue, Oct 22, 2019 at 05:28:55PM +, Derrick Stolee via GitGitGadget wrote: > However, the UNINTERESTING flag is used in lots of places in the > codebase. This flag usually means some barrier to stop a commit walk, > such as in revision-walking to compare histories. It is not often > cleared

Re: is commitGraph useful on the server side?

2019-10-22 Thread Jeff King
[resending, looks like we lost Konstantin from the cc] On Tue, Oct 22, 2019 at 03:44:28PM -0400, Derrick Stolee wrote: > I'm biased, but I think the commit-graph is generally really good to have > in almost all cases. I actually do not know of a good reason to _not_ have > it. A lot depends on h

Re: is commitGraph useful on the server side?

2019-10-22 Thread Jeff King
On Tue, Oct 22, 2019 at 03:44:28PM -0400, Derrick Stolee wrote: > I'm biased, but I think the commit-graph is generally really good to have > in almost all cases. I actually do not know of a good reason to _not_ have > it. A lot depends on how much you do on the server. If you're serving a web in

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-22 Thread Jonathan Tan
First, the commit message could probably be reordered to start with the main point (reusing of packfiles at object granularity instead of allowing reuse of only one contiguous region). To specific points: > The dynamic array of `struct reused_chunk` is useful > because we need to know not just the

Re: is commitGraph useful on the server side?

2019-10-22 Thread Derrick Stolee
On 10/22/2019 12:51 PM, Konstantin Ryabitsev wrote: > Hi, all: > > I've read the docs on commitGraph and it's not 100% clear to me if turning it > on and generating commit graphs would be useful on the server-side. I know > it's going to be enabled by default and automatically generated whenever

Re: [RFC/WIP] range-diff: show old/new blob OIDs in comments

2019-10-22 Thread Konstantin Ryabitsev
On Tue, Oct 22, 2019 at 09:18:35PM +0200, Johannes Schindelin wrote: As to recreating blobs from mails: Wow. That's quite a length you're going, and I think it is a shame that you have to. If only every contribution came accompanied with a pullable branch in a public repository. Trouble is, tho

Re: [RFC/WIP] range-diff: show old/new blob OIDs in comments

2019-10-22 Thread Johannes Schindelin
Hi Eric, On Thu, 17 Oct 2019, Eric Wong wrote: > (WIP, mostly stream-of-concious notes + reasoning) > > When using "git format-patch --range-diff", the pre and > post-image blob OIDs are in each email, while the exact > commit OIDs are rarely shared via emails (only the tip > commit from "git re

Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

2019-10-22 Thread Elijah Newren
Sorry for the long delay before getting back to this; the other stuff I was working on took longer than expected. On Mon, Oct 14, 2019 at 3:42 AM Johannes Schindelin wrote: > On Sat, 12 Oct 2019, Elijah Newren wrote: > > On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin > > wrote: > > > > > >

Re: email as a bona fide git transport

2019-10-22 Thread Eric Wong
Vegard Nossum wrote: > I sent v2 of the patches (with metadata _after_ the diff) to the git > list here: > > https://public-inbox.org/git/20191022114518.32055-1-vegard.nos...@oracle.com/T/#u > > As I wrote in there, we could already today start using > >git am --message-id > > when applyin

[PATCH 0/1] [Outreachy] documentation: remove empty doc files

2019-10-22 Thread Heba Waly via GitGitGadget
Remove empty and redundant documentation files from the Documentation/technical/ directory. As part of moving the documentation from Documentation/technical/api-* to header files, the following files are deleted because they include only TODO messages with no documentation: Documentation/technical

[PATCH 1/1] documentation: remove empty doc files

2019-10-22 Thread Heba Waly via GitGitGadget
From: Heba Waly Remove empty and redundant documentation files from the Documentation/technical/ directory. As part of moving the documentation from Documentation/technical/api-* to header files, the following files are deleted because they include only TODO messages with no documentation to be

Re: [PATCH v2 3/9] ewah/bitmap: introduce bitmap_word_alloc()

2019-10-22 Thread Jonathan Tan
> From: Jeff King > > In a following commit we will need to allocate a variable > number of bitmap words, instead of always 32, so let's add > bitmap_word_alloc() for this purpose. > > We will also always access at least one word for each bitmap, > so we want to make sure that at least one is al

[PATCH 0/1] [v2.24.0-rc0 BUG] fetch.writeCommitGraph fails on first fetch

2019-10-22 Thread Derrick Stolee via GitGitGadget
While dogfooding, Johannes found a bug in the fetch.writeCommitGraph config behavior. While his example initially happened during a clone with --recurse-submodules, we found that it is actually a problem with the first fetch after a new clone and no existing commit-graph file: $ git clone test $

[PATCH 1/1] commit-graph: fix writing first commit-graph during fetch

2019-10-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee While dogfooding, Johannes found a bug in the fetch.writeCommitGraph config behavior. While his example initially happened during a clone with --recurse-submodules, we found that it is actually a problem with the first fetch after a new clone and no existing commit-graph file

is commitGraph useful on the server side?

2019-10-22 Thread Konstantin Ryabitsev
Hi, all: I've read the docs on commitGraph and it's not 100% clear to me if turning it on and generating commit graphs would be useful on the server-side. I know it's going to be enabled by default and automatically generated whenever "git gc" runs, so I'm trying to figure out if it'll be use

Re: email as a bona fide git transport

2019-10-22 Thread Vegard Nossum
On 10/22/19 3:53 PM, Theodore Y. Ts'o wrote: On Tue, Oct 22, 2019 at 02:11:22PM +0200, Vegard Nossum wrote: As I wrote in there, we could already today start using git am --message-id when applying patches and this would provide something that a bot could annotate with git notes pointing

Re: [PATCH v3 2/2] git_path(): handle `.lock` files correctly

2019-10-22 Thread SZEDER Gábor
On Mon, Oct 21, 2019 at 09:54:42PM +, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Ever since worktrees were introduced, the `git_path()` function _really_ > needed to be called e.g. to get at the path to `logs/HEAD` (`HEAD` is > specific to the worktree, and t

Re: [git-for-windows] Git for Windows v2.24.0-rc0, was Re: [ANNOUNCE] Git v2.24.0-rc0

2019-10-22 Thread Philip Oakley
Hi Dscho, Install went Ok. Did a quick test on the config locations and `git config -l -show-origin` has 'lost' the ProgramData location as planned. The minor pedant did notice that the new location is listed slightly differently from the release notes. `file:C:/Program Files/Git/mingw64/..

[PATCH v2 0/1] vreportf: Fix interleaving issues, remove 4096 limitation

2019-10-22 Thread Alexandr Miloslavskiy via GitGitGadget
This fixes t5516 on Windows. For detailed explanation please refer to code comments in this commit. There was a lot of back-and-forth already in vreportf(): d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving 389d1767 (2009-03-25) - Buffer size increased to 1024 to avoid tr

[PATCH v2 1/1] vreportf: Fix interleaving issues, remove 4096 limitation

2019-10-22 Thread Alexandr Miloslavskiy via GitGitGadget
From: Alexandr Miloslavskiy This also fixes t5516 on Windows VS build. For detailed explanation please refer to code comments in this commit. There was a lot of back-and-forth already in vreportf(): d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving 389d1767 (2009-03-25)

[PATCH 1/1] vreportf: Fix interleaving issues, remove 4096 limitation

2019-10-22 Thread Alexandr Miloslavskiy via GitGitGadget
From: Alexandr Miloslavskiy This also fixes t5516 on Windows VS build. For detailed explanation please refer to code comments in this commit. There was a lot of back-and-forth already in vreportf(): d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving 389d1767 (2009-03-25)

[PATCH 0/1] vreportf: Fix interleaving issues, remove 4096 limitation

2019-10-22 Thread Alexandr Miloslavskiy via GitGitGadget
This fixes t5516 on Windows. For detailed explanation please refer to code comments in this commit. There was a lot of back-and-forth already in vreportf(): d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving 389d1767 (2009-03-25) - Buffer size increased to 1024 to avoid tr

Re: [GSoC] Follow-up post

2019-10-22 Thread Christian Couder
Hi Matheus, On Mon, Oct 21, 2019 at 7:14 PM Matheus Tavares Bernardino wrote: > > I wrote a small follow-up post to talk about the conclusion of my GSoC > project. I believe the main remaining tasks are now finally complete > :) If you would be interested in taking a look, the post is at > https:

Re: email as a bona fide git transport

2019-10-22 Thread Theodore Y. Ts'o
On Tue, Oct 22, 2019 at 02:11:22PM +0200, Vegard Nossum wrote: > > As I wrote in there, we could already today start using > > git am --message-id > > when applying patches and this would provide something that a bot could > annotate with git notes pointing to lore/LKML/LWN/whatever. I think t

Re: [Outreachy] First contribution

2019-10-22 Thread Miriam R.
El lun., 21 oct. 2019 a las 20:35, Emily Shaffer () escribió: > > On Mon, Oct 21, 2019 at 12:39:16PM +0200, Miriam R. wrote: > > Dear Git developers, > > I’m an Outreachy applicant, I would like to make my contribution to > > apply to this Outreachy internship period. > > Welcome, Miriam! Good to h

Re: email as a bona fide git transport

2019-10-22 Thread Vegard Nossum
On 10/20/19 8:28 AM, Vegard Nossum wrote: On 10/20/19 5:17 AM, Willy Tarreau wrote: On Fri, Oct 18, 2019 at 03:14:56PM -0400, Theodore Y. Ts'o wrote: On Fri, Oct 18, 2019 at 06:50:51PM +0200, Vegard Nossum wrote: The problem I ran into with putting the metadata at the end was detecting where

[RFC PATCH v2 3/3] am: add --exact

2019-10-22 Thread Vegard Nossum
This uses exact metadata when creating the commit object, hopefully reconstructing the commit with the exact same SHA1. Note: In order to be forwards compatible with new commit formats we may want a new helper for creating a commit with the exact metadata that is present (and then validating the r

[RFC PATCH v2 2/3] mailinfo: collect commit metadata from mail

2019-10-22 Thread Vegard Nossum
"Metadata" here is used for the raw commit metadata which gets included in a patch when using 'git format-patch --complete'. The new email format is roughly: 1. email headers (ends with a blank line) 2. changelog (ends with "---" or when the diff starts) 3. comments (optional; ends when the

[RFC PATCH v2 1/3] format-patch: add --complete

2019-10-22 Thread Vegard Nossum
This option causes the raw commit data to be inserted between the changelog and the diffstat when you run git-format-patch. With a following patch to 'git am', this will allow the exact reconstruction of the commit to the point where the sha1 will be the same. There is also a new config option con

[RFC PATCH v2 0/3] format-patch --complete / am --exact

2019-10-22 Thread Vegard Nossum
[I'm intentionally keeping the recipient list short to avoid hitting the Oracle spam filter on outgoing email, hopefully everybody on the git side who is interested will receive this via the mailing list and I will link this submission from the workflows list too.] Background: There seems to be a

Re: [RFC PATCH 1/7] Makefile: alphabetically sort += lists

2019-10-22 Thread Junio C Hamano
Jeff King writes: >> ... >> I agree with you that it did correctly sort them in ASCII order. > > What's the purpose of sorting them, though? I thought it was less for > aesthetics and more to to keep lines deterministic (to avoid two > branches adding the same line in different places, thus causi

[PATCH v3 12/14] t5520: replace subshell cat comparison with test_cmp

2019-10-22 Thread Denton Liu
We currently have many instances of `test = $(cat )` and `test $(cat ) = `. In the case where this fails, it will be difficult for a developer to debug since the output will be masked. Replace these instances with invocations of test_cmp(). This change was done with the following GNU sed express

[PATCH v3 13/14] t5520: remove redundant lines in test cases

2019-10-22 Thread Denton Liu
In the previous patches, the mechanical application of changes left some duplicate statements in the test case which were not strictly incorrect but were redundant and possibly misleading. Remove these duplicate statements so that it is clear that the intent behind the tests are that the content of

[PATCH v3 09/14] t5520: use test_cmp_rev where possible

2019-10-22 Thread Denton Liu
In case an invocation of `git rev-list` fails within the subshell, the failure will be masked. Remove the subshell and use test_cmp_rev() so that failures can be discovered. This change was done with the following sed expressions: s/test "$(git rev-parse.* \([^)]*\))" = "$(git rev-parse

[PATCH v3 10/14] t5520: test single-line files by git with test_cmp

2019-10-22 Thread Denton Liu
In case an invocation of a Git command fails within the subshell, the failure will be masked. Replace the subshell with a file-redirection and a call to test_cmp. This change was done with the following GNU sed expressions: s/\(\s*\)test \([^ ]*\) = "$(\(git [^)]*\))"/\1echo \2 >expect \

[PATCH v3 08/14] t5520: replace test -{n,z} with test-lib functions

2019-10-22 Thread Denton Liu
When wrapping a Git command in a subshell within another command, we throw away the Git command's exit code. In case the Git command fails, we would like to know about it rather than the failure being silent. Extract Git commands so that their exit codes are not lost. Instead of using `test -n` or

[PATCH v3 14/14] t5520: replace `! git` with `test_must_fail git`

2019-10-22 Thread Denton Liu
Currently, if a Git command fails in an unexpected way, such as a segfault, it will be masked and ignored. Replace the ! with test_must_fail so that only expected failures pass. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/

[PATCH v3 06/14] t5520: remove spaces after redirect operator

2019-10-22 Thread Denton Liu
The style for tests in Git is to have the redirect operator attached to the filename with no spaces. Fix test cases where this is not the case. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t5520-pull.sh b/t/t5520-p

[PATCH v3 07/14] t5520: use test_line_count where possible

2019-10-22 Thread Denton Liu
Instead of rolling our own functionality to test the number of lines a command outputs, use test_line_count() which provides better debugging information in the case of a failure. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/

[PATCH v3 11/14] t5520: don't put git in upstream of pipe

2019-10-22 Thread Denton Liu
Before, if the invocation of git failed, it would be masked by the pipe since only the return code of the last element of a pipe is used. Rewrite the test to put the Git command on its own line so its return code is not masked. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 3 ++- 1 file change

[PATCH v3 05/14] t5520: replace test -f with test-lib functions

2019-10-22 Thread Denton Liu
Although `test -f` has the same functionality as test_path_is_file(), in the case where test_path_is_file() fails, we get much better debugging information. Replace `test -f` with test_path_is_file() so that future developers will have a better experience debugging these test cases. Also, in the

[PATCH v3 03/14] t5520: use sq for test case names

2019-10-22 Thread Denton Liu
The usual convention is for test case names to be written between single-quotes. Change all double-quoted test case names to single-quotes except for two test case names that use variables within. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletion

[PATCH v3 04/14] t5520: let sed open its own input

2019-10-22 Thread Denton Liu
We were using a redirection operator to feed input into sed. However, since sed is capable of opening its own files, make sed open its own files instead of redirecting input into it. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a

[PATCH v3 00/14] t5520: various test cleanup

2019-10-22 Thread Denton Liu
Like earlier patchsets, I want to implement a feature that involves modifications to the test suite. Since that feature will probably take a while to polish up, however, let's clean up the test suite in a separate patchset first so it's not blocked by the feature work. 1/15 is a general improvemen

[PATCH v3 01/14] t: teach test_cmp_rev to accept ! for not-equals

2019-10-22 Thread Denton Liu
Currently, in the case where we are using test_cmp_rev() to report not-equals, we write `! test_cmp_rev`. However, since test_cmp_rev() contains r1=$(git rev-parse --verify "$1") && r2=$(git rev-parse --verify "$2") && In the case where `git rev-parse` segfaults and dies unexpecte

[PATCH v3 02/14] t5520: improve test style

2019-10-22 Thread Denton Liu
Improve the test style by removing leading and trailing empty lines within test cases. Also, reformat multi-line subshells to conform to the existing style. Signed-off-by: Denton Liu --- t/t5520-pull.sh | 88 + 1 file changed, 45 insertions(+), 43

[BUG] "--show-current-patch" return a mail instead of a patch

2019-10-22 Thread Jerome Pouiller
Hello all, I try to use "git am" to apply a patch sent using "git send-email". This patch does not apply properly. I try to use "git am --show-current-patch" to understand the problem. However, since original mail is encoded in quoted- printable, data returned by --show-current-patch is not a vali

[PATCH] t7419: change test_must_fail to ! for grep

2019-10-22 Thread Denton Liu
According to t/README, test_must_fail() should only be used to test for failure in Git commands. Replace the invocations of `test_must_fail grep` with `! grep`. Signed-off-by: Denton Liu --- *sigh* Here's another cleanup patch for 'dl/submodule-set-branch'. It's inspired by Eric Sunshine's commen

  1   2   >