Re: [RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation

Hi Antonio, On Fri, Apr 13, 2018 at 1:07 AM, Antonio Ospite wrote: > This is to test custom gitmodules file paths. The default path can be > overridden using the 'GIT_MODULES_FILE' environmental variable. > > Maybe In the final patch the option should be set only when running >

Re: [RFC PATCH] Add "git show --follow-symlinks HEAD:symlink"

On Fri, Apr 13, 2018 at 10:28:13AM -0700, Stefan Beller wrote: > Hi Michael, Hi Stefan, > thanks for the patch, Thanks for the review. [..] > The patch seems reasonable, apart from minor nits: > In the test we'd prefer no whitespace on the right side of the redirection, > i.e. echo content >foo

Re: [RFC PATCH] Add "git show --follow-symlinks HEAD:symlink"

On Fri, Apr 13 2018, Michael Vogt wrote: > The update patch is attached as an inline attachement. Your patch still just shows up as a straight-up attachment in many E-Mail clients. Note the difference between what your patch (https://public-inbox.org/git/20180413174819.GA19030@bod/raw) and a

[RFC PATCH v9 0/30] Add directory rename detection to git

This series builds on commit febb3a86098f ("merge-recursive: avoid spurious rename/rename conflict from dir renames", 2018-02-14), also known as patch 29/30 of en/rename-directory-detection. That patch series has been reverted from master[1], due to a bug with patch 30/30, so does not apply to

[PATCH v9 29.75/30] merge-recursive: Fix was_tracked() to quit lying with some renamed paths

In commit aacb82de3ff8 ("merge-recursive: Split was_tracked() out of would_lose_untracked()", 2011-08-11), was_tracked() was split out of would_lose_untracked() with the intent to provide a function that could answer whether a path was tracked in the index before the merge. Sadly, it instead

[PATCH v9 29.25/30] merge-recursive: improve output precision around skipping updates

When a merge results in contents that already existed in HEAD (because the changes on a side branch were a subset of what was changed by HEAD), and those contents were already at the right path, the working directory updates can be skipped. However, the relevant code would sometimes claim the

[PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge

Add several tests checking whether updates can be skipped in a merge. Also add several similar testcases for where updates cannot be skipped in a merge to make sure that we skip if and only if we should. In particular: * Testcase 1a (particularly 1a-check-L) would have pointed out the

Re: Optimizing writes to unchanged files during merges?

On Fri, Apr 13, 2018 at 10:14 AM, Linus Torvalds wrote: > On Fri, Apr 13, 2018 at 12:02 AM, Elijah Newren wrote: >> However, it turns out we have this awesome function called >> "was_tracked(const char *path)" that was intended for answering this

Re: [PATCH] support: git show --follow-symlinks HEAD:symlink

On Fri, Apr 13 2018, Michael Vogt wrote: > Add support for the `--follow-symlinks` options to git-show. This > allows to write: > > git show --follow-symlink HEAD:path-a-symlink > > to get the content of the symlinked file. Thanks. Commit message would be better as something like:

Re: [PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge

On Fri, Apr 13, 2018 at 12:56 PM, Elijah Newren wrote: > Add several tests checking whether updates can be skipped in a merge. > Also add several similar testcases for where updates cannot be skipped in > a merge to make sure that we skip if and only if we should. > > In

Re: [PATCH] completion: reduce overhead of clearing cached --options

SZEDER Gábor writes: > To get the names of all '$__git_builtin_*' variables caching --options > of builtin commands in order to unset them, 8b0eaa41f2 (completion: > clear cached --options when sourcing the completion script, > 2018-03-22) runs a 'set |sed s///' pipeline.

[PATCH] support: git show --follow-symlinks HEAD:symlink

Add support for the `--follow-symlinks` options to git-show. This allows to write: git show --follow-symlink HEAD:path-a-symlink to get the content of the symlinked file. Signed-off-by: Michael Vogt --- Documentation/git-show.txt | 6 + builtin/log.c |

[PATCH v9 30/30] merge-recursive: fix check for skipability of working tree updates

The can-working-tree-updates-be-skipped check has had a long and blemished history. The update can be skipped iff: a) The merged contents match what was in HEAD b) The merged mode matches what was in HEAD c) The target path is usable and matches what was in HEAD Steps a & b are easy to

Re: [RFC PATCH] Add "git show --follow-symlinks HEAD:symlink"

On Fri, Apr 13, 2018 at 09:33:00PM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Fri, Apr 13 2018, Michael Vogt wrote: > > > The update patch is attached as an inline attachement. > > Your patch still just shows up as a straight-up attachment in many > E-Mail clients. Note the difference between

[PATCH v2 6/9] gpg-interface: extract gpg line matching helper

From: Jeff King Let's separate the actual line-by-line parsing of signatures from the notion of "is this a gpg signature line". That will make it easier to do more refactoring of this loop in future patches. Signed-off-by: Jeff King Signed-off-by: Ben Toews

[PATCH v2 7/9] gpg-interface: find the last gpg signature line

From: Jeff King A signed tag has a detached signature like this: object ... [...more header...] This is the tag body. -BEGIN PGP SIGNATURE- [opaque gpg data] -END PGP SIGNATURE- Our parser finds the _first_ line that appears to start a PGP signature

[PATCH v2 9/9] gpg-interface: handle alternative signature types

Currently you can only sign commits and tags using "gpg". You can _almost_ plug in a related tool like "gpgsm" (which uses S/MIME-style signatures instead of PGP) using gpg.program, as it has command-line compatibility. But there are a few rough edges: 1. gpgsm generates a slightly different

[PATCH v2 8/9] gpg-interface: prepare for parsing arbitrary PEM blocks

From: Jeff King In preparation for handling more PEM blocks besides "PGP SIGNATURE" and "PGP MESSAGE', let's break up the parsing to parameterize the actual block type. Signed-off-by: Jeff King Signed-off-by: Ben Toews --- gpg-interface.c |

[PATCH v2 2/9] gpg-interface: handle bool user.signingkey

From: Jeff King The config handler for user.signingkey does not check for a boolean value, and thus: git -c user.signingkey tag will segfault. We could fix this and even shorten the code by using git_config_string(). But our set_signing_key() helper is used by other code

[PATCH v2 3/9] gpg-interface: modernize function declarations

From: Jeff King Let's drop "extern" from our declarations, which brings us in line with our modern style guidelines. While we're here, let's wrap some of the overly long lines, and move docstrings for public functions to their declarations, since they document the interface.

[PATCH v2 0/9] gpg-interface: Multiple signing tools

Updated to incorporate feedback from v1. In addition to changes to the patches from v1, I added the missing `t7004: fix mistaken tag name` patch, which had caused some confusion (sorry about that). Thanks for everyone's feedback on v1. ### Interdiff (v1..v2): diff --git

[PATCH v2 5/9] gpg-interface: fix const-correctness of "eol" pointer

From: Jeff King We accidentally shed the "const" of our buffer by passing it through memchr. Let's fix that, and while we're at it, move our variable declaration inside the loop, which is the only place that uses it. Signed-off-by: Jeff King Signed-off-by: Ben

[PATCH v2 1/9] t7004: fix mistaken tag name

From: Jeff King We have a series of tests which create signed tags with various properties, but one test accidentally verifies a tag from much earlier in the series. Signed-off-by: Jeff King Signed-off-by: Ben Toews --- t/t7004-tag.sh | 2

[PATCH v2 4/9] gpg-interface: use size_t for signature buffer size

From: Jeff King Even though our object sizes (from which these buffers would come) are typically "unsigned long", this is something we'd like to eventually fix (since it's only 32-bits even on 64-bit Windows). It makes more sense to use size_t when taking an in-memory buffer.

Re: File versioning based on shallow Git repositories?

Hello Johannes, Johannes Schindelin writes: > On Fri, 13 Apr 2018, Jakub Narebski wrote: >> Hallvard Breien Furuseth writes: >> >>> Also maybe it'll be worthwhile to generate .git/info/grafts in a local >>> clone of the repo to get back

Re: [PATCH] Deprecate support for .git/info/grafts

On Fri, Apr 13, 2018 at 7:11 AM, Johannes Schindelin wrote: > The grafts feature was a convenient way to "stich together" ancient > history to the fresh start of linux.git. > [...] > The much younger feature implemented as `git replace` set out to remedy > those

Re: Optimizing writes to unchanged files during merges?

On Fri, Apr 13, 2018 at 12:02 AM, Elijah Newren wrote: > > I hope you don't mind me barging into your conversation I was getting tired of my own rambling anyway.. > However, it turns out we have this awesome function called > "was_tracked(const char *path)" that was intended

Re: Optimizing writes to unchanged files during merges?

Hi Linus, On Fri, Apr 13, 2018 at 10:14 AM, Linus Torvalds wrote: > > Comments? Because considering the problems this code has had, maybe > "stupid" really is the right approach... Would s/read/xread/ make sense in working_tree_matches ? If read returns

Re: Optimizing writes to unchanged files during merges?

On Fri, Apr 13, 2018 at 10:39 AM, Stefan Beller wrote: > > Would s/read/xread/ make sense in working_tree_matches ? Makes sense, yes. That patch was really more of a RFD than anything that should be applied. I would like to see the "might be same" flag pushed down so that

Re: [PATCH v6 05/15] sequencer: introduce the `merge` command

On 13/04/18 11:12, Phillip Wood wrote: > On 10/04/18 13:29, Johannes Schindelin wrote: >> +static int do_merge(struct commit *commit, const char *arg, int arg_len, >> +int flags, struct replay_opts *opts) >> +{ >> +int run_commit_flags = (flags & TODO_EDIT_MERGE_MSG) ? >> +

Bug: rebase -i creates committer time inversions on 'reword'

I just noticed that all commits in a 70-commit branch have the same committer timestamp. This is very unusual on Windows, where rebase -i of such a long branch takes more than one second (but not more than 3 or so thanks to the builtin nature of the command!). And, in fact, if you mark some

[RFC PATCH] checkout: Force matching mtime between files

Currently git does not control mtimes of files being checked out. This means that the only assumption you could make is that all files created or modified within a single checkout action will have mtime between start time and end time of this checkout. The relations between mtimes of different

Re: [RFC PATCH] Add "git show --follow-symlinks HEAD:symlink"

Hi Michael, thanks for the patch, > Thanks for the intial reivew. I updated the patch with a test and > documentation for the new option. Happy to merge the test into one of > the existing test files, I read t/README and greping around I did not > find a place that looked like a good fit. I

Re: [PATCH] Deprecate support for .git/info/grafts

Hi Johannes, On Fri, Apr 13, 2018 at 4:11 AM, Johannes Schindelin wrote: > The grafts feature was a convenient way to "stich together" ancient > history to the fresh start of linux.git. Did you mean: stitch? > Its implementation is, however, not up to Git's

Re: Optimizing writes to unchanged files during merges?

Elijah Newren writes: > Yes, precisely. Checking the *current* index is not reliable in the > presence of renames. > > Trying to use the current index as a proxy for what was in the index > before the merge started is a problem. But we had a copy of the index > before the

Re: [PATCH] Deprecate support for .git/info/grafts

Hi Johannes, On Fri, Apr 13, 2018 at 3:35 PM, Johannes Schindelin wrote: > Hi Stefan, >> I wonder if we want to offer a migration tool or just leave it >> at this hint. > > There is contrib/convert-grafts-to-replace-refs.sh. Oh cool! I wonder if we want to expose it

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Hi Phillip, On Fri, 13 Apr 2018, Phillip Wood wrote: > On 12/04/18 23:02, Johannes Schindelin wrote: > > > > [...] > > > > So: the order of the 3-way merges does matter. > > > > [...] > > Those conflicts certainly look intimidating (and the ones in your later > reply with the N way merge

[RFC PATCH] tests: fix PATH for GIT_TEST_INSTALLED tests

From: Guillaume Maudoux When running tests on an existing git installation with GIT_TEST_INSTALLED (as described in t/README), the test helpers are missing in the PATH. This fixes the test suite in a way that allows all the tests to pass. Signed-off-by: Guillaume Maudoux

Re: [PATCH v6 05/15] sequencer: introduce the `merge` command

Hi Phillip, On Fri, 13 Apr 2018, Phillip Wood wrote: > On 13/04/18 11:12, Phillip Wood wrote: > > @@ -3030,7 +3029,8 @@ static int pick_commits(struct todo_list *todo_list, > > struct replay_opts *opts) > > return error(_("unknown command %d"), item->command); > > > >

Re: [PATCH] Deprecate support for .git/info/grafts

Hi Stefan, On Fri, 13 Apr 2018, Stefan Beller wrote: > On Fri, Apr 13, 2018 at 4:11 AM, Johannes Schindelin > wrote: > > The grafts feature was a convenient way to "stich together" ancient > > history to the fresh start of linux.git. > > Did you mean: stitch? Yes

Re: [PATCH v8 03/14] commit-graph: add format document

Derrick Stolee writes: > On 4/11/2018 4:58 PM, Jakub Narebski wrote: >> Derrick Stolee writes: >> >>> +CHUNK DATA: >>> + >>> + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) >>> + The ith entry, F[i], stores the number of OIDs with first >>> +

Re: [PATCH] completion: reduce overhead of clearing cached --options

On Fri, Apr 13, 2018 at 11:44 PM, Jakub Narebski wrote: > SZEDER Gábor writes: >> In Bash we can do better: run the 'compgen -v __gitcomp_builtin_' >> builtin command, which lists the same variables, but without a >> pipeline and 'sed' it can do so with

Re: Optimizing writes to unchanged files during merges?

On Thu, Apr 12, 2018 at 5:01 PM, Linus Torvalds wrote: > [ Still talking to myself. Very soothing. ] > > On Thu, Apr 12, 2018 at 4:55 PM, Linus Torvalds > wrote: >> [ Talking to myself ] >> >> Did it perhaps mean to say >> >>

[RFC 10/10] FIXME: add a hacky script to test the changes with a patched test suite

Patch all the hardcoded occurrences of '.gitmodules' and make the file configurable via an environment variable. This is only for demonstration purposes, the final patch to the test suite could just use a fixed path for the custom gitmodules file, matching the path passed in the wrapper script

[RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation

This is to test custom gitmodules file paths. The default path can be overridden using the 'GIT_MODULES_FILE' environmental variable. Maybe In the final patch the option should be set only when running tests and not unconditionally in the wrapper script, but as a proof of concept the wrapper

Re: [RFC 00/10] Make .the gitmodules file path configurable

On Fri, 13 Apr 2018 00:20:37 +0200 Antonio Ospite wrote: [...] > Antonio Ospite (10): > submodule: add 'core.submodulesFile' to override the '.gitmodules' > path > submodule: fix getting custom gitmodule file in fetch command > submodule: use the 'submodules_file' variable

[RFC 09/10] FIXME: submodule: pass custom gitmodules file to 'test-tool submodule-config'

Add a new option to 't/helper/test-submodule-config.c' to set a custom path for the gitmodules file. In particular this is needed to make 't/t7411-submodule-config.sh' pass. The option is actually put in use by the script that patches the test suite. --- t/helper/test-submodule-config.c | 7

[RFC 08/10] FIXME: submodule: fix t1300-repo-config.sh to take into account the new config

Tests are run with the 'core.submodulesfile' config set, so 't/t1300-repo-config.sh' needs to be fixed to account for that. The changes to the HEREDOC lines are temporary and only needed to support the environmental variable expansion, they could go away eventually is using a fixed value is good

Re: [RFC PATCH] Add "git show --follow-symlinks HEAD:symlink"

Hi Ævar, thanks for your quick reply! On Mon, Apr 09, 2018 at 11:28:45AM +0200, Ævar Arnfjörð Bjarmason wrote: > On Mon, Apr 09 2018, Michael Vogt wrote: [..] > > Subject: [PATCH] support: git show --follow-symlinks HEAD:symlink > > > > Add support for the `--follow-symlinks` options to

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

On 10/04/18 13:29, Johannes Schindelin wrote: > In the upcoming commits, we will teach the sequencer to rebase merges. > This will be done in a very different way from the unfortunate design of > `git rebase --preserve-merges` (which does not allow for reordering > commits, or changing the branch

Re: [PATCH v6 05/15] sequencer: introduce the `merge` command

On 10/04/18 13:29, Johannes Schindelin wrote: > +static int do_merge(struct commit *commit, const char *arg, int arg_len, > + int flags, struct replay_opts *opts) > +{ > + int run_commit_flags = (flags & TODO_EDIT_MERGE_MSG) ? > + EDIT_MSG | VERIFY_MSG : 0; > +

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

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: >>> + >>> +

[PATCH] completion: reduce overhead of clearing cached --options

To get the names of all '$__git_builtin_*' variables caching --options of builtin commands in order to unset them, 8b0eaa41f2 (completion: clear cached --options when sourcing the completion script, 2018-03-22) runs a 'set |sed s///' pipeline. This works both in Bash and in ZSH, but has a higher

Re: File versioning based on shallow Git repositories?

Hallvard Breien Furuseth writes: > Also maybe it'll be worthwhile to generate .git/info/grafts in a local > clone of the repo to get back easily visible history. No grafts in > the original repo, grafts mess things up. Just a reminder: modern Git has "git replace", a

legal consent to use logo in talk

Dear git community, I'd like to use the git logo in the slides for a talk about software supply chain security at KubeCon + CloudNativeCon 2018 [1]. The talk will present in-toto [2], a framework to secure the software supply chain, developed at New York University, and Grafeas [3], an open

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

On 11/04/18 20:10, Eric Sunshine wrote: On Wed, Apr 11, 2018 at 11:35 AM, Phillip Wood wrote: On 10/04/18 13:30, Johannes Schindelin wrote: +The `reset` command is essentially a `git reset --hard` to the specified +revision (typically a previously-labeled one).

Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page

On 12/04/18 10:30, Johannes Schindelin wrote: Hi Phillip, On Wed, 11 Apr 2018, Phillip Wood wrote: On 10/04/18 13:30, Johannes Schindelin wrote: Firstly let me say that I think expanding the documentation and having an example is an excellent idea. Thanks! At first, I meant to leave this

Re: legal consent to use logo in talk

Hi, I just realized that the logo's licensing information is available online, and suits our needs. You can disregard my prior email, and I apologize for the noise on the mailing list. Thanks, Lukas Puehringer On 4/13/18 5:18 PM, Lukas Puehringer wrote: > Dear git community, > > I'd like to

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

On 12/04/18 23:02, Johannes Schindelin wrote: Hi Jake, On Thu, 12 Apr 2018, Jacob Keller wrote: On Wed, Apr 11, 2018 at 10:42 PM, Sergey Organov wrote: Jacob Keller writes: On Wed, Apr 11, 2018 at 6:13 AM, Sergey Organov

Re: File versioning based on shallow Git repositories?

Hi Kuba, On Fri, 13 Apr 2018, Jakub Narebski wrote: > Hallvard Breien Furuseth writes: > > > Also maybe it'll be worthwhile to generate .git/info/grafts in a local > > clone of the repo to get back easily visible history. No grafts in > > the original repo, grafts

[PATCH] Deprecate support for .git/info/grafts

The grafts feature was a convenient way to "stich together" ancient history to the fresh start of linux.git. Its implementation is, however, not up to Git's standards, as there are too many ways where it can lead to surprising and unwelcome behavior. For example, when pushing from a repository

Re: [PATCH v2 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

On 4/11/2018 7:52 PM, Junio C Hamano wrote: @@ -2011,6 +2028,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, /* add the path to the appropriate result list */ switch (state) { case path_excluded: +

Re: [PATCH v1] fsmonitor: fix incorrect buffer size when printing version number

On 4/10/2018 4:17 PM, Eric Sunshine wrote: On Tue, Apr 10, 2018 at 2:43 PM, Ben Peart wrote: This is a trivial bug fix for passing the incorrect size to snprintf() when outputing the version. It should be passing the size of the destination buffer

[PATCH v3 0/2] fsexcludes: Add programmatic way to exclude files

Only minor changes from V2: Switched to using get_dtype() instead of DTYPE() for platform independence. Cleaned up reverting of fsmonitor code in the untracked cache. Base Ref: master Web-Diff: https://github.com/benpeart/git/commit/709470f33f Checkout: git fetch https://github.com/benpeart/git

[PATCH v3 1/2] fsexcludes: add a programmatic way to exclude files from git's working directory traversal logic

The File System Excludes module is a new programmatic way to exclude files and folders from git's traversal of the working directory. fsexcludes_init() should be called with a string buffer that contains a NUL separated list of path names of the files and/or directories that should be included.

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

Hi Kim, On Thu, 12 Apr 2018, Kim Gybels wrote: > The poll provided in compat/poll.c is not interrupted by receiving > SIGCHLD. Use a timeout for cleaning up dead children in a timely manner. Maybe say "When using this poll emulation, use a timeout ..."? > diff --git a/daemon.c b/daemon.c >

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Hi Jake, On Thu, 12 Apr 2018, Jacob Keller wrote: > On Thu, Apr 12, 2018 at 3:02 PM, Johannes Schindelin > wrote: > > > [... talking about nested merge conflicts ...] > > > > The only way out I can see is to implement some sort of "W merge" or > > "chandelier merge"

[PATCH v3 2/2] fsmonitor: switch to use new fsexcludes logic and remove unused untracked cache based logic

Update fsmonitor to utilize the new fsexcludes based logic for excluding paths that do not need to be scaned for new or modified files. Remove the old logic in dir.c that utilized the untracked cache (if enabled) to accomplish the same goal. Signed-off-by: Ben Peart ---

Re: [PATCH 2/2] daemon: graceful shutdown of client connection

Hi Kim, On Thu, 12 Apr 2018, Kim Gybels wrote: > On Windows, a connection is shutdown when the last open handle to it is > closed. When that last open handle is stdout of our child process, an > abortive shutdown is triggered when said process exits. Ensure a > graceful shutdown of the client