Re: I'm trying to break "git pull --rebase"

On Tue, Feb 20, 2018 at 2:00 PM, Julius Musseau wrote: > Hi, Git Developers, > > I'm currently writing a blog post about "git pull --rebase". The > point of the blog post is to examine scenarios where two people are > working together on a short-lived feature branch, where

Re: [BUG] Worktree prune complains about missing path

On Tue, Feb 20, 2018 at 3:36 PM, Randall S. Becker wrote: > I’m a bit confused about this, as I thought I understood worktrees :(. > > /home/randall/nsgit/test/test dir.mytest: rm -rf dest.wt > /home/randall/nsgit/test/test dir.mytest/dest: git worktree prune -v > Removing

Re: Git should preserve modification times at least on request

On Tue, Feb 20, 2018 at 11:32:23PM +0100, Johannes Schindelin wrote: > Hi Peter, > > On Tue, 20 Feb 2018, Peter Backes wrote: > > > On Tue, Feb 20, 2018 at 11:46:38AM +0100, Johannes Schindelin wrote: > > > > > I would probably invent a file format (``) > > > > I'm stuck there because of

Re: Question about get_cached_commit_buffer()

On Tue, Feb 20, 2018 at 05:12:50PM -0500, Derrick Stolee wrote: > In rev-list, the "--header" option outputs a value and expects the buffer to > be cached. It outputs the header info only if get_cached_commit_buffer() > returns a non-null buffer, giving incorrect output. If it called >

Re: [PATCH v4 04/13] commit-graph: implement write_commit_graph()

Derrick Stolee writes: > +#define GRAPH_OID_VERSION_SHA1 1 > +#define GRAPH_OID_LEN_SHA1 20 This hardcoded 20 on the right hand side of this #define is probably problematic. Unless you are planning to possibly store truncated hash value for some future hash algorithm,

Question about get_cached_commit_buffer()

While working on my commit-graph patch [1] and using a local build in my usual workflows, I found a bug in my branch. Essentially, when calling `git rev-list --header`, the header information is actually missing for many commits except the first. This was not caught in my testing since

RE: [BUG] Worktree prune complains about missing path

On February 20, 2018 5:22 PM Eric Sunshine wrote: > On Tue, Feb 20, 2018 at 3:36 PM, Randall S. Becker > wrote: > > I’m a bit confused about this, as I thought I understood worktrees :(. > > > > /home/randall/nsgit/test/test dir.mytest: rm -rf dest.wt > >

Re: Git should preserve modification times at least on request

Hi Peter, On Tue, 20 Feb 2018, Peter Backes wrote: > On Tue, Feb 20, 2018 at 11:46:38AM +0100, Johannes Schindelin wrote: > > > I would probably invent a file format (``) > > I'm stuck there because of being munged. >From which command do you want to get it? If you are looking at `git diff`,

Re: Is there any way to "interrupt" a rebase?

On Tue, Feb 20, 2018 at 12:56 PM, Jeff King wrote: > On Tue, Feb 20, 2018 at 12:44:51PM +0100, Johannes Schindelin wrote: > >> > It might be even possible to design a new subcommand for the interactive >> > rebase to facilitate a variation of this strategy (possibly even making >>

Re: Git should preserve modification times at least on request

Hi Jeff, On Tue, Feb 20, 2018 at 04:16:34PM -0500, Jeff King wrote: > I think there are some references buried somewhere in that wiki, but did > you look at any of the third-party tools that store file metadata > alongside the files in the repository? E.g.: > >

[PATCH 18/27] sha1_file: add repository argument to open_sha1_file

Add a repository argument to allow the open_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 05/27] object-store: move packed_git and packed_git_mru to object store

In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. Patch generated by 1. Moving the struct packed_git declaration to

[PATCH 20/27] sha1_file: add repository argument to map_sha1_file

Add a repository argument to allow map_sha1_file callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers

[PATCH 16/27] sha1_file: add repository argument to sha1_file_name

Add a repository argument to allow sha1_file_name callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers

[PATCH 26/27] sha1_file: allow map_sha1_file to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/object-store.h b/object-store.h index 146358fe33..5d93677783 100644 ---

[PATCH 07/27] pack: move prepare_packed_git_run_once to object store

Each repository's object store can be initialized independently, so they must not share a run_once variable. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 8 +++- packfile.c | 7 +++ 2 files changed, 10

[PATCH 21/27] sha1_file: add repository argument to sha1_loose_object_info

Add a repository argument to allow the sha1_loose_object_info caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH 23/27] sha1_file: allow stat_sha1_file to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 8fad523d85..6879af8993 100644 --- a/sha1_file.c +++ b/sha1_file.c

[PATCH 27/27] sha1_file: allow sha1_loose_object_info to handle arbitrary repositories

From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index a20f811a07..36282acb1a

[PATCH 06/27] object-store: close all packs upon clearing the object store

Signed-off-by: Stefan Beller --- builtin/am.c | 2 +- builtin/clone.c| 2 +- builtin/fetch.c| 2 +- builtin/merge.c| 2 +- builtin/receive-pack.c | 2 +- object.c | 6 ++ packfile.c | 4 ++-- packfile.h

[PATCH 09/27] sha1_file: add raw_object_store argument to alt_odb_usable

Add a raw_object_store to alt_odb_usable to be more specific about which repository to act on. The choice of the repository is delegated to its only caller link_alt_odb_entry. Signed-off-by: Stefan Beller --- sha1_file.c | 8 +--- 1 file changed, 5 insertions(+), 3

[PATCH 13/27] sha1_file: add repository argument to prepare_alt_odb

See previous patch for explanation. While at it, move the declaration to object-store.h, where it should be easier to find. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- builtin/fsck.c | 2 +- object-store.h | 3 ++- packfile.c |

[PATCH 14/27] sha1_file: allow link_alt_odb_entries to handle arbitrary repositories

Actually this also allows read_info_alternates and link_alt_odb_entry to handle arbitrary repositories, but link_alt_odb_entries is the most interesting function in this set of functions, hence the commit subject. These functions span a strongly connected component in the function graph, i.e. the

[PATCH 08/27] pack: move approximate object count to object store

The approximate_object_count() function maintains a rough count of objects in a repository to estimate how long object name abbreviates should be. Object names are scoped to a repository and the appropriate length may differ by repository, so the object count should not be global. Signed-off-by:

[PATCH 19/27] sha1_file: add repository argument to map_sha1_file_1

Add a repository argument to allow the map_sha1_file_1 caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 22/27] sha1_file: allow sha1_file_name to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/object-store.h b/object-store.h index a37d74a0c5..146358fe33 100644 ---

[PATCH 01/27] repository: introduce raw object store field

The raw object store field will contain any objects needed for access to objects in a given repository. This patch introduces the raw object store and populates it with the `objectdir`, which used to be part of the repository struct. As the struct gains members, we'll also populate the function

[PATCH 15/27] sha1_file: allow prepare_alt_odb to handle arbitrary repositories

Signed-off-by: Stefan Beller --- object-store.h | 3 +-- sha1_file.c| 21 +++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/object-store.h b/object-store.h index f283fbdba9..873b341774 100644 --- a/object-store.h +++ b/object-store.h

[PATCH 10/27] sha1_file: add repository argument to link_alt_odb_entry

Add a repository argument to allow the link_alt_odb_entry caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Since the implementation does not yet work with

[PATCH 25/27] sha1_file: allow map_sha1_file_1 to handle arbitrary repositories

From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 598acc5410..522804d9f0

[PATCH 04/27] object-store: free alt_odb_list

Free the memory and reset alt_odb_{list, tail} to NULL. Signed-off-by: Stefan Beller --- object.c | 17 + 1 file changed, 17 insertions(+) diff --git a/object.c b/object.c index 11d904c033..17b1da6d6b 100644 --- a/object.c +++ b/object.c @@ -446,7 +446,24 @@

[PATCH 11/27] sha1_file: add repository argument to read_info_alternates

See previous patch for explanation. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index aaa6276211..6edcc3d3a7 100644

[PATCH 02/27] object-store: migrate alternates struct and functions from cache.h

Migrate the struct alternate_object_database and all its related functions to the object store as these functions are easier found in that header. The migration is just a verbatim copy, no need to include the object store header at any C file, because cache.h includes repository.h which in turn

[PATCH 24/27] sha1_file: allow open_sha1_file to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 6879af8993..598acc5410 100644 --- a/sha1_file.c +++ b/sha1_file.c

Re: File locking issues with fetching submodules in parallel

Hi Stefan, On Tue, 20 Feb 2018, Stefan Beller wrote: > On Tue, Feb 20, 2018 at 8:20 AM, Johannes Schindelin > wrote: > > Hi Stefan (and other submodule wizards), > > > > Igor Melnichenko reported a submodule problem in a Git for Windows ticket: > > > >

Re: [GSoC][PATCH] tag: Make "git tag --contains " less chatty if is invalid

Stefan Beller writes: >> diff --git a/t/t7013-tag-contains.sh b/t/t7013-tag-contains.sh >> new file mode 100755 >> index 0..65119dada >> --- /dev/null >> +++ b/t/t7013-tag-contains.sh > > Thanks for adding the tests into a new file instead of putting it somewhere >

Re: Git should preserve modification times at least on request

Jeff King writes: > Modification times are a subset of the total metadata you might care > about, so they are solving a much more general problem. Which may also > partially answer your question about why this isn't built into git. The > general problem gets much bigger when you

[PATCH 17/27] sha1_file: add repository argument to stat_sha1_file

Add a repository argument to allow the stat_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 03/27] object-store: move alt_odb_list and alt_odb_tail to object store

In a process with multiple repositories open, alternates should be associated to a single repository and not shared globally. Move alt_odb_list and alt_odb_tail into the_repository and adjust callers to reflect this. Now that the alternative object data base is per repository, we're leaking its

[PATCH 12/27] sha1_file: add repository argument to link_alt_odb_entries

See previous patch for explanation. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index

Re: I'm trying to break "git pull --rebase"

On Tue, Feb 20, 2018 at 5:00 PM, Julius Musseau wrote: > I was hoping to concoct a situation where "git pull --rebase" makes a > mess of things. It breaks quite easily with some workflows. They are all in the "don't do that" territory. Open a long-lived feature-dev branch,

Re: [GSoC][PATCH] tag: Make "git tag --contains " less chatty if is invalid

Welcome to the Git mailing list! On Mon, Feb 19, 2018 at 1:21 PM, Paul-Sebastian Ungureanu wrote: > git tag --contains prints the whole help text if is > invalid. It should only show the error message instead. Makes sense. > > This bug was a side effect of

[PATCHv3 00/27] Moving global state into the repository object (part 1)

v3: * reverted back to use the repository for most of the functions (including unduplicating 'ignore_env') * rebased on master again (I lost that state when doing v2, as I did both rebase as well as conversion to object store in one go) * one additional patch, that moves the alternates related

Re: Duplicate safecrlf warning for racily clean index entry

On Tue, Feb 20, 2018 at 08:42:26AM -0500, Matt McCutchen wrote: > I noticed that if a file subject to a safecrlf warning is added to the > index in the same second that it is created, resulting in a "racily > clean" index entry, then a subsequent "git add" command prints another > safecrlf

[PATCH 2/2] ref-filter: get rid of goto

Get rid of goto command in ref-filter for better readability. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH 1/2] ref-filter: get rid of duplicate code

Make one function from 2 duplicate pieces and invoke it twice. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 45 + 1 file

[PATCH v2 2/2] ref-filter: get rid of goto

Get rid of goto command in ref-filter for better readability. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH v2 1/2] ref-filter: get rid of duplicate code

Make one function from 2 duplicate pieces and invoke it twice. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King --- ref-filter.c | 45 + 1 file

[PATCH] Fix misconversion of gitsubmodule.txt

In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions `submodule’s`. It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. --- Documentation/gitsubmodules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gitsubmodules.txt

[PATCH v2] Fix misconversion of gitsubmodule.txt

In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions `submodule’s`. It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. Signed-off-by: Motoki Seki --- Documentation/gitsubmodules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2

Re: [PATCH] Fix misconversion of gitsubmodule.txt

On Tue, Feb 20, 2018 at 3:51 AM, marmot1123 wrote: > In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions > `submodule’s`. > It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. Thanks for the contribution. Please sign-off your patch; see

Re: Is there any way to "interrupt" a rebase?

Hi Hilco, On Mon, 19 Feb 2018, Hilco Wijbenga wrote: > On Mon, Feb 19, 2018 at 2:36 PM, brian m. carlson > wrote: > > On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote: > >> So a scenario like this: > >> > >> my-branch : X -> A -> B -> C -> D -> E -> F

Re: Why git-revert doesn't invoke the pre-commit and the commit-msg hooks?

Hi Gustavo On 19/02/18 14:50, Gustavo Chaves wrote: > > I asked this question on StackOverflow and got an answer: > https://stackoverflow.com/q/48852925/114983 > > The problem is that git-revert invokes git-commit with the -n flag, > explicitly avoiding the pre-commit and the commit-msg hooks.

Re: [PATCH] Fix misconversion of gitsubmodule.txt

On Tue, Feb 20, 2018 at 08:51:46AM +, marmot1123 wrote: > In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions > `submodule’s`. > It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. While I agree consistency is good, does this have any effect on the output? I

Re: Is there any way to "interrupt" a rebase?

On 19/02/18 19:35, Hilco Wijbenga wrote: > > Hi all, > > When maintaining a long running branch, I regularly rebase onto our > active development branch so that my branch stays up-to-date. What > happens fairly often is that during such a rebase, Git will exit > because of rebase/merge

Re: Git should preserve modification times at least on request

Hello Johannes, On Tue, Feb 20, 2018 at 11:46:38AM +0100, Johannes Schindelin wrote: > Oh, sorry. I understood your mail as if you had told the core Git > developers that they should implement the feature you desire. I did not > understand that you hinted at a discussion first, and that you would

Re: Git should preserve modification times at least on request

Hi Peter, On Mon, 19 Feb 2018, Peter Backes wrote: > On Mon, Feb 19, 2018 at 10:58:12PM +0100, Johannes Schindelin wrote: > > Since you already assessed that it shouldn't be hard to do, you > > probably want to put your money where your mouth is and come up with a > > patch, and then offer it up

Re: Is there any way to "interrupt" a rebase?

Hi Hilco, On Tue, 20 Feb 2018, Johannes Schindelin wrote: > When I am particularly tired and overworked (and therefore know that my > working memory is less useful than usual), I therefore resort to my > second-favorite strategy: U use the `done` file. > > I literally copy parts of

Stackdump from stash save on Windows 10 64-bit

Hi As of yesterday, stash save stopped working on my Windows 10 box - I get: > git stash save Cannot save the current worktree state and a stackdump file (see below). This is with the 64-bit version of 2.16.1. Switching to the 32-bit version resolved the problem for me. Cheers

git-gui, BUG: minimize/maximize buttons missing when repo is opened in gui

System: Ubuntu 17.10 Gnome When opening git-gui from a directory which is a repository, minimize and maximize buttons are showing and functional in git-gui. However, if I open git-gui in a non-repo directory, git-gui opens a dialog where I can "Create New Repository", "Clone Existing

[ANNOUNCE] Git for Windows 2.16.2

Dear Git users, It is my pleasure to announce that Git for Windows 2.16.2 is available from: https://gitforwindows.org/ Changes since Git for Windows v2.16.1(4) (February 7th 2018) New Features * Comes with Git v2.16.2. * For every new Git for Windows version, .zip archives

git-gui, feature request: add hotkeys to focus different widgets

To fully use git-gui with keyboard-only, a few more hotkeys are needed. I am missing hotkeys to change focus between the "Unstanged Changes", "Staged Changes", diff viewer and "Commit Message" widgets. I would like to be able to stage, browse, unstage and commit in git-gui, all without using the

Re: Stackdump from stash save on Windows 10 64-bit

Hi Tim, On Tue, 20 Feb 2018, Tim Mayo wrote: > As of yesterday, stash save stopped working on my Windows 10 box - I get: > >> git stash save >Cannot save the current worktree state > > and a stackdump file (see below). This is with the 64-bit version of 2.16.1. > Switching

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Igor, Igor Djordjevic writes: > Hi Sergey, > [...] > > Even though this behavior is known and documented, it still left some > to be desired. > > Might be I`m missing something, but so far I like how described > approach just "feels right" (to me, for now),

File locking issues with fetching submodules in parallel

Hi Stefan (and other submodule wizards), Igor Melnichenko reported a submodule problem in a Git for Windows ticket: https://github.com/git-for-windows/git/issues/1469 Part of it is due to Windows' behavior where you cannot read the same file in one process while you write it in another

Re: [RFC PATCH 0/1] Implement CMake build

On Thu, Jan 25, 2018 at 6:21 PM, Isaac Hier wrote: > Hi Jeff, > > I have been looking at the build generator, which looks promising, but > I have one concern. Assuming I can generate a CMakeLists.txt that > appropriately updates the library sources, etc. how do you suggest I

Re: Git should preserve modification times at least on request

On Mon, Feb 19, 2018 at 3:22 PM, Hilco Wijbenga wrote: > Aside from exactly which modification times should be used (which I > would love to have a bit more control over as well), something else > I'd like to see is that, when switching between branches, files that > are

Re: cherry-pick '-m' curiosity

"G. Sylvie Davies" writes: > On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov wrote: >> Hello, >> >> $ git help cherry-pick >> >> -m parent-number, --mainline parent-number >>Usually you cannot cherry-pick a merge because you do not >>

[PATCH] make hg-to-git compatible with python2.x and 3.x

Signed-off-by: Hervé Beraud --- contrib/hg-to-git/hg-to-git.py | 52 +- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

On Fri, Feb 16, 2018 at 2:34 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> v2: >> * duplicated the 'ignore_env' bit into the object store as well >> * the #define trick no longer works as we do not have a "the_objectstore" >> global, >> which means there is

Re: [PATCH 2/2] remote-curl: unquote incoming push-options

On 02/19, Jeff King wrote: > The transport-helper protocol c-style quotes the value of > any options passed to the helper via the "option " > directive. However, remote-curl doesn't actually unquote the > push-option values, meaning that we will send the quoted > version to the other side

Re: [PATCH] make hg-to-git compatible with python2.x and 3.x

Hervé Beraud writes: > Signed-off-by: Hervé Beraud > --- > contrib/hg-to-git/hg-to-git.py | 52 > +- > 1 file changed, 26 insertions(+), 26 deletions(-) I think you shrunk the scope of the change,

Re: [PATCH] make hg-to-git compatible with python2.x and 3.x

Junio C Hamano writes: > - map(lambda ..., collection) is not liked; use list comprehension. > ... > I am not sure about the change from map(lambda ...) to list > comprehension, though. Not that I have a preference for or against > (I am not a Python person), but I do not

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

On 02/20, Stefan Beller wrote: > On Fri, Feb 16, 2018 at 2:34 PM, Jonathan Nieder wrote: > > Hi, > > > > Stefan Beller wrote: > > > >> v2: > >> * duplicated the 'ignore_env' bit into the object store as well > >> * the #define trick no longer works as we do not have a

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

Jonathan Nieder writes: > For what it's worth, I think I prefer v1. I put some comments on why > on patch 0 of v1 and would be interested in your thoughts on them > (e.g. as a reply to that). I also think that even if we want to > switch to a style that passes around

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

On Tue, Feb 20, 2018 at 11:00 AM, Brandon Williams wrote: > On 02/20, Stefan Beller wrote: >> On Fri, Feb 16, 2018 at 2:34 PM, Jonathan Nieder wrote: >> > Hi, >> > >> > Stefan Beller wrote: >> > >> >> v2: >> >> * duplicated the 'ignore_env' bit into the

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

On Tue, Feb 20, 2018 at 11:03 AM, Junio C Hamano wrote: > Jonathan Nieder writes: > >> For what it's worth, I think I prefer v1. I put some comments on why >> on patch 0 of v1 and would be interested in your thoughts on them >> (e.g. as a reply to that).

Re: Why git-revert doesn't invoke the pre-commit and the commit-msg hooks?

Phillip Wood writes: > ... I'm worried though that > someone out there is scripting with a non-interactive editor which may > break if we start verifying the message ... This is a very valid concern. Making sure that 'revert' pays attention to the --verify option

Re: [PATCH v2 3/9] t3701: use test_write_lines and write_script

Eric Sunshine writes: >> test_expect_success 'setup fake editor' ' >> - echo "#!$SHELL_PATH" >fake_editor.sh && >> - cat >>fake_editor.sh <<-\EOF && >> + FAKE_EDITOR="$(pwd)/fake-editor.sh" && >> + write_script "$FAKE_EDITOR" <<-\EOF && >>

Re: [PATCH v2 4/9] t3701: don't hard code sha1 hash values

Phillip Wood writes: > From: Phillip Wood > > Purge the index lines from diffs so we're not hard coding sha1 hash > values in the expected output. The motivation of this patch is clear, but all-zero object name for missing side of deletion

Re: [PATCH v2] Fix misconversion of gitsubmodule.txt

Kaartic was the last to touch that file, (as found via git log origin/master -- Documentation/gitsubmodules.txt), sorry I did not find this in the review. Thanks for the patch! Stefan On Tue, Feb 20, 2018 at 3:48 AM, marmot1123 wrote: > In the 2nd and 4th paragraph of

Re: [PATCH v2 1/9] add -i: add function to format hunk header

Phillip Wood writes: > From: Phillip Wood > > This code is duplicated in a couple of places so make it into a > function as we're going to add some more callers shortly. > > Signed-off-by: Phillip Wood > --- >

Von: Joy Kone

Von: Joy Kone Ich habe Ihnen diese E-Mail geschickt, weil Sie mit Ihnen diskutieren müssen. Ich möchte nicht, dass Sie dieses Angebot in irgendeiner Hinsicht missverstehen ... wenn es Ihnen recht ist, bitte ich um Ihre volle Mitarbeit. Ich habe mit Ihnen Kontakt aufgenommen, um eine Investition

Re: [PATCH v2 9/9] add -p: don't rely on apply's '--recount' option

Phillip Wood writes: > From: Phillip Wood > > Now that add -p counts patches properly it should be possible to turn > off the '--recount' option when invoking 'git apply' > > Signed-off-by: Phillip Wood > --- >

Re: [PATCH v4 02/13] graph: add commit graph design document

Derrick Stolee writes: > +2. Walking the entire graph to avoid topological order mistakes. You have at least one more mention of "topological order mistakes" below, but we commonly refer to this issue and blame it for "clock skew". Using the word highlights that there is no

Re: [PATCH v4 03/13] commit-graph: create git-commit-graph builtin

Derrick Stolee writes: > +int cmd_commit_graph(int argc, const char **argv, const char *prefix) > +{ > + static struct option builtin_commit_graph_options[] = { > + { OPTION_STRING, 'p', "object-dir", _dir, > + N_("dir"), > +

I'm trying to break "git pull --rebase"

Hi, Git Developers, I'm currently writing a blog post about "git pull --rebase". The point of the blog post is to examine scenarios where two people are working together on a short-lived feature branch, where history rewrites are allowed, and where both are using "git pull --rebase" to stay in

About connection resuming

Hello, First, I am a user of git for about 2 years, I really appreciated you all to create this great useful software! My encountered problem is: sometimes, the repo is big and because my networking is not stable(or my network proxy has some limitations), so, the clone will always fail. I

Duplicate safecrlf warning for racily clean index entry

I noticed that if a file subject to a safecrlf warning is added to the index in the same second that it is created, resulting in a "racily clean" index entry, then a subsequent "git add" command prints another safecrlf warning. I reproduced this on the current "next" (499d7c4f91). The procedure:

Re: [PATCH] t/known-leaky: add list of known-leaky test scripts

On 19 February 2018 at 22:29, Jeff King wrote: > On Wed, Feb 14, 2018 at 10:56:37PM +0100, Martin Ågren wrote: > >> Here's what a list of known leaks might look like. It feels a bit >> awkward to post a known-incomplete list (I don't run all tests). Duy >> offered to pick up the

Re: [PATCH v4 01/13] commit-graph: add format document

Derrick Stolee writes: > Documentation/technical/commit-graph-format.txt | 90 > + > 1 file changed, 90 insertions(+) > create mode 100644 Documentation/technical/commit-graph-format.txt Hopefully just a few remaining nits. Overall I find this

Re: Is there any way to "interrupt" a rebase?

On Tue, Feb 20, 2018 at 12:44:51PM +0100, Johannes Schindelin wrote: > > It might be even possible to design a new subcommand for the interactive > > rebase to facilitate a variation of this strategy (possibly even making > > use of the fact that the interactive rebase accumulates mappings

Re: Git should preserve modification times at least on request

Hi Johannes, On Tue, Feb 20, 2018 at 11:46:38AM +0100, Johannes Schindelin wrote: > If I were you [...] It seems all pretty straight forward, except for > I would probably invent a file format (``) I'm stuck there because of being munged. To obtain or set the mtime of the file, I need the

Re: [PATCH] t/known-leaky: add list of known-leaky test scripts

On Tue, Feb 20, 2018 at 09:44:51PM +0100, Martin Ågren wrote: > For finding this sort of low-hanging fruit (windfall?) any local > scripting and greping will do. I sort of hesitate wasting community CPU > cycles on something which might be appreciated, in theory, but that > doesn't have enough

Re: Git should preserve modification times at least on request

On Mon, Feb 19, 2018 at 10:22:36PM +0100, Peter Backes wrote: > please ensure to CC me if you reply as I am not subscribed to the list. > > https://git.wiki.kernel.org/index.php/Git_FAQ#Why_isn.27t_Git_preserving_modification_time_on_files.3F > > argues that git isn't preserving modification

Re: Fetch-hooks

On 02/20/2018 08:42 AM, Jeff King wrote:>> [...] >> >> Is there a way for “pre-receive” to individually filter [refs]? I was >> under the impression that the only way to do that was to use the >> “update” hook, which was the reason I wanted to model it after “update” >> rather than “pre-receive”

Re: [PATCH v2] Fix misconversion of gitsubmodule.txt

Hi, On Wednesday 21 February 2018 12:20 AM, Stefan Beller wrote: > Kaartic was the last to touch that file, > (as found via git log origin/master -- Documentation/gitsubmodules.txt), > sorry I did not find this in the review. > "Non-ASCII characters" made me dig into to this a little deeper as

Re: [PATCH v2] Fix misconversion of gitsubmodule.txt

Hi, marmot1123 wrote: > In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions > `submodule’s`. > It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. If replacing the non-ASCI apostrophes is the goal, aren't there a number of others in the same file worth cleaning up

Re: [PATCH v2] Fix misconversion of gitsubmodule.txt

On Tue, Feb 20, 2018 at 11:36 AM, Kaartic Sivaraam wrote: > Hi, > > On Wednesday 21 February 2018 12:20 AM, Stefan Beller wrote: >> Kaartic was the last to touch that file, >> (as found via git log origin/master -- Documentation/gitsubmodules.txt), >> sorry I did not

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

Stefan Beller writes: > The step to take an object store would just add expressiveness > to the code, which may help in understanding what part of the code is > related to what other part of the code, so it may be a readability gain > on its own? It certainly would allow you

  1   2   >