Re: [PATCH v2 3/3] sequencer.c: don't die on invalid cleanup_arg

Denton Liu writes: > When get_cleanup_mode was provided with an invalid cleanup_arg, it used > to die. Warn user and fallback to default behaviour if an invalid > cleanup_arg is given. > > Signed-off-by: Denton Liu > --- > sequencer.c | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(

Re: [PATCH v2 1/1] git-clean.txt: clarify ignore pattern files

Martin Ågren writes: > suggestion. Hmm, I now see you wrote "the standard ignore/D/ rules" -- I > believe that's a typo. Thanks for spotting. Yup, that is a typo.

[PATCH v3 1/2] git-clean.txt: clarify ignore pattern files

In the git-clean documentation, -x and -e documented .gitignore, $GIT_DIR/info/excludes but neglected to mention the file pointed to by core.excludesFile. Remove specific list of files and, instead, reference gitignore(5) documentation so that information is consolidated and the git-clean document

[PATCH v3 2/2] Docs: move core.excludesFile from git-add to gitignore

There was a section on configuration mentioning core.excludesFile in git-add.txt. However, the core.excludesFile config variable is not exclusive to git-add. Move this description to gitignore.txt to be more generic. --- Documentation/git-add.txt | 9 - Documentation/gitignore.txt | 8 ++

[PATCH v3 0/2] consolidate core.excludesFile docs

Robert reported that core.excludesFile was not mentioned in the git-clean docs[1]. This cleans that up by mentioning that in the docs. [1]: https://public-inbox.org/git/alpine.LFD.2.21.1902231328560.@localhost.localdomain/ Changes since v1: * Use Martin's suggestions of referencing the giti

What's cooking in git.git (Mar 2019, #02; Thu, 7)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The maintenance track has been upd

Strange behaviour of git log --follow

Hello. $ git log include/__vic/mutex.h commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a Merge: 96dd9a2 f484f4e Author: __vic <__...@ngs.ru> Date: 2017-12-13 10:41:32 +0300 Merge branch 'generic' into posix commit f484f4e8aae32041ba56bdce12d1efd8491e94d5 Merge: 86b848a b9bbbe6 Author: __vic

Re: [PATCH v2 2/3] cherry-pick/revert: add scissors line on merge conflict

Hi Junio, On Thu, Mar 07, 2019 at 04:52:57PM +0900, Junio C Hamano wrote: > Denton Liu writes: > > diff --git a/Documentation/git-cherry-pick.txt > > b/Documentation/git-cherry-pick.txt > > index d35d771fc8..5c086d78c8 100644 > > diff --git a/Documentation/git-revert.txt b/Documentation/git-reve

[PATCH 1/1] mingw: respect core.hidedotfiles = false in git-init again

From: Johannes Schindelin This is a brown paper bag. When adding the tests, we actually failed to verify that the config variable is heeded in git-init at all. And when changing the original patch that marked the .git/ directory as hidden after reading the config, it was lost on this developer th

[PATCH 0/1] Fix git init with core.hidedotfiles

This fixes an regression that was not present in Git for Windows's original core.hideDotFiles patch, but in the shape of the core.hideDotFiles patch that made it into git.git. We fixed it in one big hurry in Git for Windows, and I simply forgot to upstream this right away. Johannes Schindelin (1

Re: [BUG] worktree local refs weirdness

On 06/03/2019 15:57, Phillip Wood wrote: When it is run in a worktree 'git for-each-ref' only seems to show refs under refs/rewritten if that directory also exists under $GIT_COMMON_DIR even though they are local to the worktree. Initially I thought this was due to $GIT_COMMON_DIR pointing to

Re: [BUG] worktree local refs weirdness

On Thu, Mar 7, 2019 at 4:38 PM Phillip Wood wrote: > > On 06/03/2019 15:57, Phillip Wood wrote: > > When it is run in a worktree 'git for-each-ref' only seems to show refs > > under refs/rewritten if that directory also exists under $GIT_COMMON_DIR > > even though they are local to the worktree. >

[PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict

Fix a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Note that the removal of the if-else tower in git_sequencer_config may appear to be a no-op refactor but it actually isn't. First of all, we now accept

[PATCH v3 0/4] cherry-pick/revert cleanup scissors fix

As I stated earlier[1], I discovered today that git revert (and thus, git cherry-pick as well) do not place the scissors line properly as well. This patchset adds a scissors line when conflicts arise in both cherry-pick and revert, which fixes the same bug present in git-merge earlier. This patchs

[PATCH v3 2/4] t3507: cleanup space after redirection operators

Signed-off-by: Denton Liu --- t/t3507-cherry-pick-conflict.sh | 34 - 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 0db166152a..74ff925526 100755 --- a/t/t3507-cherry-pick-con

[PATCH v3 4/4] sequencer.c: don't die on invalid cleanup_arg

When get_cleanup_mode was provided with an invalid cleanup_arg, it used to die. Warn user and fallback to default behaviour if an invalid cleanup_arg is given. Signed-off-by: Denton Liu --- builtin/commit.c | 2 +- builtin/merge.c | 4 ++-- builtin/revert.c | 2 +- sequencer.c | 10

[PATCH v3 1/4] merge-options.txt: correct typo

The scissors line is included after the human commit message. Therefore, saying "scissors will be prepended" was incorrect. Update to say "appended" which is more correct. Signed-off-by: Denton Liu --- Notes: Note that this can be squashed into 6f06b6aeef (merge: add scissors line on mer

[PATCH 0/1] Deprecate git rebase --preserve-merges

It had a good run, but its design was irreparably limited. So I came up with a redesign:--rebase-merges. It seems to work all right, so now it is time to start letting go of the previous design. Johannes Schindelin (1): rebase: deprecate --preserve-merges Documentation/config/branch.txt | 6 +

[PATCH 1/1] rebase: deprecate --preserve-merges

From: Johannes Schindelin We have something much better now: --rebase-merges (which is a complete re-design --preserve-merges, with a lot of issues fixed such as the inability to reorder commits with --preserve-merges). Signed-off-by: Johannes Schindelin --- Documentation/config/branch.txt |

Re: [PATCH 0/1] Drop last MakeMaker reference

Hi Junio, On Sun, 3 Mar 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > Back when we stopped using MakeMaker, we forgot one reference... > > > > Johannes Schindelin (1): > > mingw: drop MakeMaker reference > > > > config.mak.uname | 1 - > > 1 file change

Re: [BUG] worktree local refs weirdness

On Thu, Mar 7, 2019 at 4:46 PM Duy Nguyen wrote: > > On Thu, Mar 7, 2019 at 4:38 PM Phillip Wood wrote: > > > > On 06/03/2019 15:57, Phillip Wood wrote: > > > When it is run in a worktree 'git for-each-ref' only seems to show refs > > > under refs/rewritten if that directory also exists under $GI

Error fetching submodule from submodule

Hi I think I may have found an error in the way git handles a submodule's submodule. Read further for the example (extracted from a real project). * I have a main repository which has some submodules defined. * One of the submodules is a common submodule which is also included in one of the other

[PATCH 1/3] files-backend.c: factor out per-worktree code in loose_fill_ref_dir()

This is the first step for further cleaning up and extending this function. Signed-off-by: Nguyễn Thái Ngọc Duy --- refs/files-backend.c | 50 +--- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c

[PATCH 2/3] files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()

This function is duplicated to handle refs/bisect/ and refs/worktree/ and a third prefix is coming. Time to clean up. This also fixes incorrect "refs/worktrees/" length in this code. The correct length is 14 not 11. The test in the next patch will also cover this. Signed-off-by: Nguyễn Thái Ngọc

[PATCH 3/3] Make sure refs/rewritten/ is per-worktree

a9be29c981 (sequencer: make refs generated by the `label` command worktree-local, 2018-04-25) adds refs/rewritten/ as per-worktree reference space. Unfortunately (my bad) there are a couple places that need update to make sure it's really per-worktree. - add_per_worktree_entries_to_dir() is updat

[PATCH 0/3] Fix refs/rewritten not show up in for-each-ref

Apparently there is one corner case where refs/rewritten/* may not show up in for-each-ref in multiple worktree setup. This is because the per-worktree classification has to be done in three places (my bad!) and Johannes only updated one. This should fix it (and it also fixes refs/worktree/ not sh

Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)

On 06/03/2019 09:44, Duy Nguyen wrote: On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano wrote: * tg/checkout-no-overlay (2019-02-04) 9 commits (merged to 'next' on 2019-02-04 at 9968bcf4fb) + revert "checkout: introduce checkout.overlayMode config" (merged to 'next' on 2019-01-18 at 1e2a79

Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)

On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley wrote: > > On 06/03/2019 09:44, Duy Nguyen wrote: > > On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano wrote: > >> * tg/checkout-no-overlay (2019-02-04) 9 commits > >>(merged to 'next' on 2019-02-04 at 9968bcf4fb) > >> + revert "checkout: introduce

worth mentioning branch "mergeOptions" from "man git-merge"?

reading, in various places, people asking how to globally set options for merging, to which the standard answer is, no, you can't do that *globally*, but you can do it on a per-branch basis with branch..mergeOptions the most common example being to squash into master: git config branch.m

OK

Greetings, I humbly solicit for your partnership to transfer €15 million Euros into your personal or company’s account .I will offer you 30% of the total sum,60% will be for me while 10% will set aside for expenses that may be incurred on the process of transferring the fund. Contact me for more d

Re: [PATCH 2/3] files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()

Hi Duy On 07/03/2019 12:29, Nguyễn Thái Ngọc Duy wrote: This function is duplicated to handle refs/bisect/ and refs/worktree/ and a third prefix is coming. Time to clean up. This also fixes incorrect "refs/worktrees/" length in this code. The correct length is 14 not 11. The test in the next pa

Re: [PATCH 3/3] Make sure refs/rewritten/ is per-worktree

Hi Duy Thanks for working on this I've had a quick look through and they seem to make sense to me although I've not really looked at the refs code before. On 07/03/2019 12:29, Nguyễn Thái Ngọc Duy wrote: a9be29c981 (sequencer: make refs generated by the `label` command worktree-local, 2018-04

Re: [PATCH 3/3] Make sure refs/rewritten/ is per-worktree

On Thu, Mar 7, 2019 at 9:45 PM Phillip Wood wrote: > > [1] note that ref listing still works sometimes. For example, if you > > have .git/worktrees/foo/refs/rewritten/bar AND the directory > > .git/worktrees/refs/rewritten, > > should that be .git/refs/rewritten? (and below) Yes. -- Du

Re: [PATCH v3 4/4] sequencer.c: don't die on invalid cleanup_arg

Hi Denton Thanks for doing this, I think it looks ok but it would be better to make these changes earlier in the series so they come before what is now patch 3 Best Wishes Phillip On 07/03/2019 09:58, Denton Liu wrote: When get_cleanup_mode was provided with an invalid cleanup_arg, it used

Re: [PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict

Hi Denton On 07/03/2019 09:58, Denton Liu wrote: Fix a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Note that the removal of the if-else tower in git_sequencer_config may appear to be a no-op refacto

[PATCH 2/2] built-in stash: handle :(glob) pathspecs again

From: Johannes Schindelin When passing a list of pathspecs to, say, `git add`, we need to be careful to use the original form, not the parsed form of the pathspecs. This makes a difference e.g. when calling git stash -- ':(glob)**/*.txt' where the original form includes the `:(glob)` p

[PATCH 1/2] legacy stash: fix "rudimentary backport of -q"

From: Johannes Schindelin When this developer backported support for `--quiet` to the scripted version of `git stash` in 80590055ea (stash: optionally use the scripted version again, 2018-12-20), it looked like a sane choice to use `eval` to execute the command line passed in via the parameter li

[PATCH 0/2] stash: handle pathspec magic again

It was reported in https://github.com/git-for-windows/git/issues/2037 that git stash -- ':(glob)**/*.testextension is broken. The problem is not even the stash operation itself, it happens when the git add part of dropping the local changes is spawned: we simply passed the parsed pathspec instead

[PATCH v5] commit-tree: utilize parse-options api

Rather than parse options manually, which is both difficult to read and error prone, parse options supplied to commit-tree using the parse-options api. It was discovered that the --no-gpg-sign option was documented but not implemented in commit 70ddbd7767 (commit-tree: add missing --gpg-sign flag,

Re: [PATCH 1/1] rebase: deprecate --preserve-merges

Hi Johannes It's great to see this. Do we need the deprecation warning in both builtin/rebase.c and rebase--preserve-merges.sh? Won't that end up warning twice - maybe that's a good thing but if we go for only one I prefer the wording in rebase--preserve-merges.sh Best Wishes Phillip On 07

Re: [PATCH 1/1] rebase: deprecate --preserve-merges

On Thu, Mar 7, 2019 at 6:11 AM Johannes Schindelin via GitGitGadget wrote: > We have something much better now: --rebase-merges (which is a > complete re-design --preserve-merges, with a lot of issues fixed such as > the inability to reorder commits with --preserve-merges). > > Signed-off-by: Joha

Re: Large object issue (Windows)

On 05/03/2019 03:35, brian m. carlson wrote: On Mon, Mar 04, 2019 at 07:04:02PM -0500, Patrick Hogg wrote: Hi all, While investigating the last issue I reported (and fixed) I was trying to come up with a good test case for repos with large objects. In the process I found an issue on Windows wit

Your Outlook Exceeded

Your e-mail password expires in 2 days to retain e-mail password and details. CLICK HERE to update immediately Greetings, IT Service Support (c) 2019

Re: [PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict

Hi Phillip, On Thu, Mar 07, 2019 at 03:24:16PM +, Phillip Wood wrote: > Hi Denton > > On 07/03/2019 09:58, Denton Liu wrote: > >Fix a bug where the scissors line is placed after the Conflicts: > >section, in the case where a merge conflict occurs and > >commit.cleanup = scissors. > > > >Note

Re: Error fetching submodule from submodule

On Thu, Mar 07, 2019 at 12:07:21PM +0100, Jesper Rønn-Jensen wrote: > Hi I think I may have found an error in the way git handles a > submodule's submodule. Read further for the example (extracted from a > real project). First off, thank you for the example script. It made understanding what's go

Re: [PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict

On 07/03/2019 17:56, Denton Liu wrote: > Hi Phillip, > > On Thu, Mar 07, 2019 at 03:24:16PM +, Phillip Wood wrote: >> Hi Denton >> >> On 07/03/2019 09:58, Denton Liu wrote: >>> diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c >>> index f7c2a5fdc8..5f1bc9d383 100644 >>> --- a/bu

Re: [PATCH v13 12/27] stash: convert drop and clear to builtin

On Mon, Feb 25, 2019 at 11:16:16PM +, Thomas Gummerer wrote: > +static int do_drop_stash(const char *prefix, struct stash_info *info, int > quiet) This series hit next recently, so I started building it merged with my -Wunused-parameters series. This "prefix" parameter is not ever used. Skim

Re: [PATCH v13 18/27] stash: convert create to builtin

On Mon, Feb 25, 2019 at 11:16:22PM +, Thomas Gummerer wrote: > +static void add_pathspecs(struct argv_array *args, > + struct pathspec ps) { Here and elsewhere in the series, I notice that we pass the pathspec struct by value, which is quite unusual for our codebase (and

Re: Can't build first git commit

[+cc git@vger; let's keep this on the list; I'm not sure there's a lot to be learned from fiddling with this old version, but if we're going to do it, let's at least record our attempts for posterity] On Thu, Mar 07, 2019 at 08:04:55PM +0100, Fabio Aiuto wrote: > I made a directory "trial" and

[PATCH v2] line-log: suppress diff output with "-s"

When "-L" is in use, we ignore any diff output format that the user provides to us, and just always print a patch (with extra context lines covering the whole area of interest). It's not entirely clear what we should do with all formats (e.g., should "--stat" show just the diffstat of the touched l

[PATCH] convert: avoid malloc of original file size

From: Joey Hess We write the output of a "clean" filter into a strbuf. Rather than growing the strbuf dynamically as we read its output, we make the initial allocation as large as the original input file. This is a good guess when the filter is just tweaking a few bytes, but it's disastrous when

Re: Can't build first git commit

Sorry for forgetting the cc!!! Thank you so much for help, hope not to bore you all ;) I think that I will go on studying git this way, and follow all the improvements that were made along his history. I think that asymptosis too gave me a good link, related to that bash script implmentation. Than

Re: git reset error on Windows

Windows 10, git version 2.21.0.windows.1 git reset tries to delete folder when last file is removed but failed to do so if shell is in the deleted folder. Repro steps (powershell): mkdir test cd test git init mkdir dir cd dir add-content .\file "" git add . git commit -m "1" git mv .\file .\file2

[BUG] fetching all remote branches results in failed multiple updates

Hello all, When running the latest release of git, I receive an error when attempting to fetch all remote branches from a repo: fatal: multiple updates for ref 'refs/remotes/origin/maint' not allowed The specific ref that it fails on changes depending on the repository, but the end result is

Re: [PATCH v4 1/2] refs.c: refactor check_refname_component()

On Wed, Mar 6, 2019 at 4:49 PM Jeff King wrote: > On Tue, Mar 05, 2019 at 07:08:33PM +0700, Nguyễn Thái Ngọc Duy wrote: > I had envisioned just sanitizing each character into an output buffer as > we did the checks. It does introduce some complexities, though, because > now the checking function i

Re: [BUG] fetching all remote branches results in failed multiple updates

On Thu, Mar 07, 2019 at 09:44:47PM +, Alexander Huynh wrote: > Hello all, > > When running the latest release of git, I receive an error when attempting to > fetch all remote branches from a repo: > > fatal: multiple updates for ref 'refs/remotes/origin/maint' not allowed > > The specifi

Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)

Philip Oakley writes: >> I should send switch/restore again soon. There are still a few >> unaddressed concerns for git-restore since last time. Probably time to >> refresh those discussions. > > Just catching up on back emails: > > The one point I noted is that "Overlay" is a new magic term with

Re: [BUG] fetching all remote branches results in failed multiple updates

On Fri, Mar 08, 2019 at 12:40:15AM +0100, SZEDER Gábor wrote: > On Thu, Mar 07, 2019 at 09:44:47PM +, Alexander Huynh wrote: > > [git-test@chabuduo ~]$ cat > ~/.gitconfig > > [remote "origin"] > > fetch = +refs/heads/*:refs/remotes/origin/* > > Why do you do this? > > First,

Re: [PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict

Phillip Wood writes: >>> What are you basing this series on? builtin/rebase--helper.c was removed >>> last September in 34b47315d9 ("rebase -i: move rebase--helper modes to >>> rebase--interactive", 2018-09-27) >> >> I was basing this patch on the tip of dl/merge-cleanup-scissors-fix. I >> can r

Re: [PATCH v3 2/2] Docs: move core.excludesFile from git-add to gitignore

Denton Liu writes: > There was a section on configuration mentioning core.excludesFile in > git-add.txt. However, the core.excludesFile config variable is not > exclusive to git-add. Move this description to gitignore.txt to be more > generic. > --- I'll forge your sign-off and queue it like so.

Re: [BUG] fetching all remote branches results in failed multiple updates

Alexander Huynh writes: > Thanks for the clarification! One question: should we update the documentation > at https://git-scm.com/docs/git-fetch#CRTB to not list this as an example to > follow? The example itself is valuable. The way it is labeled might be misleading to some people (although pe

Re: [PATCH] convert: avoid malloc of original file size

Jeff King writes: > As discussed there, I do think this only solves half the problem, as the > smudge filter has the same issue in reverse. That's more complicated to > fix, and AFAIK nobody is working on it. But I don't think there's any > reason not to pick up this part in the meantime. Yeah,

Re: [PATCH 0/2] stash: handle pathspec magic again

"Johannes Schindelin via GitGitGadget" writes: > It was reported in https://github.com/git-for-windows/git/issues/2037 that > git stash -- ':(glob)**/*.testextension is broken. The problem is not even > the stash operation itself, it happens when the git add part of dropping the > local changes

Re: [PATCH 0/1] Drop last MakeMaker reference

Johannes Schindelin writes: > Hi Junio, > > On Sun, 3 Mar 2019, Junio C Hamano wrote: > >> "Johannes Schindelin via GitGitGadget" >> writes: >> >> > Back when we stopped using MakeMaker, we forgot one reference... >> > >> > Johannes Schindelin (1): >> > mingw: drop MakeMaker reference >> > >>

Re: [PATCH] convert: avoid malloc of original file size

On Fri, Mar 08, 2019 at 10:26:24AM +0900, Junio C Hamano wrote: > Jeff King writes: > > > As discussed there, I do think this only solves half the problem, as the > > smudge filter has the same issue in reverse. That's more complicated to > > fix, and AFAIK nobody is working on it. But I don't t

Re: [PATCH 1/1] mingw: respect core.hidedotfiles = false in git-init again

"Johannes Schindelin via GitGitGadget" writes: > diff --git a/builtin/init-db.c b/builtin/init-db.c > index 93eff7618c..94df241ad5 100644 > --- a/builtin/init-db.c > +++ b/builtin/init-db.c > @@ -155,6 +155,9 @@ static int git_init_db_config(const char *k, const char > *v, void *cb) > if (

Re: [PATCH v3 1/4] merge-options.txt: correct typo

Denton Liu writes: > The scissors line is included after the human commit message. Therefore, > saying "scissors will be prepended" was incorrect. Update to say > "appended" which is more correct. > > Signed-off-by: Denton Liu > --- > > Notes: > Note that this can be squashed into 6f06b6aeef

Re: [GSoC][PATCH v2 3/3] t3600: use helpers to replace test -d/f/e/s

Eric Sunshine writes: > This patch, due to its length and repetitive nature, falls under the > category of being tedious to review, which makes it all the more > likely that a reviewer will overlook a problem. > > And, it's not always obvious at a glance that a change is correct. For > instance,