Re: [PATCH] send-email: error out when relogin delay is missing

2018-02-07 Thread xiaoqiang zhao
> 在 2018年2月8日,上午7:43,Stefan Beller 写道: > > +die __("When a batch size is given, the relogin delay must be set\n") > +if defined $relogin_delay and not defined $batch_size; > + According the code, maybe you want to say “When relogin delay is given, a batch size must be

[PATCH] docs/interpret-trailers: fix agreement error

2018-02-07 Thread brian m. carlson
In the description of git interpret-trailers, we describe "a group…of lines" that have certain characteristics. Because the first option uses a plural verb (referring to "lines"), the second option must also use plural verbs for parallelism. Signed-off-by: brian m. carlson

[PATCH v2] hash: update obsolete reference to SHA1_HEADER

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

Re: [PATCH 025/194] object-store: allow prepare_alt_odb to handle arbitrary repositories

2018-02-07 Thread brian m. carlson
On Tue, Feb 06, 2018 at 09:48:56AM -0800, Stefan Beller wrote: > On Mon, Feb 5, 2018 at 5:19 PM, brian m. carlson > wrote: > > On Mon, Feb 05, 2018 at 03:54:46PM -0800, Stefan Beller wrote: > >> @@ -434,12 +433,12 @@ static int link_alt_odb_entry_the_repository(const

Re: [PATCH v1] name-hash: properly fold directory names in adjust_dirname_case()

2018-02-07 Thread David Turner
On Wed, 2018-02-07 at 19:41 -0500, Ben Peart wrote: > Correct the pointer arithmetic in adjust_dirname_case() so that it > calls > find_dir_entry() with the correct string length. Previously passing > in > "dir1/foo" would pass a length of 6 instead of the correct 4. This > resulted in >

[PATCH v1] name-hash: properly fold directory names in adjust_dirname_case()

2018-02-07 Thread Ben Peart
Correct the pointer arithmetic in adjust_dirname_case() so that it calls find_dir_entry() with the correct string length. Previously passing in "dir1/foo" would pass a length of 6 instead of the correct 4. This resulted in find_dir_entry() never finding the entry and so the subsequent memcpy

Re: Fetch-hooks

2018-02-07 Thread Leo Gaspard
On 02/07/2018 11:51 PM, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Feb 07 2018, Leo Gaspard jotted: > >> Hello, >> >> tl;dr: Is there currently a way to have fetch hooks, and if not do you >> think it could be a nice feature? >> >> I was in the process of implementing hooks for git that ensure

[PATCH] send-email: error out when relogin delay is missing

2018-02-07 Thread Stefan Beller
When the batch size is neither configured nor given on the command line, but the relogin delay is given, then the current code ignores the relogin delay setting. This is unsafe as there was some intention when setting the batch size. One workaround would be to just assume a batch size of 1 as a

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-02-07 Thread SZEDER Gábor
> > OK how about some thing like this fixup patch? __gitcomp_builtin now > > allows to add extra options as well as remove some. > > > > -- 8< -- > > __gitcomp_builtin () > > { > > + local incl="$2" > > + local excl="$3" > > + options="$(__git ${cmd/_/ }

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-07 Thread Junio C Hamano
Øyvind Rønningstad writes: >> So no, I do not think that --recreate-merges --first-parent is a good > idea >> at all. Unless you try to do that non-interactively only, *and > disallow it >> in interactive mode*. Correct. If the original side branch has commits A, B and

Re: [PATCH 038/194] pack: allow sha1_loose_object_info to handle arbitrary repositories

2018-02-07 Thread Stefan Beller
On Wed, Feb 7, 2018 at 2:33 PM, Jonathan Tan wrote: > On Mon, 5 Feb 2018 15:54:59 -0800 > Stefan Beller wrote: > >> From: Jonathan Nieder >> >> Signed-off-by: Stefan Beller >> Signed-off-by: Jonathan Nieder

What's cooking in git.git (Feb 2018, #01; Wed, 7)

2018-02-07 Thread Junio C Hamano
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. I am migrating my build and

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-07 Thread Øyvind Rønningstad
edit: Sending again, hopefully without HTML :). Sorry for spamming. Hi, I think --recreate-merges is a very exciting feature. I've also been puzzled by why we can't just pick merge commits directly including conflict resolutions, so allow me to join the discussion. On Wed, Feb 7, 2018 at 6:36

Re: Fetch-hooks

2018-02-07 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 07 2018, Leo Gaspard jotted: > Hello, > > tl;dr: Is there currently a way to have fetch hooks, and if not do you > think it could be a nice feature? > > I was in the process of implementing hooks for git that ensure the > repository is always cleanly signed by someone allowed to by

Re: [PATCH v3 1/3] read-cache: fix reading the shared index for other repos

2018-02-07 Thread Junio C Hamano
Junio C Hamano writes: >>> This was a bit painful change, given that some changes in flight do >>> add new callsites to read_index_from() and they got the function >>> changed under their feet. >> >> Sorry about that. Is there any way to make such a change less painful >> in

Re: [PATCH 038/194] pack: allow sha1_loose_object_info to handle arbitrary repositories

2018-02-07 Thread Jonathan Tan
On Mon, 5 Feb 2018 15:54:59 -0800 Stefan Beller wrote: > From: Jonathan Nieder > > Signed-off-by: Stefan Beller > Signed-off-by: Jonathan Nieder > --- > sha1_file.c | 11 +-- > 1 file changed, 5

Re: "git branch" issue in 2.16.1

2018-02-07 Thread Lars Schneider
> On 07 Feb 2018, at 21:08, Jeff King wrote: > > On Wed, Feb 07, 2018 at 06:54:23PM +0100, Lars Schneider wrote: > >>> Maybe the number of branches changed since then? >>> As the pager only comes to life when the output fills >>> more than your screen. Quick workarounds: >>> *

Re: [PATCH 025/194] object-store: allow prepare_alt_odb to handle arbitrary repositories

2018-02-07 Thread Jonathan Tan
On Mon, 5 Feb 2018 15:54:46 -0800 Stefan Beller wrote: > + /* > + * Path to the alternate object database, relative to the > + * current working directory. > + */ > char path[FLEX_ARRAY]; I would prefer this to be commented: Path to the

Fetch-hooks

2018-02-07 Thread Leo Gaspard
Hello, tl;dr: Is there currently a way to have fetch hooks, and if not do you think it could be a nice feature? I was in the process of implementing hooks for git that ensure the repository is always cleanly signed by someone allowed to by the repository itself. I think I've completed the

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Todd Zullinger
Robert P. J. Day wrote: > not to belabour this (and i'm sure it's *way* too late for that), > but fedora has the following packaging scheme. first, there's a bunch > of stuff in "git-core", which has no dependencies on any other > git-related packages. The split in Fedora between git and

Hello

2018-02-07 Thread Merle Butler
Hello, I'm Mr. Merle Butler the mega winner of $218M In Mega Millions Jackpot, I'm donating to 5 random individuals if you get this email then your email was selected after a spin ball.I have spread most of my wealth over a number of charities and organizations. I and my wife Patricia Butler

Re: [PATCH] files-backend: unlock packed store only if locked

2018-02-07 Thread Junio C Hamano
Jonathan Tan writes: > On Wed, 7 Feb 2018 09:42:51 -0500 > Jeff King wrote: > >> But this all seemed strangely familiar... I think this is the same bug >> as: >> >> https://public-inbox.org/git/20180118143841.1a4c674d@novascotia/ >> >> which is

Re: [PATCHv3] tag: add --edit option

2018-02-07 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Feb 6, 2018 at 3:36 AM, Nicolas Morey-Chaisemartin > wrote: >> Add a --edit option whichs allows modifying the messages provided by -m or >> -F, >> the same way git commit --edit does. >> >> Signed-off-by:

Re: Bug? Error during commit

2018-02-07 Thread Jeff King
On Mon, Feb 05, 2018 at 08:59:52PM +0700, Duy Nguyen wrote: > On Mon, Feb 5, 2018 at 8:48 PM, Andreas Kalz wrote: > > Hello, > > > > I am using git frequently and usually it is running great. > > > > I read to write to this eMail address regarding problems and possible bugs.

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Todd Zullinger wrote: > Robert P. J. Day wrote: > > first, here are the executables under /usr/libexec/git-core/ that > > are unreferenced by that web page, but that should be fine as > > almost all of them would be considered underlying helpers or > > utilities (except for

Re: feature-request: git "cp" like there is git mv.

2018-02-07 Thread Stefan Beller
On Wed, Feb 7, 2018 at 11:49 AM, Junio C Hamano wrote: > Stefan Moch writes: > >> * Jonathan Nieder [2017-12-15T17:31:30-0800]: >>> This sounds like a reasonable thing to add. See builtin/mv.c for how >>> "git mv" works if you're

Re: "git branch" issue in 2.16.1

2018-02-07 Thread Junio C Hamano
Jeff King writes: > Keep in mind that we always run the pager, since we don't know ahead of > time how much output will be generated. It's just that with certain > configurations of "less", it may exit if it sees EOF before there's a > whole screen worth of data. > > This is

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 03:03:31PM -0500, Robert P. J. Day wrote: > huh ... well, that raises the question, if tla has been unbuildable > for that long (possibly for other distros), what is the value in > continuing to support git-archimport? > >

Re: "git branch" issue in 2.16.1

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 06:54:23PM +0100, Lars Schneider wrote: > > Maybe the number of branches changed since then? > > As the pager only comes to life when the output fills > > more than your screen. Quick workarounds: > > * buy a bigger screen > > * have fewer branches. > > Hmmm... there

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Todd Zullinger wrote: > Robert P. J. Day wrote: ... snip ... > > finally, from fedora, i am utterly unable to find a package that > > provides git-archimport. pretty sure fedora used to have a > > "git-arch" package but it's not there now. > > It hasn't been in Fedora since

[ANNOUNCE] Git for Windows 2.16.1(4)

2018-02-07 Thread Johannes Schindelin
Dear Git users, It is my pleasure to announce that Git for Windows 2.16.1(4) is available from: https://git-for-windows.github.io/ Changes since Git for Windows v2.16.1(3) (February 6th 2018) Bug Fixes * When called from TortoiseGit, git.exe can now spawn processes again .

Re: "git branch" issue in 2.16.1

2018-02-07 Thread Lars Schneider
> On 07 Feb 2018, at 19:09, Jason Racey wrote: > > Hi Lars, > > Here’s what I’m certain of: > > 1. Just set up a new MacBook Pro at work. Git version 2.16.1 installed via > Homebrew. “git branch” command always displays the list of branches in the > less pager, regardless

Re: [PATCH] send-email: have default batch size when relogin delay is given

2018-02-07 Thread Eric Sunshine
On Wed, Feb 7, 2018 at 2:45 PM, Stefan Beller wrote: > When the batch size is neither configured nor given on the command > line, but the relogin delay is given, then the user is not using the > the feature as intended. But as the user gave a relogin delay, there is > clearly

Re: feature-request: git "cp" like there is git mv.

2018-02-07 Thread Junio C Hamano
Stefan Moch writes: > * Jonathan Nieder [2017-12-15T17:31:30-0800]: >> This sounds like a reasonable thing to add. See builtin/mv.c for how >> "git mv" works if you're looking for inspiration. >> >> cmd_mv in that file looks rather long, so I'd also be

[PATCH] send-email: have default batch size when relogin delay is given

2018-02-07 Thread Stefan Beller
When the batch size is neither configured nor given on the command line, but the relogin delay is given, then the user is not using the the feature as intended. But as the user gave a relogin delay, there is clearly the intention to delay sending out emails. Assume a batch size of 1 instead of

Re: [PATCH v2] rebase: add --allow-empty-message option

2018-02-07 Thread Junio C Hamano
Johannes Schindelin writes: > Very nice. I looked over the patch (sorry, I have too little time to test > this thoroughly, but then, it is the custom on this here mailing list to > just review the patch as per the mail) and it looks very good to me. > > Junio, if you

Re: [PATCH v2 00/41] Automate updating git-completion.bash a bit

2018-02-07 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > I posted a proof of concept a while back [1]. This is the full version. > > This series lets "git" binary help git-completion.bash to complete > -- so that when a new option is added, we don't have to update > git-completion.bash manually too

Re: [PATCH] t0050: remove the unused $test_case variable

2018-02-07 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 07 2018, Johannes Sixt jotted: > Am 07.02.2018 um 09:07 schrieb Ævar Arnfjörð Bjarmason: >> >> On Wed, Feb 07 2018, Johannes Sixt jotted: >> >>> Am 07.02.2018 um 00:13 schrieb Ævar Arnfjörð Bjarmason: The $test_case variable hasn't been used since decd3c0c28 ("t0050-*.sh:

Re: [PATCH v3 22/35] upload-pack: support shallow requests

2018-02-07 Thread Stefan Beller
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > Add the 'shallow' feature to the protocol version 2 command 'fetch' > which indicates that the server supports shallow clients and deepen > requets. > > Signed-off-by: Brandon Williams > --- >

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Todd Zullinger
Robert P. J. Day wrote: > On Wed, 7 Feb 2018, Todd Zullinger wrote: > >> Robert P. J. Day wrote: >>> first, here are the executables under /usr/libexec/git-core/ that >>> are unreferenced by that web page, but that should be fine as >>> almost all of them would be considered underlying helpers or

Re: [PATCH] t0050: remove the unused $test_case variable

2018-02-07 Thread Johannes Sixt
Am 07.02.2018 um 09:07 schrieb Ævar Arnfjörð Bjarmason: On Wed, Feb 07 2018, Johannes Sixt jotted: Am 07.02.2018 um 00:13 schrieb Ævar Arnfjörð Bjarmason: The $test_case variable hasn't been used since decd3c0c28 ("t0050-*.sh: mark the rename (case change) test as passing", 2014-11-28) when

Re: [PATCH] files-backend: unlock packed store only if locked

2018-02-07 Thread Jonathan Tan
On Wed, 7 Feb 2018 09:42:51 -0500 Jeff King wrote: > But this all seemed strangely familiar... I think this is the same bug > as: > > https://public-inbox.org/git/20180118143841.1a4c674d@novascotia/ > > which is queued as mr/packed-ref-store-fix. It's listed as "will merge >

Re: [PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

2018-02-07 Thread Junio C Hamano
Duy Nguyen writes: > ... > Then we still need to decide the new keyword for this feature, I feel > compact is a bit too vague (I read --stat=compact as "it's compact > stat", not "stat with compact summary"), so perhaps > --stat=compact-summary, or just --stat=summary? Yup,

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 09:25:42AM -0800, Elijah Newren wrote: > > So other_head_refs knows that it's looking at the worktrees. And it > > passes the alternate ref-store to refs_head_ref(), with "add_one_ref" as > > the callback. But the knowledge that we're not talking about the real > > "HEAD"

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Elijah Newren
On Wed, Feb 7, 2018 at 3:08 AM, Duy Nguyen wrote: > On Wed, Feb 7, 2018 at 7:00 AM, Elijah Newren wrote: >> and knew they had been using it, then I might have guessed that "HEAD" >> meant "not your actual HEAD but the HEAD of the vestige of some other >>

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

2018-02-07 Thread Junio C Hamano
Torsten Bögershausen writes: >> the user explicitly tells us it is in UTF-16, right? Is there such a >> thing as UTF-16 binary? > > I don't think so, by definiton UTF-16 is ment to be text. > (this means that git ls-files --eol needs some update, I can have a look) > > Do we

Re: BUG: On some Linux systems, "Stage To Commit" hotkey in git-gui stages one file only, even if multiple files are selected

2018-02-07 Thread Eric Sunshine
On Wed, Feb 7, 2018 at 8:29 AM, Birger Skogeng Pedersen wrote: > Steps to reproduce (on Ubuntu 17.10): > - Open git-gui in a repository with two or more unstaged, changed files > - Select two or more files in the "Unstaged Changes" > - Click CTRL+T to stage the files that you

Re: "git branch" issue in 2.16.1

2018-02-07 Thread Jason Racey
Hi Lars, Here’s what I’m certain of: 1. Just set up a new MacBook Pro at work. Git version 2.16.1 installed via Homebrew. “git branch” command always displays the list of branches in the less pager, regardless of number of branches or screen size. I’ve never seen this happen before. 2.

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Todd Zullinger wrote: > Robert P. J. Day wrote: > > first, here are the executables under /usr/libexec/git-core/ that > > are unreferenced by that web page, but that should be fine as > > almost all of them would be considered underlying helpers or > > utilities (except for

Re: [RFC PATCH 000/194] Moving global state into the repository object

2018-02-07 Thread Stefan Beller
On Wed, Feb 7, 2018 at 3:48 AM, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 6:51 AM, Stefan Beller wrote: >> This series moves a lot of global state into the repository struct. >> It applies on top of 2512f15446149235156528dafbe75930c712b29e (2.16.0) >> It

Re: "git branch" issue in 2.16.1

2018-02-07 Thread Lars Schneider
> On 06 Feb 2018, at 21:05, Stefan Beller wrote: > > On Tue, Feb 6, 2018 at 11:57 AM, Todd Zullinger wrote: >> Hi Jason, >> >> Jason Racey wrote: >>> After upgrading git from 2.16.0 to 2.16.1 (via Homebrew - >>> I’m on macOS) I noticed that the “git branch”

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-07 Thread Johannes Schindelin
Hi, On Wed, 7 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > > > +--recreate-merges:: > > + Recreate merge commits instead of flattening the history by replaying > > + merges. Merge conflict resolutions or manual amendments to merge >

Re: categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Todd Zullinger
Robert P. J. Day wrote: > first, here are the executables under /usr/libexec/git-core/ that > are unreferenced by that web page, but that should be fine as almost > all of them would be considered underlying helpers or utilities > (except for things like git-subtree, but we're still unclear on its

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Elijah Newren
On Wed, Feb 7, 2018 at 5:21 AM, Jeff King wrote: > On Tue, Feb 06, 2018 at 04:00:32PM -0800, Elijah Newren wrote: > >> It took me hours to figure it out, after users ran out of ideas and >> came and asked me for help. (Maybe if I was familiar with worktree, >> and knew they had

RE: git: CVE-2018-1000021: client prints server sent ANSI escape codes to the terminal, allowing for unverified messages to potentially execute arbitrary commands

2018-02-07 Thread Randall S. Becker
On February 7, 2018 11:53 AM, Andreas Schwab wrote: > On Feb 06 2018, "Randall S. Becker" wrote: > > > What I don't know - and it's not explicitly in the CVE - is just how > > many other terminal types with similar vulnerabilities are out there, > > but I'm suspecting

Re: [PATCH v2] dir.c: ignore paths containing .git when invalidating untracked cache

2018-02-07 Thread Ben Peart
On 2/7/2018 4:21 AM, Nguyễn Thái Ngọc Duy wrote: read_directory() code ignores all paths named ".git" even if it's not a valid git repository. See treat_path() for details. Since ".git" is basically invisible to read_directory(), when we are asked to invalidate a path that contains ".git", we

[PATCHv4] tag: add --edit option

2018-02-07 Thread Nicolas Morey-Chaisemartin
Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin --- Fixes since v3 ( https://public-inbox.org/git/88e7c122-599f-4ab1-6d65-c75f7a3ae...@suse.com/ ): *

Re: git: CVE-2018-1000021: client prints server sent ANSI escape codes to the terminal, allowing for unverified messages to potentially execute arbitrary commands

2018-02-07 Thread Andreas Schwab
On Feb 06 2018, "Randall S. Becker" wrote: > What I don't know - and it's not explicitly in the CVE - is just how many > other terminal types with similar vulnerabilities are out there, but I'm > suspecting it's larger than one would guess - mostly, it seems like this >

Re: [RFC PATCH 000/194] Moving global state into the repository object

2018-02-07 Thread Jeff Hostetler
On 2/5/2018 6:51 PM, Stefan Beller wrote: This series moves a lot of global state into the repository struct. It applies on top of 2512f15446149235156528dafbe75930c712b29e (2.16.0) It can be found at https://github.com/stefanbeller/git/tree/object-store Motivation for this series: * Easier to

Re: Shawn Pearce has died

2018-02-07 Thread Jeff King
On Tue, Jan 30, 2018 at 01:49:08PM -0500, Jeff King wrote: > On Mon, Jan 29, 2018 at 11:15:55PM -0800, Chris DiBona wrote: > > > That's a fantastic idea. When is the contrib summit and is it open to > > others? I could send someone ... > > It's March 7th in Barcelona. Details are here: > >

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

2018-02-07 Thread Derrick Stolee
On 2/7/2018 10:08 AM, SZEDER Gábor wrote: On Mon, Feb 5, 2018 at 5:06 PM, Derrick Stolee wrote: On 2/2/2018 10:32 AM, SZEDER Gábor wrote: In my git repo, with 9 pack files at the moment, i.e. not that big a repo and not that many pack files: $ time ./git commit-graph

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

2018-02-07 Thread SZEDER Gábor
On Mon, Feb 5, 2018 at 5:06 PM, Derrick Stolee wrote: > On 2/2/2018 10:32 AM, SZEDER Gábor wrote: >> In my git repo, with 9 pack files at the moment, i.e. not that big a >> repo and not that many pack files: >> >>$ time ./git commit-graph --write --update-head >>

Bug report: Subtree split including extra commits

2018-02-07 Thread Daniel Karp
Apologies if this is the wrong place to send a bug report for Contributed software. I've run into what seems like an issue/bug with git subtree. I am trying to split a single directory of our repo into its own repo using git subtree. I ran the the following command from our project root: git

Re: [PATCH] files-backend: unlock packed store only if locked

2018-02-07 Thread Jeff King
On Tue, Feb 06, 2018 at 12:36:15PM -0800, Jonathan Tan wrote: > In commit 42c7f7ff9685 ("commit_packed_refs(): remove call to > `packed_refs_unlock()`", 2017-06-23), a call to packed_refs_unlock() was > added to files_initial_transaction_commit() in order to compensate for > removing that call

Re: [PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 02:53:17PM +0100, SZEDER Gábor wrote: > > The "too old" curl is older than 7.19.4, which we actually fail to build > > with since v2.12.0. So they probably did not even get as far as the > > tests. ;) > > Oh, OK, I was not aware of that. The oldest non-maintenance

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

2018-02-07 Thread Ben Peart
On 2/6/2018 7:27 AM, Duy Nguyen wrote: This is another thing that bugs me. I know you're talking about huge index files, but at what size should we start this sort of optimization? Writing down a few MBs on linux is cheap enough that I won't bother optimizing (and I get my UNTR extension

Re: [bug report]: error doing_rebase

2018-02-07 Thread Johannes Schindelin
Hi Bulat, Please make sure to keep the Git mailing list in Cc: (I get *very* prickly when Git users treat me as a free-of-cost help desk, and when I get that annoyed, I stop helping). On Tue, 6 Feb 2018, Bulat Musin wrote: > Yes, I tested again. > > With built 2.16... and it shows error

Re: [PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

2018-02-07 Thread SZEDER Gábor
On Fri, Jan 26, 2018 at 7:27 PM, Jeff King wrote: > On Fri, Jan 26, 2018 at 01:37:00PM +0100, SZEDER Gábor wrote: > >> The second 'test_i18ngrep' invocation in the test 'curl redirects >> respect whitelist' is missing its filename parameter. This has >> remained unnoticed since

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

2018-02-07 Thread Ben Peart
On 2/7/2018 5:59 AM, Duy Nguyen wrote: On Tue, Feb 6, 2018 at 7:55 PM, Duy Nguyen wrote: On Tue, Feb 6, 2018 at 7:27 PM, Duy Nguyen wrote: On Tue, Feb 6, 2018 at 8:48 AM, Ben Peart wrote: With the new behavior, making a change in

BUG: On some Linux systems, "Stage To Commit" hotkey in git-gui stages one file only, even if multiple files are selected

2018-02-07 Thread Birger Skogeng Pedersen
In git-gui, multiple files from the "Unstaged Changes" widget can be selected. Once multiple files are selected, they can be staged by clicking (toolbar) "Commit"->"Stage To Commit". All the files that were selected then gets staged for the commit. The "Stage To Commit" hotkey (CTRL+T) behaves

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 08:21:57AM -0500, Jeff King wrote: > The best PSA for this particular bug may be "try pruning the worktrees": > > $ git worktree prune -v > Removing worktrees/foo: gitdir file points to non-existent location > > $ git prune; echo $? > 0 Sorry, I just read

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 06:08:40PM +0700, Duy Nguyen wrote: > > And/or ideas of what steps could cause corruption so I can send out a > > PSA to help users avoid it? > > There is another thing we could do. One bad HEAD should not abort the > entire operation (at least if it's not the current

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Jeff King
On Tue, Feb 06, 2018 at 04:00:32PM -0800, Elijah Newren wrote: > > According to Peff this got fixed > > https://public-inbox.org/git/20171020031630.44zvzh3d2vlhg...@sigill.intra.peff.net/ > > and but you've had a corrupted repo from back when you were using an older > > version of Git. > > > >

categorization, documentation and packaging of "git core" commands

2018-02-07 Thread Robert P. J. Day
(related to earlier thread but different enough that i'll start fresh.) based on the collection of man page links here: https://www.kernel.org/pub/software/scm/git/docs/ i took a look at how git 2.14.3 is laid out on my fedora 27 system, particularly all of the executables under

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Jean-Noël Avila
On 07/02/2018, Jeff King wrote: > On Wed, Feb 07, 2018 at 12:37:32PM +0100, Ævar Arnfjörð Bjarmason wrote: > > >> It's not fully auto-generated so stuff like git-worktree doesn't get >> added automatically, I just added a PR for that: >> https://github.com/git/git-scm.com/pull/1133 > Thanks for

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 11:34:51AM +, pedro rijo wrote: > The command list under https://git-scm.com/docs doesn't show all the > commands. It's a manually curated list as we can see at > > - https://github.com/git/git-scm.com/blob/master/app/views/doc/ref.html.erb > -

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Jeff King
On Wed, Feb 07, 2018 at 12:37:32PM +0100, Ævar Arnfjörð Bjarmason wrote: > > however, while there is no link for the "worktree" command, there > > does in fact exist a similarly-named web page > > https://git-scm.com/docs/git-worktree. > > It is an official site, of the git project. The

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Duy Nguyen
On Wed, Feb 7, 2018 at 6:58 PM, Robert P. J. Day wrote: > On Wed, 7 Feb 2018, Duy Nguyen wrote: > >> On Wed, Feb 7, 2018 at 6:41 PM, Robert P. J. Day >> wrote: >> > On Wed, 7 Feb 2018, Duy Nguyen wrote: >> > >> >> On Wed, Feb 7, 2018 at 5:54 PM,

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Duy Nguyen wrote: > On Wed, Feb 7, 2018 at 6:41 PM, Robert P. J. Day > wrote: > > On Wed, 7 Feb 2018, Duy Nguyen wrote: > > > >> On Wed, Feb 7, 2018 at 5:54 PM, Robert P. J. Day > >> wrote: > >> > > >> > i ask WRT whether it

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Duy Nguyen
On Wed, Feb 7, 2018 at 6:41 PM, Robert P. J. Day wrote: > On Wed, 7 Feb 2018, Duy Nguyen wrote: > >> On Wed, Feb 7, 2018 at 5:54 PM, Robert P. J. Day >> wrote: >> > >> > i ask WRT whether it should be up to date. i'm currently writing a >> >

Re: [RFC PATCH 000/194] Moving global state into the repository object

2018-02-07 Thread Duy Nguyen
On Tue, Feb 6, 2018 at 6:51 AM, Stefan Beller wrote: > This series moves a lot of global state into the repository struct. > It applies on top of 2512f15446149235156528dafbe75930c712b29e (2.16.0) > It can be found at https://github.com/stefanbeller/git/tree/object-store > >

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Duy Nguyen wrote: > On Wed, Feb 7, 2018 at 5:54 PM, Robert P. J. Day > wrote: > > > > i ask WRT whether it should be up to date. i'm currently writing a > > number of git-related wiki pages, and i want to link to whatever are > > the canonical man

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 07 2018, Robert P. J. Day jotted: > i ask WRT whether it should be up to date. i'm currently writing a > number of git-related wiki pages, and i want to link to whatever are > the canonical man pages for various git commands, but that site seems > a bit off. > > if one follows a

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Duy Nguyen wrote: > On Wed, Feb 7, 2018 at 5:54 PM, Robert P. J. Day > wrote: > > > > i ask WRT whether it should be up to date. i'm currently writing a > > number of git-related wiki pages, and i want to link to whatever are > > the canonical man

Compliment of the day to you. Dear Friend

2018-02-07 Thread Mrs.Chantal Sonian Kadi
Compliment of the day to you. Dear Friend. for security reason contact me Through this email (mrschantal.sonian.k...@gmail.com) Dear Friend. I am Mrs.Chantal Sonian Kadi. am sending this brief letter to solicit your partnership to transfer $10.5 million US Dollars. I shall send you more

Re: is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Duy Nguyen
On Wed, Feb 7, 2018 at 5:54 PM, Robert P. J. Day wrote: > > i ask WRT whether it should be up to date. i'm currently writing a > number of git-related wiki pages, and i want to link to whatever are > the canonical man pages for various git commands, I think this one is

Re: BUG: fetch in certain repo always gives "did not send all necessary objects"

2018-02-07 Thread Duy Nguyen
On Wed, Feb 7, 2018 at 7:00 AM, Elijah Newren wrote: > and knew they had been using it, then I might have guessed that "HEAD" > meant "not your actual HEAD but the HEAD of the vestige of some other > worktree"). > > Does anyone have pointers about what might be doable in terms

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

2018-02-07 Thread Duy Nguyen
On Tue, Feb 6, 2018 at 7:55 PM, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 7:27 PM, Duy Nguyen wrote: >> On Tue, Feb 6, 2018 at 8:48 AM, Ben Peart wrote: >>> With the new behavior, making a change in dir1/, then calling status would >>>

is http://git-scm.com an *official* git-affiliated site?

2018-02-07 Thread Robert P. J. Day
i ask WRT whether it should be up to date. i'm currently writing a number of git-related wiki pages, and i want to link to whatever are the canonical man pages for various git commands, but that site seems a bit off. if one follows a link to get here: https://git-scm.com/doc there is

Re: [PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

2018-02-07 Thread Duy Nguyen
On Wed, Feb 7, 2018 at 4:52 PM, Eric Sunshine wrote: > On Tue, Feb 6, 2018 at 5:20 AM, Duy Nguyen wrote: >> On Tue, Feb 6, 2018 at 1:56 AM, Junio C Hamano wrote: >>> Duy Nguyen writes: >>> I actually think

Re: [PATCHv3] tag: add --edit option

2018-02-07 Thread Eric Sunshine
On Tue, Feb 6, 2018 at 3:36 AM, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > ---

Re: [RFC PATCH 000/194] Moving global state into the repository object

2018-02-07 Thread Eric Sunshine
On Tue, Feb 6, 2018 at 3:25 PM, Stefan Beller wrote: >> Any suggestions welcome! > > Eric repeatedly points out leaking memory. > > As of today we do not care about memory leaking as it is cleaned > up at the end of the program anyway, for example the objects > hash table is

Re: [PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

2018-02-07 Thread Eric Sunshine
On Tue, Feb 6, 2018 at 5:20 AM, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 1:56 AM, Junio C Hamano wrote: >> Duy Nguyen writes: >> I actually think compact-summary was a good way to phrase it. >> >> Personally, I think it was a UI mistake

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-07 Thread Sergey Organov
Jacob Keller writes: > On Tue, Feb 6, 2018 at 10:16 PM, Sergey Organov wrote: >> Johannes Schindelin writes: >> >> [...] >> >>> +--recreate-merges:: >>> + Recreate merge commits instead of flattening the history by

[PATCH v2] dir.c: ignore paths containing .git when invalidating untracked cache

2018-02-07 Thread Nguyễn Thái Ngọc Duy
read_directory() code ignores all paths named ".git" even if it's not a valid git repository. See treat_path() for details. Since ".git" is basically invisible to read_directory(), when we are asked to invalidate a path that contains ".git", we can safely ignore it because the slow path would not

[PATCH v2] dir.c: ignore paths containing .git when invalidating untracked cache

2018-02-07 Thread Nguyễn Thái Ngọc Duy
read_directory() code ignores all paths named ".git" even if it's not a valid git repository. See treat_path() for details. Since ".git" is basically invisible to read_directory(), when we are asked to invalidate a path that contains ".git", we can safely ignore it because the slow path would not

Windows: mintty.exe classified as exploit by AV software

2018-02-07 Thread Ehrt, Michael
Hi everyone, a few days ago I installed version 2.16.1.2, downloaded from https://git-scm.com/download/win on my Windows 7 system. The OS is Windows 7 Enterprise 64bit, Build 7601/SP1, in case it matters. This is a first time install, not an upgrade. Our current virus protection software is

Re: [PATCH v2 1/3] worktree: improve message when creating a new worktree

2018-02-07 Thread Eric Sunshine
On Sun, Feb 4, 2018 at 9:12 PM, Duy Nguyen wrote: > As a former translator, I'm not thrilled to see a sentence broken into > two pieces like this. I'm not a Japanese translator, but I think this > sentence is translated differently when the translator sees the whole > line

Re: [PATCH] t0050: remove the unused $test_case variable

2018-02-07 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 07 2018, Johannes Sixt jotted: > Am 07.02.2018 um 00:13 schrieb Ævar Arnfjörð Bjarmason: >> The $test_case variable hasn't been used since >> decd3c0c28 ("t0050-*.sh: mark the rename (case change) test as >> passing", 2014-11-28) when its last user went away. >> >> Let's remove the