Re: [PATCH 2/3] branch: split validate_new_branchname() into two

On Fri, 2017-10-13 at 14:11 +0900, Junio C Hamano wrote: > > diff --git a/branch.c b/branch.c > index 7404597678..2c3a364a0b 100644 > --- a/branch.c > +++ b/branch.c > @@ -178,19 +178,31 @@ int read_branch_desc(struct strbuf *buf, const char > *branch_name) > return 0; > } > > -int

Re: [PATCH 3/3] branch: forbid refs/heads/HEAD

Junio C Hamano writes: > > > Perhaps. Also we may want to make sure that "git branch -D HEAD" > > still works as a way to recover from historical mistakes. > > The only difference is improved tests where we use show-ref to make > sure refs/heads/HEAD does not exist when it

Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

On Fri, Oct 20, 2017 at 03:16:20PM +0200, Johannes Schindelin wrote: > > void tweak_fsmonitor(struct index_state *istate) > > { > > + int i; > > + > > + if (istate->fsmonitor_dirty) { > > + /* Mark all entries valid */ > > + trace_printf_key(_fsmonitor, "fsmonitor is

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 07:38:00PM -0700, David Lang wrote: > git whatchanged shows commits like: > > commit fb7e54c12ddc7c87c4862806d583f5c6abf3e731 > Author: David Lang > Date: Fri Oct 20 11:00:01 2017 -0700 > > update > > :100644 100644 1a842ca... 290e9dd... M

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

On Sat, Oct 21, 2017 at 02:19:16AM +0200, Simon Ruderich wrote: > On Fri, Oct 20, 2017 at 06:46:08PM -0400, Jeff King wrote: > >> I agree. Maybe just stick with the original patch? > > > > OK. Why don't we live with that for now, then. The only advantage of the > > "999" trickery is that it's

Re: [PATCH 4/3] t/Makefile: introduce TEST_SHELL_PATH

On Sat, Oct 21, 2017 at 01:50:01AM +0200, SZEDER Gábor wrote: > > On Thu, Oct 19, 2017 at 05:01:40PM -0400, Jeff King wrote: > > > > > I sometimes run git's test suite as part of an automated testing > > > process. I was hoping to add "-x" support to get more details when a > > > test fails

Re: [PATCH 0/3] a small branch API clean-up

On Fri, 2017-10-13 at 14:11 +0900, Junio C Hamano wrote: > This started as a little clean-up for a NEEDSWORK comment in > branch.h, but it ended up adding a rather useful safety feature. > Part of this series seems to duplicate the work done in part of my series that tries to give more useful

Re: [RFC PATCH v2 2/5] branch: re-order function arguments to group related arguments

On Fri, 2017-10-20 at 14:50 -0700, Stefan Beller wrote: > On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam > wrote: > > The ad-hoc patches to add new arguments to a function when needed > > resulted in the related arguments not being close to each other. > > This

Re: hot to get file sizes in git log output

On Fri, 20 Oct 2017, David Lang wrote: On Fri, 20 Oct 2017, Eric Sunshine wrote: I'm not exactly sure what you mean by size, but if you want to show how many lines were added and removed by a given commit for each file, you can use the "--stat" option to produce a diffstat. The "size" of the

Re: hot to get file sizes in git log output

On Fri, 20 Oct 2017, Eric Sunshine wrote: I'm not exactly sure what you mean by size, but if you want to show how many lines were added and removed by a given commit for each file, you can use the "--stat" option to produce a diffstat. The "size" of the files in each commit isn't very

Re: [RFC PATCH v2 1/5] branch: improve documentation and naming of certain parameters

On Fri, 2017-10-20 at 17:51 -0400, Eric Sunshine wrote: > On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam > wrote: > > Documentation for a certain function was incomplete as it didn't say > > what certain parameters were used for. Further a parameter name wasn't > >

Re: [RFC PATCH v2 1/5] branch: improve documentation and naming of certain parameters

On Fri, 2017-10-20 at 14:33 -0700, Stefan Beller wrote: > Up to here ( including the subject line), I have no idea you're talking about > 'create_branch'. Maybe > That's because I didn't want to be explicit. > branch: improve documentation and naming of parameters for create_branch > >

Re: Git for Windows v2.15.0-rc prerelease, was Re: [ANNOUNCE] Git v2.15.0-rc2

Bryan Turner writes: >> The Git for Windows equivalent is now available from >> >> >>

Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

Ben Peart writes: >>> + } else { >>> + trace_printf_key(_fsmonitor, "fsmonitor not enabled"); >>> + } >>> + > > I'd remove the trace statement above as it isn't always > accurate. fsmonitor could be enabled but just hasn't written/read the > extension yet. I

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

Simon Ruderich writes: > On Fri, Oct 20, 2017 at 06:46:08PM -0400, Jeff King wrote: >>> I agree. Maybe just stick with the original patch? >> >> OK. Why don't we live with that for now, then. The only advantage of the >> "999" trickery is that it's less likely to come up

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

Stefan Beller writes: > There was a recent thread (which I assumed was the one I linked), that talked > about security implications as soon as we loose the rather strict "git > is to be used > in a posix world", e.g. sharing your repo over NFS/Dropbox. The > specific question

Re: [PATCH] builtin/push.c: add push.pushOption config

Stefan Beller writes: >>> So in the config, we have to explicitly give an empty option to >>> clear the previous options, but on the command line we do not need >>> that, but instead we'd have to repeat any push options that we desire >>> that were configured? >> >> It is not

Re: [PATCH] builtin/push.c: add push.pushOption config

Marius Paliga writes: > Should we also mention that this option can take multiple values from > the command line? > > -o :: > --push-option=:: > Transmit the given string to the server, which passes them to > the pre-receive as well as the post-receive

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

On Fri, Oct 20, 2017 at 06:46:08PM -0400, Jeff King wrote: >> I agree. Maybe just stick with the original patch? > > OK. Why don't we live with that for now, then. The only advantage of the > "999" trickery is that it's less likely to come up again. If it doesn't, > then we're happy. If it does,

Re: [PATCH 4/3] t/Makefile: introduce TEST_SHELL_PATH

> On Thu, Oct 19, 2017 at 05:01:40PM -0400, Jeff King wrote: > > > I sometimes run git's test suite as part of an automated testing > > process. I was hoping to add "-x" support to get more details when a > > test fails (since failures are sometimes hard to reproduce). Would it make sense (or

Re: Git for Windows v2.15.0-rc prerelease, was Re: [ANNOUNCE] Git v2.15.0-rc2

On Fri, Oct 20, 2017 at 3:22 PM, Johannes Schindelin wrote: > Hi team, > > [cutting linux-kernel] > > On Fri, 20 Oct 2017, Junio C Hamano wrote: > >> A release candidate Git v2.15.0-rc2 is now available for testing >> at the usual places. > > The Git for Windows

I need your cooperation

Dear Friend, I know that this mail will come to you as a surprise as we have never met before, but need not to worry as I am contacting you independently of my investigation and no one is informed of this communication. I need your urgent assistance in transferring the sum of $11.3million

[PATCH 4/3] t/Makefile: introduce TEST_SHELL_PATH

On Thu, Oct 19, 2017 at 05:01:40PM -0400, Jeff King wrote: > I sometimes run git's test suite as part of an automated testing > process. I was hoping to add "-x" support to get more details when a > test fails (since failures are sometimes hard to reproduce). But I hit a > few small snags: > >

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

On Fri, Oct 20, 2017 at 02:27:40PM -0700, Stefan Beller wrote: > > So I dunno. It does solve the problem in a way that the individual test > > scripts wouldn't have to care about. But it's a lot of eval trickery. > > I agree. Maybe just stick with the original patch? OK. Why don't we live with

Re: [PATCH 4/5] diff: fix whitespace-skipping with --color-moved

On Fri, Oct 20, 2017 at 09:23:54AM +0200, Simon Ruderich wrote: > On Thu, Oct 19, 2017 at 04:29:26PM -0400, Jeff King wrote: > > [snip] > > > > --- a/t/t4015-diff-whitespace.sh > > +++ b/t/t4015-diff-whitespace.sh > > @@ -1463,6 +1463,73 @@ test_expect_success 'move detection ignoring > >

Git for Windows v2.15.0-rc prerelease, was Re: [ANNOUNCE] Git v2.15.0-rc2

Hi team, [cutting linux-kernel] On Fri, 20 Oct 2017, Junio C Hamano wrote: > A release candidate Git v2.15.0-rc2 is now available for testing > at the usual places. The Git for Windows equivalent is now available from

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 2:50 PM, Eric Sunshine wrote: > On Fri, Oct 20, 2017 at 5:43 PM, Jeff King wrote: >> On Fri, Oct 20, 2017 at 01:44:36PM -0700, Jacob Keller wrote: >>> On Fri, Oct 20, 2017 at 11:12 AM, David Lang wrote: >>> > I'm

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 5:43 PM, Jeff King wrote: > On Fri, Oct 20, 2017 at 01:44:36PM -0700, Jacob Keller wrote: >> On Fri, Oct 20, 2017 at 11:12 AM, David Lang wrote: >> > I'm needing to scan through git history looking for the file sizes (looking >> > for when a

Re: [RFC PATCH v2 1/5] branch: improve documentation and naming of certain parameters

On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam wrote: > Documentation for a certain function was incomplete as it didn't say > what certain parameters were used for. Further a parameter name wasn't > very communicative. > > So, add missing documentation for the sake

Re: [RFC PATCH v2 2/5] branch: re-order function arguments to group related arguments

On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam wrote: > The ad-hoc patches to add new arguments to a function when needed > resulted in the related arguments not being close to each other. > This misleads the person reading the code to believe that there isn't >

Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

On 10/20/2017 9:16 AM, Johannes Schindelin wrote: Hi Alex, On Thu, 19 Oct 2017, Alex Vandiver wrote: extern struct index_state the_index; diff --git a/fsmonitor.c b/fsmonitor.c index 7c1540c05..4c2668f57 100644 --- a/fsmonitor.c +++ b/fsmonitor.c @@ -49,20 +49,7 @@ int

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 01:44:36PM -0700, Jacob Keller wrote: > On Fri, Oct 20, 2017 at 11:12 AM, David Lang wrote: > > I'm needing to scan through git history looking for the file sizes (looking > > for when a particular file shrunk drastically) > > > > I'm not seeing an option

Re: [RFC PATCH v2 1/5] branch: improve documentation and naming of certain parameters

On Mon, Sep 25, 2017 at 1:20 AM, Kaartic Sivaraam wrote: > Documentation for a certain function was incomplete as it didn't say > what certain parameters were used for. Further a parameter name wasn't > very communicative. > > So, add missing documentation for the sake

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

On Thu, Oct 19, 2017 at 10:50 PM, Jeff King wrote: > On Thu, Oct 19, 2017 at 07:23:37PM -0400, Jeff King wrote: > >> So one trick is that we can't just set it to a higher number. We have to >> also open and manage that descriptor. It might be enough to do: >> >> if test -n

Re: [RFE] Add minimal universal release management capabilities to GIT

On Fri, Oct 20, 2017 at 3:40 AM, wrote: > Hi, > > Git is a wonderful tool, which has transformed how software is created, and > made code sharing and reuse, a lot easier (both between human and software > tools). > > Unfortunately Git is so good more and more

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

On Thu, Oct 19, 2017 at 11:04 PM, Jeff King wrote: > On Thu, Oct 19, 2017 at 10:27:28PM -0700, Stefan Beller wrote: > >> > If my analysis above is correct, then it's already fixed. You just had >> > leftover corruption. >> >> Well fetching yesterday worked and the commit in

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 11:12 AM, David Lang wrote: > I'm needing to scan through git history looking for the file sizes (looking > for when a particular file shrunk drastically) > > I'm not seeing an option in git log or git whatchanged that gives me the > file size, am I

Re: [PATCH] builtin/push.c: add push.pushOption config

On Thu, Oct 19, 2017 at 7:19 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> @@ -161,6 +161,9 @@ already exists on the remote side. >>> Transmit the given string to the server, which passes them to >>> the pre-receive as well as the

Re: [RFC PATCH v2 0/5] Give more useful error messages when renaming a branch

On Fri, Oct 20, 2017 at 12:09 AM, Kaartic Sivaraam wrote: > What happened to the v2 of the patch? Has this not received attention > or is there anything that's not done correctly? > I just checked origin/pu as well as the latest cooking email

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

> Ben's original mail talks about integrity checks of the index file, and > how expensive they get when you talk about any decent-sized index (read: > *a lot* larger than Git or even Linux developers will see regularly). I am quite aware of your situation. > The text you quoted talks about our

hot to get file sizes in git log output

I'm needing to scan through git history looking for the file sizes (looking for when a particular file shrunk drastically) I'm not seeing an option in git log or git whatchanged that gives me the file size, am I overlooking something? David Lang

[PATCH] l10n: de.po: fix typos

From: Andre Hinrichs Signed-off-by: Andre Hinrichs Signed-off-by: Ralf Thielow --- po/de.po | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/de.po b/po/de.po index

[RFC] protocol version 2

Objective === Replace Git's current wire protocol with a simpler, less wasteful protocol that can evolve over time. Background Git's wire protocol is the language used to clone/fetch/push from/to a remote git repository. A detailed explanation of the current protocol

Contact me for more informations.

Greetings You are being contacted you is to transfer an abandoned $26.7m Thousand Dollars) to your account. As the Next Of Kin to deceased customer who died in motor accident with his family living no body behind to put claim on his deposit in our bank, you would be given more information upon

Re: Updated to v2.14.2 on macOS; git add --patch broken

On Tue, 2017-10-03 at 05:10 -0400, Jeff King wrote: > I dunno. Maybe I am wrong, because certainly I never set it. We've > had > two reports on the list since v2.14.2. The motivation for the first > was > "I have no idea why I set that, and I'll switch to auto". This is the > second. > I also

Re: [PATCH 3/4] fsmonitor: Document GIT_TRACE_FSMONITOR

On 10/19/2017 9:11 PM, Alex Vandiver wrote: Signed-off-by: Alex Vandiver --- Documentation/git.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/git.txt b/Documentation/git.txt index 1fca63634..720db196e 100644 --- a/Documentation/git.txt +++

Re: [PATCH 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman

On 10/20/2017 9:00 AM, Johannes Schindelin wrote: Hi Alex, On Thu, 19 Oct 2017, Alex Vandiver wrote: This provides small performance savings. diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman index 377edc7be..eba46c78b 100755 --- a/t/t7519/fsmonitor-watchman +++

Re: [PATCH 0/4] fsmonitor fixes

Hi Alex, On Thu, 19 Oct 2017, Alex Vandiver wrote: > A few fixes found from playing around with the fsmonitor branch in > next. Thank you for having a look, and even better: for sending a couple of improvements on top of Ben's & my work. I sent a couple of suggestions and hope you will find

Re: [PATCH 4/4] fsmonitor: Delay updating state until after split index is merged

Hi Alex, On Thu, 19 Oct 2017, Alex Vandiver wrote: > extern struct index_state the_index; > diff --git a/fsmonitor.c b/fsmonitor.c > index 7c1540c05..4c2668f57 100644 > --- a/fsmonitor.c > +++ b/fsmonitor.c > @@ -49,20 +49,7 @@ int read_fsmonitor_extension(struct index_state *istate, > const

[PATCH v4] commit: check result of resolve_ref_unsafe

Add check of the resolved HEAD reference while printing of a commit summary. resolve_ref_unsafe() may return NULL pointer if underlying calls of lstat() or open() fail in files_read_raw_ref(). Such situation can be caused by race: file becomes inaccessible to this moment. Signed-off-by: Andrey

IMPORTANT INFORMATION,

Good Day, Please accept my apologies for writing you a surprise letter.I am Mr Thomas Alpha, account Manager with an investment bank here in Burkina Faso. I have a very important business I want to discuss with you.There is a draft account opened in my firm by a long-time client of our bank.I

Re: [PATCH 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman

Hi Alex, On Thu, 19 Oct 2017, Alex Vandiver wrote: > This provides small performance savings. > > diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman > index 377edc7be..eba46c78b 100755 > --- a/t/t7519/fsmonitor-watchman > +++ b/t/t7519/fsmonitor-watchman > @@ -51,7 +51,7 @@

Re: [PATCH 1/4] fsmonitor: Watch, and ask about, the top of the repo, not the CWD

Hi Alex, On Thu, 19 Oct 2017, Alex Vandiver wrote: > Signed-off-by: Alex Vandiver > --- > t/t7519/fsmonitor-watchman | 3 ++- > templates/hooks--fsmonitor-watchman.sample | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git

Re: [PATCH v1] read_index_from(): Skip verification of the cache entry order to speed index loading

Hi Stefan, On Thu, 19 Oct 2017, Stefan Beller wrote: > On Thu, Oct 19, 2017 at 8:12 AM, Ben Peart wrote: > > > If we are guarding against "git" writing out an invalid index, we can move > > this into an assert so that only git developers pay the cost of validating > > they

[PATCH v3] commit: check result of resolve_ref_unsafe

Add check of the resolved HEAD reference while printing of a commit summary. resolve_ref_unsafe() may return NULL pointer if underlying calls of lstat() or open() fail in files_read_raw_ref(). Such situation can be caused by race: file becomes inaccessible to this moment. Signed-off-by: Andrey

[RFE] Add minimal universal release management capabilities to GIT

Hi, Git is a wonderful tool, which has transformed how software is created, and made code sharing and reuse, a lot easier (both between human and software tools). Unfortunately Git is so good more and more developers start to procrastinate on any activity that happens outside of GIT, starting

Re: [PATCH v2] commit: check result of resolve_ref_unsafe

19.10.2017 20:44, Jeff King wrote: On Thu, Oct 19, 2017 at 12:36:50PM +0300, Andrey Okoshkin wrote: Thanks, this looks good to me. One other possible minor improvement: head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL); + if (!head) + die(_("unable to

I Hope you have not forgotten me??

Hello Dear Friend, I Hope you have not forgotten me?? It is my pleasure to reach you after our unsuccessful attempt on our business transaction. Well, I just want to use this medium to thank you very much for your earlier assistance to help me in receiving the funds. I am obliged to inform you

Re: [PATCH] builtin/push.c: add push.pushOption config

> --o:: > ---push-option:: > +-o :: > +--push-option=:: > Transmit the given string to the server, which passes them to > the pre-receive as well as the post-receive hook. The given string > must not contain a NUL or LF character. > - When no `--push-option ` is given

Re: [PATCH 2/1] mention git stash push first in the man page

On Thu, 19 Oct 2017, Thomas Gummerer wrote: > On 10/17, Jeff King wrote: > > On Tue, Oct 17, 2017 at 10:45:15PM +0100, Thomas Gummerer wrote: > > > > > > Seems reasonable, though if we are deprecating "save" should we demote > > > > it from being in the synopsis entirely? > > > > > > I saw that

Re: [PATCH 4/5] diff: fix whitespace-skipping with --color-moved

On Thu, Oct 19, 2017 at 04:29:26PM -0400, Jeff King wrote: > [snip] > > --- a/t/t4015-diff-whitespace.sh > +++ b/t/t4015-diff-whitespace.sh > @@ -1463,6 +1463,73 @@ test_expect_success 'move detection ignoring > whitespace changes' ' > test_cmp expected actual > ' > > +test_expect_failure

Re: [RFC PATCH v2 0/5] Give more useful error messages when renaming a branch

What happened to the v2 of the patch? Has this not received attention or is there anything that's not done correctly? -- Kaartic

[ANNOUNCE] Git v2.15.0-rc2

A release candidate Git v2.15.0-rc2 is now available for testing at the usual places. It is comprised of 737 non-merge commits since v2.14.0, contributed by 75 people, 22 of which are new faces. We had to back-track a bit wrt to the "git add -p" regression; for now, we simply revert the changes

Hi Dear,

Hi Dear, how are you today I hope that everything is OK with you as it is my great pleasure to contact you in having communication with you starting from today, i was just going through the Internet search when i found your email address, I want to make a very new and special friend, so i

Re: [PATCH] builtin/push.c: add push.pushOption config

Junio C Hamano writes: > Junio C Hamano writes: > >>> We'd also want to document how push.pushOption works in >>> Documentation/config.txt (that contains all the configs) >> >> Perhaps. > > Here is my attempt. Another thing I noticed while we are around

Re: [PATCH] builtin/push.c: add push.pushOption config

Junio C Hamano writes: >> We'd also want to document how push.pushOption works in >> Documentation/config.txt (that contains all the configs) > > Perhaps. Here is my attempt. I have a feeling that the way http.extraheaders is described may be much easier to read and we may

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

On Thu, Oct 19, 2017 at 10:27:28PM -0700, Stefan Beller wrote: > > If my analysis above is correct, then it's already fixed. You just had > > leftover corruption. > > Well fetching yesterday worked and the commit in question is from > 8/23, the merge 8a044c7f1d56cef657be342e40de0795d688e882 >