Re: [PATCH 4/7] builtin/describe.c: print debug statements earlier

Stefan Beller writes: > For debuggers aid we'd want to print debug statements early, so > introduce a new line in the debug output that describes the whole > function, and the change the next debug output to describe why we need > to search. Conveniently drop the arg from the second line; which w

Re: [PATCH v4] merge-recursive: check GIT_MERGE_VERBOSITY only once

31.10.2017 05:26, Junio C Hamano wrote: > Junio C Hamano writes: > >> That holds true for the code before or after this patch equally. In >> other words, that sounds like a justification for rejecting this >> patch (i.e. explanation of why this change is not needed). >> >> If we are worried abou

Re: [PATCH] diff: --indent-heuristic is no longer experimental

Carlos Martín Nieto writes: > This heuristic has been the default since 2.14 so we should not confuse our > users by saying that it's experimental and off by default. > > Signed-off-by: Carlos Martín Nieto > --- > Documentation/diff-heuristic-options.txt | 5 - > Documentation/diff-options.

Re: [PATCH v4] merge-recursive: check GIT_MERGE_VERBOSITY only once

Andrey Okoshkin writes: > I think, the main benefits are: > * Code is more readable, no duplicated calls with the same constant string > argument. > * Code is potentially safer, the second getenv() call may return another > pointer value which could be NULL (and yes, this is an arguable point as

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

On October 30, 2017 5:46:36 AM PDT, Johannes Schindelin wrote: >Hi Phillip, > >On Mon, 30 Oct 2017, Phillip Wood wrote: > >> On 30/10/17 06:26, Jacob Keller wrote: >> > On Sun, Oct 29, 2017 at 8:36 PM, Junio C Hamano >wrote: >> >> Jacob Keller writes: >> >> >> >>> I am pretty confident we can

Re: [PATCH 3/7] builtin/describe.c: rename `oid` to avoid variable shadowing

On October 30, 2017 5:33:47 PM PDT, Stefan Beller wrote: >The function `describe` has already a variable named `oid` declared at >the beginning of the function for an object id. Do now shadow that Nit, s/now/not/ >variable with a pointer to an object id. > >Signed-off-by: Stefan Beller >---

[PATCH v5] merge-recursive: check GIT_MERGE_VERBOSITY only once

Get rid of the duplicated getenv('GIT_MERGE_VERBOSITY') calls with the same constant string argument. This makes code more readable and prevents typo in the further development. Signed-off-by: Andrey Okoshkin Reviewed-by: Stefan Beller --- Commit message is reworked according to the feedback. m

My Greetings

My Greetings MY Name Is Mrs Raymond.Mabel I am contacting you to help me And My Daughter to relocate to your country My husband was a serving director of the Gold exporting board until his death He Was killed My the Terrorist Attack Here In the City Of Ouagadougou The Capital City Of Burkina

[PATCH 1/2] sequencer: factor out rewrite_file()

Reduce code duplication by extracting a function for rewriting an existing file. Signed-off-by: Rene Scharfe --- sequencer.c | 46 +- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/sequencer.c b/sequencer.c index f2a10cc4f2..17360eb38a

[PATCH 2/2] sequencer: use O_TRUNC to truncate files

Cut off any previous content of the file to be rewritten by passing the flag O_TRUNC to open(2) instead of calling ftruncate(2) at the end. That's easier and shorter. Signed-off-by: Rene Scharfe --- sequencer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sequencer.c b/

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

On 10/30/2017 9:49 PM, Junio C Hamano wrote: Ben Peart writes: Any updates or thoughts on this one? While the patch has become quite trivial, it does results in a savings of 5%-15% in index load time. I thought the compromise of having this test only run when DEBUG is defined should limit

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

On 10/30/2017 8:33 PM, Alex Vandiver wrote: On Mon, 30 Oct 2017, Jeff King wrote: On Mon, Oct 30, 2017 at 08:48:48AM -0400, Ben Peart wrote: Any updates or thoughts on this one? While the patch has become quite trivial, it does results in a savings of 5%-15% in index load time. I like the

RE: What's cooking in git.git (Oct 2017, #07; Mon, 30)

From: Junio C Hamano [mailto:gits...@pobox.com] Subject: Re: What's cooking in git.git (Oct 2017, #07; Mon, 30) > Jeff Hostetler writes: > >> I've been assuming that the jt/partial-clone-lazy-fetch is a >> placeholder for our next combined patch series. > > Yes, that, together with the expec

[PATCH] t5580: add Cygwin support

t5580 tests that specifying Windows UNC paths works with Git. Cygwin supports UNC paths, albeit only using forward slashes, not backslashes, so run the compatible tests on Cygwin as well as MinGW. The only complication is Cygwin's `pwd`, which returns a *nix-style path, and that's not suitable fo

[PATCH 1/3] notes: move hex_to_bytes() to hex.c and export it

Make the function for converting pairs of hexadecimal digits to binary available to other call sites. Signed-off-by: Rene Scharfe --- cache.h | 7 +++ hex.c | 12 notes.c | 17 - 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/cache.h b/cache.

[PATCH 3/3] sha1_file: use hex_to_bytes()

The path of a loose object contains its hash value encoded into two substrings of 2 and 38 hexadecimal digits separated by a slash. The first part is handed to for_each_file_in_obj_subdir() in decoded form as subdir_nr. The current code builds a full hexadecimal representation of the hash in a te

[PATCH 2/3] http-push: use hex_to_bytes()

The path of a loose object contains its hash value encoded into two substrings of hexadecimal digits, separated by a slash. The current code copies the pieces into a temporary buffer to get rid of the slash and then uses get_oid_hex() to decode the hash value. Avoid the copy by using hex_to_bytes

Bug/Wish: bash completion for git pull --rebase doesn't include --autostash

git pull --rebase --autostash is a valid command but the --autostash autocompletion is not suggested after typing git pul --reb

Re:

Attn: I am wondering why You haven't respond to my email for some days now. reference to my client's contract balance payment of (11.7M,USD) Kindly get back to me for more details. Best Regards Amos Kalonzo

How to resolve mixture of modified and deleted conflicts easily in git?

When doing a rebase, sometimes I will get `DU` and `UU` conflicts (locally deleted and locally modified, respectively). Furthermore, in some of these cases, I want to take "ours" for all conflicts, including ones where the local file is deleted. Ideally, it's just one command: $ git checkout -

Re: [PATCH 2/2] sequencer: use O_TRUNC to truncate files

On Tue, Oct 31, 2017 at 10:58:16AM +0100, René Scharfe wrote: > Cut off any previous content of the file to be rewritten by passing the > flag O_TRUNC to open(2) instead of calling ftruncate(2) at the end. > That's easier and shorter. > > Signed-off-by: Rene Scharfe > --- > sequencer.c | 4 +---

Re: [PATCH 0/2] Re* Consequences of CRLF in index?

On Mon, Oct 30, 2017 at 7:44 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> (I note this as you regard your patches as a lunch time hack >> in the cooking email; I am serious about these patches though.) > > We do not want to touch borrowed code unnecessarily. Are these > lines and bits

Re: [PATCH 0/2] Re* Consequences of CRLF in index?

On Tue, Oct 31, 2017 at 09:41:25AM -0700, Stefan Beller wrote: > On Mon, Oct 30, 2017 at 7:44 PM, Junio C Hamano wrote: > > Stefan Beller writes: > > > >> (I note this as you regard your patches as a lunch time hack > >> in the cooking email; I am serious about these patches though.) > > > > We

Re: [PATCH 3/3] mingw: document the experimental standard handle redirection

Hi Eric, On Mon, 30 Oct 2017, Eric Sunshine wrote: > On Mon, Oct 30, 2017 at 1:10 PM, Johannes Schindelin > wrote: > > This feature is still highly experimental and has not even been > > contributed to the Git mailing list yet: the feature still needs to be > > battle-tested more. > > > > Signed

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

On Tue, Oct 31, 2017 at 09:01:45AM -0400, Ben Peart wrote: > > > But what we probably _do_ need is to make sure that "git fsck" would > > > detect such an out-of-order index. So that developers and users alike > > > can diagnose suspected problems. > > > > Agree -- that seems like a better home f

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Tue, Oct 31, 2017 at 10:54:21AM +0100, René Scharfe wrote: > Reduce code duplication by extracting a function for rewriting an > existing file. > > Signed-off-by: Rene Scharfe > --- > sequencer.c | 46 +- > 1 file changed, 17 insertions(+), 29 delet

Re: [PATCH 0/3] mingw: introduce a way to avoid std handle inheritance

Hi Jonathan, On Mon, 30 Oct 2017, Jonathan Nieder wrote: > Johannes Schindelin wrote: > > > Particularly when calling Git from applications, such as Visual Studio, > > it is important that stdin/stdout/stderr are closed properly. However, > > when spawning processes on Windows, those handles mus

Re: [PATCH 1/2] t0302: check helper can handle empty credentials

Hi Peff, On Mon, 30 Oct 2017, Jeff King wrote: > On Mon, Oct 30, 2017 at 06:20:12PM +0100, Johannes Schindelin wrote: > > > Subject: Re: [PATCH 1/2] t0302: check helper can handle empty credentials > > I guess we really care about t0303 here (which tests external helpers). > This patch adds the

Re: What's cooking in git.git (Oct 2017, #07; Mon, 30)

Hi Junio, On Tue, 31 Oct 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Mon, 30 Oct 2017, Junio C Hamano wrote: > > > >> * jc/branch-name-sanity (2017-10-14) 3 commits > >> (merged to 'next' on 2017-10-16 at 174646d1c3) > >> + branch: forbid refs/heads/HEAD > >> + branch

Re: [PATCH 2/2] Documentation: convert SubmittingPatches to AsciiDoc

Hi Paolo, On Mon, 30 Oct 2017, Paolo Ciarrocchi wrote: > On Mon, Oct 30, 2017 at 1:35 PM, Johannes Schindelin > wrote: > > > > On Mon, 30 Oct 2017, Junio C Hamano wrote: > > > >> "brian m. carlson" writes: > >> > >> Thanks. I personally prefer the plain-text original, but I do > >> understand

Is it possible to convert a Json file to xml file with Git

Hi I have a question. Is it possible to convert a Json file to XML with Git Best regards Eyjolfur Eyjolfsson (e) eyjolfureyjolfs...@tprg.com (w) tpretailgroup.com -- This email and any files transmitted with it are confidential and intended for the sole use of the individual or entity to who

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

Hi, On Tue, 31 Oct 2017, Junio C Hamano wrote: > Alex Vandiver writes: > > > diff --git a/fsmonitor.c b/fsmonitor.c > > index 4ea44dcc6..417759224 100644 > > --- a/fsmonitor.c > > +++ b/fsmonitor.c > > @@ -49,20 +49,7 @@ int read_fsmonitor_extension(struct index_state *istate, > > const void *

Re: [PATCH] t5580: add Cygwin support

Hi Adam, On Tue, 31 Oct 2017, Adam Dinwoodie wrote: > t5580 tests that specifying Windows UNC paths works with Git. Cygwin > supports UNC paths, albeit only using forward slashes, not backslashes, > so run the compatible tests on Cygwin as well as MinGW. > > The only complication is Cygwin's `p

Re: [PATCH 2.5/4] diff: avoid returning a struct by value from diff_flags_or()

On 10/31, Junio C Hamano wrote: > That is more in line with the design decision made in the previous > step to pass struct by reference. > > We may want to squash this into the previous patch eventually. Looks good to me. I was on the fence with what to do since I was already moving to pass by r

Re: [PATCH 3.5/4] diff: set TEXTCONV_VIA_CMDLINE only when it is set to true

On 10/31, Junio C Hamano wrote: > Change the meaning of the bit to "the user explicitly set the > allow-textconv bit to true from the command line". > > The "touched" mechanism in the old code meant to express "the user > explicitly set the allow-textconv bit to something from the command > line"

Re: Bug/Wish: bash completion for git pull --rebase doesn't include --autostash

On Tue, Oct 31, 2017 at 8:21 AM, Albert Astals Cid wrote: > git pull --rebase --autostash > > is a valid command but the --autostash autocompletion is not suggested after > typing > > git pul --reb > Would be great if that could be added. > > Thanks :) > > Albert > > P.S: I'm not subscribed CC me

Re: [PATCH 2/2] Documentation: convert SubmittingPatches to AsciiDoc

On Tue, Oct 31, 2017 at 6:21 PM, Johannes Schindelin wrote: > Hi Paolo, > > On Mon, 30 Oct 2017, Paolo Ciarrocchi wrote: > >> On Mon, Oct 30, 2017 at 1:35 PM, Johannes Schindelin >> wrote: >> > >> > On Mon, 30 Oct 2017, Junio C Hamano wrote: >> > >> >> "brian m. carlson" writes: >> >> >> >> Than

Re: [PATCH 0/3] mingw: introduce a way to avoid std handle inheritance

Hi, Johannes Schindelin wrote: > On Mon, 30 Oct 2017, Jonathan Nieder wrote: >> Can this rationale go in the commit messages? > > I thought I had done exactly that in 1/3... Okay, I'll be more specific. This cover letter includes some information about the rationale and motivation for the serie

Re: [PATCH 2/7] revision.h: introduce blob/tree walking in order of the commits

On Mon, Oct 30, 2017 at 11:57 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> diff --git a/list-objects.c b/list-objects.c >> index bf46f80dff..5e114c9a8a 100644 >> --- a/list-objects.c >> +++ b/list-objects.c >> @@ -237,6 +237,8 @@ void traverse_commit_list(struct rev_info *revs, >>

[PATCH v3 3/8] diff: add flag to indicate textconv was set via cmdline

git-show is unique in that it wants to use textconv by default except for when it is showing blobs. When asked to show a blob, show doesn't want to use textconv unless the user explicitly requested that it be used by providing the command line flag '--textconv'. Currently this is done by using a

[PATCH v3 8/8] diff: make struct diff_flags members lowercase

Now that the flags stored in struct diff_flags are being accessed directly and not through macros, change all struct members from being uppercase to lowercase. This conversion is done using the following semantic patch: @@ expression E; @@ - E.RECURSIVE + E.

[PATCH v3 6/8] diff: remove DIFF_OPT_SET macro

Remove the `DIFF_OPT_SET` macro and instead set the flags directly. This conversion is done using the following semantic patch: @@ expression E; identifier fld; @@ - DIFF_OPT_SET(&E, fld) + E.flags.fld = 1 @@ type T; T *ptr;

[PATCH v3 7/8] diff: remove DIFF_OPT_CLR macro

Remove the `DIFF_OPT_SET` macro and instead set the flags directly. This conversion is done using the following semantic patch: @@ expression E; identifier fld; @@ - DIFF_OPT_CLR(&E, fld) + E.flags.fld = 0 @@ type T; T *ptr;

[PATCH v3 2/8] diff: convert flags to be stored in bitfields

We cannot add many more flags to the diff machinery due to the limitations of the number of flags that can be stored in a single unsigned int. In order to allow for more flags to be added to the diff machinery in the future this patch converts the flags to be stored in bitfields in 'struct diff_fl

[PATCH v3 5/8] diff: remove DIFF_OPT_TST macro

Remove the `DIFF_OPT_TST` macro and instead access the flags directly. This conversion is done using the following semantic patch: @@ expression E; identifier fld; @@ - DIFF_OPT_TST(&E, fld) + E.flags.fld @@ type T; T *ptr;

[PATCH v3 1/8] add, reset: use DIFF_OPT_SET macro to set a diff flag

Instead of explicitly setting the 'DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG' flag, use the 'DIFF_OPT_SET' macro. Signed-off-by: Brandon Williams --- builtin/add.c | 2 +- builtin/reset.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index a648cf

[PATCH v3 4/8] diff: remove touched flags

Now that the set of parallel touched flags are no longer being used, remove them. Signed-off-by: Brandon Williams --- builtin/log.c | 2 -- diff.h| 6 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 82131751d..9c0815270 100644 ---

[PATCH v3 0/8] convert diff flags to be stored in a struct

Changes in v3: * Now always pass struct diff_flags by reference and don't return the struct but rather modify the passed in struct. * Don't clear TEXTCONV_SET_VIA_CMDLINE when --no-textconv is passed * added additional patches (set out separately before) to remove the macros and change the

Re: [RFC] protocol version 2

On 10/28, Philip Oakley wrote: > From: "Brandon Williams" > Sent: Friday, October 20, 2017 6:18 PM > >Objective > >=== > > > >Replace Git's current wire protocol with a simpler, less wasteful > >protocol that can evolve over time. > > > > > > >Capability Advertisement > >---

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

On Tue, 31 Oct 2017, Junio C Hamano wrote: > This makes local variable "int i;" in this function unused and gets > compiler warning. Apologies for leaving that detritus -- I saw you added a 'SQUASH??' commit to deal with it, which LGTM. On Tue, 31 Oct 2017, Johannes Schindelin wrote: > ... to whi

Re: [PATCH 4/7] builtin/describe.c: print debug statements earlier

On Tue, Oct 31, 2017 at 12:03 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> For debuggers aid we'd want to print debug statements early, so >> introduce a new line in the debug output that describes the whole >> function, and the change the next debug output to describe why we need >> to

Re: [PATCH 6/7] builtin/describe.c: describe a blob

On Mon, Oct 30, 2017 at 11:25 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt >> index c924c945ba..3d618b2445 100644 >> --- a/Documentation/git-describe.txt >> +++ b/Documentation/git-describe.txt >> @@ -3,7 +3,7

[PATCHv2 0/7] git describe blob

v2: * other variable names in patch v1, the commit message explains the unusual strategy for the scratch pad variable, + assert * less ugly test in p2 * typofix in p3 commit msg * patch 4 (debug printing) unchanged, awaiting discussion to start/settle. * rephrased the man page in p6. Thanks, St

[PATCHv2 1/7] list-objects.c: factor out traverse_trees_and_blobs

With traverse_trees_and_blobs factored out of the main traverse function, the next patch can introduce an in-order revision walking with ease. In the next patch we'll call `traverse_trees_and_blobs` from within the loop walking the commits, such that we'll have one invocation of that function per

[PATCHv2 2/7] revision.h: introduce blob/tree walking in order of the commits

The functionality to list tree objects in the order they were seen while traversing the commits will be used in the next commit, where we teach `git describe` to describe not only commits, but trees and blobs, too. Signed-off-by: Stefan Beller --- Documentation/rev-list-options.txt | 5 + l

[PATCHv2 6/7] builtin/describe.c: describe a blob

Sometimes users are given a hash of an object and they want to identify it further (ex.: Use verify-pack to find the largest blobs, but what are these? or [1]) "This is an interesting endeavor, because describing things is hard." -- me, upon writing this patch. When describing commits, we try t

[PATCHv2 3/7] builtin/describe.c: rename `oid` to avoid variable shadowing

The function `describe` has already a variable named `oid` declared at the beginning of the function for an object id. Do not shadow that variable with a pointer to an object id. Signed-off-by: Stefan Beller --- builtin/describe.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) d

[PATCHv2 5/7] builtin/describe.c: factor out describe_commit

In the next patch we'll learn how to describe more than just commits, so factor out describing commits into its own function. That will make the next patches easy as we still need to describe a commit as part of describing blobs. While factoring out the functionality to describe_commit, make sure

[PATCHv2 4/7] builtin/describe.c: print debug statements earlier

For debuggers aid we'd want to print debug statements early, so introduce a new line in the debug output that describes the whole function, and the change the next debug output to describe why we need to search. Conveniently drop the arg from the second line; which will be useful in a follow up com

[PATCHv2 7/7] t6120: fix typo in test name

Signed-off-by: Stefan Beller --- t/t6120-describe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 3be01316e8..fd329f173a 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -304,7 +304,7 @@ test_expect_success 'descr

Re: Is it possible to convert a Json file to xml file with Git

On Tue, Oct 31, 2017 at 05:28:40PM +, Eyjolfur Eyjolfsson wrote: > Hi > > I have a question. > Is it possible to convert a Json file to XML with Git > > Best regards > > Eyjolfur Eyjolfsson > > (e) eyjolfureyjolfs...@tprg.com > (w) tpretailgroup.com > Hello Eyjolfur, git is a version con

Re: [PATCHv2 4/7] builtin/describe.c: print debug statements earlier

On Tue, Oct 31, 2017 at 5:18 PM, Stefan Beller wrote: > For debuggers aid we'd want to print debug statements early, so > introduce a new line in the debug output that describes the whole > function, and the change the next debug output to describe why we need s/and the/and/ ...or... s/and the/an

Re: [PATCH v3 2/8] diff: convert flags to be stored in bitfields

On Tue, Oct 31, 2017 at 11:19 AM, Brandon Williams wrote: > We cannot add many more flags to the diff machinery due to the > limitations of the number of flags that can be stored in a single > unsigned int. In order to allow for more flags to be added to the diff > machinery in the future this pa

Re: [PATCH v3 7/8] diff: remove DIFF_OPT_CLR macro

On Tue, Oct 31, 2017 at 11:19 AM, Brandon Williams wrote: > Remove the `DIFF_OPT_SET` macro and instead set the flags directly. _CLR here

Re: [PATCH v3 0/8] convert diff flags to be stored in a struct

On Tue, Oct 31, 2017 at 11:19 AM, Brandon Williams wrote: > Changes in v3: > * Now always pass struct diff_flags by reference and don't return the struct >but rather modify the passed in struct. > * Don't clear TEXTCONV_SET_VIA_CMDLINE when --no-textconv is passed > * added additional patch

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

On Tue, Oct 31, 2017 at 5:18 PM, Stefan Beller wrote: > When describing commits, we try to anchor them to tags or refs, as these > are conceptually on a higher level than the commit. And if there is no ref > or tag that matches exactly, we're out of luck. So we employ a heuristic > to make up a n

RE: Is it possible to convert a Json file to xml file with Git

> On October 31, 2017 5:23 PM, Kevin Daudt wrote: > > On Tue, Oct 31, 2017 at 05:28:40PM +, Eyjolfur Eyjolfsson wrote: > > I have a question. > > Is it possible to convert a Json file to XML with Git > > git is a version control system, which is mostly content agnostic. It knows > nothing abou

[PATCH] sequencer: pass absolute GIT_DIR to exec commands

From: Jacob Keller When we replaced the old shell script based interactive rebase in commmit 18633e1a22a6 ("rebase -i: use the rebase--helper builtin", 2017-02-09) we introduced a regression of functionality in that the GIT_DIR would be sent to the environment of the exec command as-is. This gen

Re: Meaning of two commit-ish hash in git diff

Yubin , From: "Junio C Hamano" Yubin Ruan writes: diff --git a/path/somefile b/path/somefile index f8886b4..a1c96df 100644 --- a/path/somefile +++ b/path/somefile This is output by a `git diff` between two adjacent commits but they are not any commit hash. I grep through the whole $(git lo

Re: Meaning of two commit-ish hash in git diff

Thanks Philip, On 11/01/2017 08:27 AM, Philip Oakley wrote: > Yubin , > > From: "Junio C Hamano" >> Yubin Ruan writes: >> >>> diff --git a/path/somefile b/path/somefile >>> index f8886b4..a1c96df 100644 >>> --- a/path/somefile >>> +++ b/path/somefile >>> >>> >>> This is output by a `git diff`

Re: What's cooking in git.git (Oct 2017, #07; Mon, 30)

Jeff Hostetler writes: > From: Junio C Hamano [mailto:gits...@pobox.com] > Subject: Re: What's cooking in git.git (Oct 2017, #07; Mon, 30) > >> Jeff Hostetler writes: >> >>> I've been assuming that the jt/partial-clone-lazy-fetch is a >>> placeholder for our next combined patch series. >> >>

Re: [PATCH 7/7] t6120: fix typo in test name

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > t/t6120-describe.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Good. I am guessing that you are sending this as the last/optional one because this was found _after_ you worked on other parts of the series, but I think i

Re: [PATCH v3 2/8] diff: convert flags to be stored in bitfields

Stefan Beller writes: > After some quick research our coding style on bit fields is twofold: > Most older code is this way and more recent code seems to prefer > > unsigned SP : SP ; Yes, we are very inconsistent. What does the clang format rules Brandon came up with have to say on this?

Re: [PATCH v2 2/4] Add structure representing hash algorithm

On Mon, Oct 30, 2017 at 04:36:15PM -0700, Brandon Williams wrote: > On 10/28, brian m. carlson wrote: > > Since in the future we want to support an additional hash algorithm, add > > a structure that represents a hash algorithm and all the data that must > > go along with it. Add a constant to all

Re: [PATCH] t5580: add Cygwin support

Adam Dinwoodie writes: > t5580 tests that specifying Windows UNC paths works with Git. Cygwin > supports UNC paths, albeit only using forward slashes, not backslashes, > so run the compatible tests on Cygwin as well as MinGW. > > The only complication is Cygwin's `pwd`, which returns a *nix-styl

Re: [PATCH 1/2] quote-email populates the fields

Payre Nathan writes: > From: Tom Russello > > --- Missing something here??? > Documentation/git-send-email.txt | 3 + > git-send-email.perl | 70 ++- > t/t9001-send-email.sh| 117 > +-- > 3 files changed, 147

Re: Meaning of two commit-ish hash in git diff

Yubin Ruan writes: >>> IOW, if you have the contents of the blob whose object name is >>> f8886b4, by applying this patch, you will get a blob whose object >>> name is a1c96df. >>> >>> The information is used by "git am -3" when the patch does not apply >>> cleanly to fall back to the 3-way merge

Re: [PATCH v3 7/8] diff: remove DIFF_OPT_CLR macro

Stefan Beller writes: > On Tue, Oct 31, 2017 at 11:19 AM, Brandon Williams wrote: >> Remove the `DIFF_OPT_SET` macro and instead set the flags directly. > > _CLR here Will squash in. Thanks.

Re: [PATCH 6/7] builtin/describe.c: describe a blob

Stefan Beller writes: >> Given the difficulty in >> coming up with the single-liner description of what it does we saw >> above, I suspect that splitting SYNOPSIS out into two very distinct >> operating mode might make it easier to read. >> >> SYNOPSIS >> >> [verse] >> '

Re: [PATCH 6/7] builtin/describe.c: describe a blob

Stefan Beller writes: > Maybe > > "git-describe - Describe a blob or commit using graph relations" > > though that sounds too generic, but it is accurate as all we do is > a heuristic for graph walk ways. We used to describe commit using commit ancestry (i.e. finding the place where a "wanted"

Re: [PATCHv2 1/7] list-objects.c: factor out traverse_trees_and_blobs

Stefan Beller writes: > With traverse_trees_and_blobs factored out of the main traverse function, > the next patch can introduce an in-order revision walking with ease. > > In the next patch we'll call `traverse_trees_and_blobs` from within the > loop walking the commits, such that we'll have one

Re: [PATCHv2 2/7] revision.h: introduce blob/tree walking in order of the commits

Stefan Beller writes: > diff --git a/t/t6100-rev-list-in-order.sh b/t/t6100-rev-list-in-order.sh > new file mode 100755 > index 00..651666979b > --- /dev/null > +++ b/t/t6100-rev-list-in-order.sh > @@ -0,0 +1,46 @@ > +#!/bin/sh > + > +test_description='miscellaneous rev-list tests' > + >

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

Stefan Beller writes: > +If the given object refers to a blob, it will be described > +as `:`, such that the blob can be found > +at `` in the ``. Note, that the commit is likely Does the code describe a9dbc3f12c as v2.15.0:GIT-VERSION-GEN, or would it always be :? > +not the commit that introd

Re: [PATCH 3/3] mingw: document the experimental standard handle redirection

Johannes Schindelin writes: >> > +Two special values are supported: `off` will simply close the >> > +corresponding standard handle, and if `GIT_REDIRECT_STDERR` is >> > +`2>&1`, standard error will be redirected to the same handle as >> > +standard output. >> >> Consistent with the Unixy specia

Re: [PATCHv2 0/7] git describe blob

Stefan Beller writes: > Occasionally a user is given an object hash from a blob as an error message > or other output (e.g. [1]). > > It would be useful to get a further description of such a blob, such as > the (commit, path) tuple where this blob was introduced. > > This implements the answer i

What's cooking in git.git (Nov 2017, #01; Wed, 1)

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. Git 2.15 final was tagged. I may

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Tue, Oct 31, 2017 at 05:33:57PM +0100, Kevin Daudt wrote: > On Tue, Oct 31, 2017 at 10:54:21AM +0100, René Scharfe wrote: > > Reduce code duplication by extracting a function for rewriting an > > existing file. > > > > Signed-off-by: Rene Scharfe > > --- > > sequencer.c | 46 +

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

Jeff King writes: > On Tue, Oct 31, 2017 at 09:01:45AM -0400, Ben Peart wrote: > >> > > But what we probably _do_ need is to make sure that "git fsck" would >> > > detect such an out-of-order index. So that developers and users alike >> > > can diagnose suspected problems. >> > >> > Agree -- tha

Re: [PATCH] diff: --indent-heuristic is no longer experimental

Junio C Hamano writes: > Carlos Martín Nieto writes: > >> This heuristic has been the default since 2.14 so we should not confuse our >> users by saying that it's experimental and off by default. >> >> Signed-off-by: Carlos Martín Nieto >> --- >> Documentation/diff-heuristic-options.txt | 5 --

Re: [PATCH v3 0/8] convert diff flags to be stored in a struct

Brandon Williams writes: > Changes in v3: > * Now always pass struct diff_flags by reference and don't return the struct >but rather modify the passed in struct. > * Don't clear TEXTCONV_SET_VIA_CMDLINE when --no-textconv is passed > * added additional patches (set out separately before) t

Re: [PATCH 2/2] send-email: quote-email quotes the message body

Payre Nathan writes: > From: Tom Russello > > --- > Documentation/git-send-email.txt | 4 +- > git-send-email.perl | 80 > ++-- > t/t9001-send-email.sh| 19 +- > 3 files changed, 97 insertions(+), 6 deletions(-) > > diff --g