Re: What's cooking in git.git (May 2017, #08; Mon, 29)

On Tue, May 30, 2017 at 8:18 PM, Daniel Ferreira (theiostream) wrote: > On Mon, May 29, 2017 at 3:23 AM, Junio C Hamano wrote: >> * df/dir-iter-remove-subtree (2017-05-29) 5 commits >> . remove_subtree(): reimplement using iterators >> . dir_iterator:

Re: [Bug] git branch -v has problems with carriage returns

Here is my first attempt at fixing the issue. There are two problems in ref-filter.c: First, copy_subject() has been modified to turn '\n' into a space and every other ascii control character to be ignored. Second, find_subpos() doesn't realize that a line that only contains a '\r\n' is a blank

[PATCH] docs/config: mention protocol implications of url.insteadOf

On Fri, May 26, 2017 at 11:22:37AM -0500, Elliott Cable wrote: > 1. Most simply, better documentation: mention `GIT_PROTOCOL_FROM_USER` >explicitly in the documentation of/near `insteadOf`, most >particularly in the README for `contrib/persistent-https`. I agree that a hint in both

Re: persistent-https, url insteadof, and `git submodule`

On Fri, May 26, 2017 at 11:22:37AM -0500, Elliott Cable wrote: > Hi! Thanks for the responses (I hope reply-all isn't bad mailing-list > etiquette? Feel free to yell at with a direct reply!). For whatever it's > worth, as a random user, here's my thoughts: No, reply-all is the preferred method

Re: [Non-Bug] cloning a repository with a default MASTER branch tries to check out the master branch

On Sun, May 28, 2017 at 12:21:50PM +0100, Philip Oakley wrote: > > Are you aware of the symref capability that is already advertised in > > the initial upload-pack response? Right now, we do so only when > > HEAD actually points at something, and the earlier suggestion by > > Peff is to do so

Re: [PATCH v3 4/6] fsmonitor: add test cases for fsmonitor extension

On Tue, May 30, 2017 at 11:21 PM, Ben Peart wrote: > > On 5/30/2017 9:18 AM, Christian Couder wrote: >> >> On Thu, May 25, 2017 at 8:36 PM, Ben Peart wrote: >> >>> + printf "untracked\0" >>> + printf "dir1/untracked\0" >>> + printf

[PATCH] remote: drop free_refspecs() function

On Tue, May 30, 2017 at 09:11:28AM +0200, SZEDER Gábor wrote: > I also dropped Peff's two patches that were included in v3, because: > > - his last patch doesn't apply anymore, because the variable it frees >properly doesn't exist anymore, and > - with that patch gone his second patch is

Re: [PATCHv4 1/2] clone: respect additional configured fetch refspecs during initial fetch

On Tue, May 30, 2017 at 09:12:43AM +0200, SZEDER Gábor wrote: > diff --git a/remote.c b/remote.c > index ad6c5424e..b8fd09dc9 100644 > --- a/remote.c > +++ b/remote.c > @@ -626,6 +626,19 @@ struct refspec *parse_fetch_refspec(int nr_refspec, > const char **refspec) > return

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

On Mon, May 29, 2017 at 3:23 AM, Junio C Hamano wrote: > * df/dir-iter-remove-subtree (2017-05-29) 5 commits > . remove_subtree(): reimplement using iterators > . dir_iterator: rewrite state machine model > . dir_iterator: refactor dir_iterator_advance > . remove_subtree():

[PATCH v2] pull: ff --rebase --autostash works in dirty repo

When `git pull --rebase --autostash` in a dirty repository resulted in a fast-forward, nothing was being autostashed and the pull failed. This was due to a shortcut to avoid running rebase when we can fast-forward, but autostash is ignored on that codepath. Now we will only take the shortcut if

Re: [GSoC][PATCH v5 1/3] submodule: fix buggy $path and $sm_path variable's value

On 31/05/17 01:13, Ramsay Jones wrote: > On 31/05/17 00:29, Stefan Beller wrote: > >> In that test sm_path contains the relative path from $PWD to the >> submodule. (It does NOT: "$[sm_]path is the name of the submodule >> directory relative to the superproject" as documented but rather >>

Re: [PATCH 16/33] diff: finish conversion for prepare_temp_file to struct object_id

On Tue, May 30, 2017 at 10:30 AM, Brandon Williams wrote: > Signed-off-by: Brandon Williams Up to (and including) this commit, the series looks good to me. Will continue to review this series later. Thanks, Stefan > --- > diff.c | 4 ++-- > 1 file

Re: [GSoC][PATCH v5 1/3] submodule: fix buggy $path and $sm_path variable's value

On 31/05/17 00:29, Stefan Beller wrote: >> As I said above, I can't remember how git-ls-files worked back then, >> but it seems that I thought of it as the path to the submodule from >> the root of the working tree. Again, by definition, $sm_path == $path >> (as documented). Of course, that

Re: [PATCH v3 4/6] fsmonitor: add test cases for fsmonitor extension

On 5/30/2017 6:37 PM, Junio C Hamano wrote: Ben Peart writes: I did a quick search through the existing test scripts and the majority do not link commands together with && when they are in a sub function like this. I find not having them linked together is easier to

Re: mergetool: what to do about deleting precious files?

"Philip Oakley" writes: > From: "Junio C Hamano" > > Thanks for the replies. Let's see if I've got it... > >> "Philip Oakley" writes: >> >>> If I now understand correctly, the merge process flow is: >>> >>> * canonicalise content

Re: [PATCH v3 13/13] is_missing_file_error(): work around EINVAL on Windows

On Tue, May 30, 2017 at 4:17 PM, Junio C Hamano wrote: > Stefan Beller writes: >> cc'd people knowledgeable of Windows. > > This has been resolved I think with J6t/Dscho's patch yesterday. > > Thanks. Yeah I saw those patches after reviewing this series.

Re: [PATCH v3 05/13] config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, too

On Tue, May 30, 2017 at 4:14 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Thu, May 25, 2017 at 8:35 PM, Junio C Hamano wrote: >> >> Do we have any reasons for that, or pointers on the mailing list, that this >> is a good

Re: [GSoC][PATCH v5 1/3] submodule: fix buggy $path and $sm_path variable's value

On Tue, May 30, 2017 at 4:07 PM, Ramsay Jones wrote: > > > On 30/05/17 22:53, Stefan Beller wrote: >> On Fri, May 26, 2017 at 6:10 PM, Ramsay Jones >> wrote: >>> On 26/05/17 18:07, Stefan Beller wrote: On Fri, May 26, 2017 at 9:31

Re: [PATCH] doc: Improve description for rev-parse --short

Andreas Heiduk writes: > ALso: Did you remove the `linkgit` by intention or just by accident? By accident. I agree that "Same as `--verify`" is a good way to do this.

Re: [PATCH v3 13/13] is_missing_file_error(): work around EINVAL on Windows

Stefan Beller writes: > On Thu, May 25, 2017 at 8:35 PM, Junio C Hamano wrote: >> When asked to open/fopen a path, e.g. "a/b:/c", which does not exist >> on the filesystem, Windows (correctly) fails to open it but sets >> EINVAL to errno > > errno to

Re: [PATCH v3 05/13] config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, too

Stefan Beller writes: > On Thu, May 25, 2017 at 8:35 PM, Junio C Hamano wrote: > > Do we have any reasons for that, or pointers on the mailing list, that this > is a good idea or needed? Does it fix a bug or enable a new feature on Darwin? BSD lets you

Re: [PATCH v2 0/6] Fast git status via a file system watcher

On 5/30/2017 4:33 PM, Christian Couder wrote: On Tue, May 30, 2017 at 8:05 PM, Ben Peart wrote: On 5/27/2017 2:57 AM, Christian Couder wrote: On Thu, May 25, 2017 at 3:55 PM, Ben Peart wrote: On 5/24/2017 6:54 AM, Christian Couder wrote:

Re: [GSoC][PATCH v5 1/3] submodule: fix buggy $path and $sm_path variable's value

On 30/05/17 22:53, Stefan Beller wrote: > On Fri, May 26, 2017 at 6:10 PM, Ramsay Jones > wrote: >> On 26/05/17 18:07, Stefan Beller wrote: >>> On Fri, May 26, 2017 at 9:31 AM, Ramsay Jones >>> wrote: >> Back in 2012, the submodule

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

Stefan Beller writes: >> >> * sb/submodule-blanket-recursive (2017-05-23) 6 commits > ... > > And the retraction is retracted by sending a new series. > You remarked that it still misbehaves with other series in flight, > so I'll inspect it again. What I said (or at least

Re: mergetool: what to do about deleting precious files?

From: "Junio C Hamano" Thanks for the replies. Let's see if I've got it... "Philip Oakley" writes: If I now understand correctly, the merge process flow is: * canonicalise content (eol, smudge-clean, $id, renormalise, etc) * diff the content

Re: [PATCH] C style: use standard style for "TRANSLATORS" comments

Jiang Xin writes: > 2017-05-12 5:20 GMT+08:00 Ævar Arnfjörð Bjarmason : >> Change all the "TRANSLATORS: [...]" comments in the C code to use the >> regular Git coding style, and amend the style guide so that the >> example there uses that style. >> >>

Re: revision API design, was Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Johannes Schindelin writes: >> See 66b2ed09 ("Fix "log" family not to be too agressive about >> ... >> ask the existing command line parser to set them for you. > > This is a very eloquent description of a problem with the API. Yes, but ... > The correct suggestion

Re: [PATCH 8/8] t0012: test "-h" with builtins

Jeff King writes: > And the idea is that ranges like "-.." should work. TBH, I'm not sure > how I feel about that, for exactly the reason that came up here: it > makes it hard to syntactically differentiate the "-" shorthand from > actual options. We do have @{-1} already for this

Re: [PATCH v3 4/6] fsmonitor: add test cases for fsmonitor extension

Ben Peart writes: > I did a quick search through the existing test scripts and the > majority do not link commands together with && when they are in a sub > function like this. I find not having them linked together is easier > to write, maintain and is more readable. I had

Re: [GSoC][PATCH v5 1/3] submodule: fix buggy $path and $sm_path variable's value

On Fri, May 26, 2017 at 6:10 PM, Ramsay Jones wrote: > > > On 26/05/17 18:07, Stefan Beller wrote: >> On Fri, May 26, 2017 at 9:31 AM, Ramsay Jones >> wrote: >>> Hmm, I'm not sure which documentation you are referring to, >> >> Quite

Re: [PATCHv4 00/17] Diff machine: highlight moved lines.

On Fri, May 26, 2017 at 6:04 PM, Jacob Keller wrote: > On Mon, May 22, 2017 at 7:40 PM, Stefan Beller wrote: >> v4: >> * interdiff to v3 (what is currently origin/sb/diff-color-move) below. >> * renamed the "buffered_patch_line" to "diff_line".

Re: [PATCH 1/1] diff.c: color moved lines differently

On Sat, May 27, 2017 at 12:05 AM, Philip Oakley wrote: > a couple of mispellings in the doc parts: > s/on location/one location/ > [code not checked] Thanks for proofreading the documentation! > > s/on location/one location/ > >> + in another location will be colored with

Re: [PATCH v3 4/6] fsmonitor: add test cases for fsmonitor extension

On 5/30/2017 9:18 AM, Christian Couder wrote: On Thu, May 25, 2017 at 8:36 PM, Ben Peart wrote: [...] diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh new file mode 100755 index 00..395db46d55 --- /dev/null +++ b/t/t7519-status-fsmonitor.sh

Re: [PATCH 6.5?/8] version: move --build-options to a test helper

On Tue, May 30, 2017 at 08:45:53PM +, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 30, 2017 at 7:17 AM, Jeff King wrote: > > The "git version" command didn't traditionally accept any > > options, and in fact ignores any you give it. When we added > > simple option parsing for

[PATCH 6.5?/8] version: move --build-options to a test helper

Move the undocumented --build-options argument to a test helper. It's purely used for testing git itself, so it belongs in a test helper instead of something that's part of the public plumbing. Signed-off-by: Ævar Arnfjörð Bjarmason --- On Tue, May 30, 2017 at 7:17 AM, Jeff

Re: [PATCH] doc: Improve description for rev-parse --short

Am 30.05.2017 um 06:10 schrieb Junio C Hamano: >> --short=number:: >> Instead of outputting the full SHA-1 values of object names try to >> abbreviate them to a shorter unique name. When no length is specified >> -7 is used. The minimum length is 4. >> +the effective value of

Re: [PATCH 1/2] mingw: verify that paths are not mistaken for remote nicknames

Am 30.05.2017 um 06:46 schrieb Junio C Hamano: Johannes Sixt writes: Doesn't this need test_i18ngrep?: Good catch! It would be this one in warn_on_inaccessible: wrapper.c:581: warning_errno(_("unable to access '%s'"), path); But actually, I'm more worried about the

Re: [PATCH v2 0/6] Fast git status via a file system watcher

On Tue, May 30, 2017 at 8:05 PM, Ben Peart wrote: > > > On 5/27/2017 2:57 AM, Christian Couder wrote: >> >> On Thu, May 25, 2017 at 3:55 PM, Ben Peart wrote: >>> >>> >>> >>> On 5/24/2017 6:54 AM, Christian Couder wrote: > > > Design >

Re: [PATCH v4 00/10] The final building block for a faster rebase -i

On Tue, May 30, 2017 at 5:44 PM, Johannes Schindelin wrote: > Hi Ævar, > > On Mon, 29 May 2017, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, May 29, 2017 at 12:51 PM, Johannes Schindelin >> wrote: >> > >> > On Sat, 27 May 2017, René Scharfe

Re: [PATCH v3 13/13] is_missing_file_error(): work around EINVAL on Windows

On Thu, May 25, 2017 at 8:35 PM, Junio C Hamano wrote: > When asked to open/fopen a path, e.g. "a/b:/c", which does not exist > on the filesystem, Windows (correctly) fails to open it but sets > EINVAL to errno errno to EINVAL (as of now it sounds as if it is a EINVAL = errno,

Re: [PATCH v3 10/13] rerere.c: move error_errno() closer to the source system call

On Thu, May 25, 2017 at 8:35 PM, Junio C Hamano wrote: > From: Nguyễn Thái Ngọc Duy > > We are supposed to report errno from fopen(). fclose() between fopen() > and the report function could either change errno or reset it. > > Signed-off-by: Junio C Hamano

Re: [PATCH v3 05/13] config.mak.uname: set FREAD_READS_DIRECTORIES for Darwin, too

On Thu, May 25, 2017 at 8:35 PM, Junio C Hamano wrote: Do we have any reasons for that, or pointers on the mailing list, that this is a good idea or needed? Does it fix a bug or enable a new feature on Darwin? > Signed-off-by: Junio C Hamano > --- >

Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Johannes, Johannes Schindelin writes: > The first step of an interactive rebase is to generate the so-called "todo > script", to be stored in the state directory as "git-rebase-todo" and to > be edited by the user. > > Originally, we adjusted the output of `git log

Re: git push recurse.submodules behavior changed in 2.13

Hi John, John Shahid wrote: > It looks like the git push recurse-submodules behavior has changed. > Currently with 2.13 you cannot run "git push > --recurse-submodules=on-demand" if the parent repo is on a different > branch than the sub repos, e.g. parent repo is on "develop" and > sub-repo on

Re: [PATCH v2 0/6] Fast git status via a file system watcher

On 5/27/2017 2:57 AM, Christian Couder wrote: On Thu, May 25, 2017 at 3:55 PM, Ben Peart wrote: On 5/24/2017 6:54 AM, Christian Couder wrote: Design ~~ A new git hook (query-fsmonitor) must exist and be enabled (core.fsmonitor=true) that takes a time_t formatted

Re: What's cooking in git.git (May 2017, #08; Mon, 29)

On Sun, May 28, 2017 at 11:23 PM, Junio C Hamano wrote: > A bit more topics are now in 'master'. One unfortunate thing is > that the SHA1 breakage in 2.13 for big-endian platforms were lost in > the noise with excitement felt by some subset of contributors with > the possible

[PATCH 12/33] diff: convert run_diff_files to struct object_id

Signed-off-by: Brandon Williams --- diff-lib.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/diff-lib.c b/diff-lib.c index 7984ff962..c82b07dc1 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -101,7 +101,7 @@ int run_diff_files(struct rev_info

[PATCH 11/33] diff: convert diff_addremove to struct object_id

Convert diff_addremove to take a struct object_id. In addtion convert the function pointer type 'add_remove_fn_t' to also take a struct object_id. Signed-off-by: Brandon Williams --- diff-lib.c | 6 +++--- diff.c | 8 diff.h | 8 revision.c | 4

[PATCH 32/33] diffcore-rename: use is_empty_blob_oid

Signed-off-by: Brandon Williams --- diffcore-rename.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 3d9719dad..03d1e8d40 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -464,7 +464,7 @@ void

[PATCH 28/33] builtin/diff-tree: cleanup references to sha1

Signed-off-by: Brandon Williams --- builtin/diff-tree.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index aef167619..8b26a66a9 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -7,7 +7,7 @@

[PATCH 27/33] diff-tree: convert diff_tree_sha1 to struct object_id

Signed-off-by: Brandon Williams --- builtin/blame.c | 20 ++-- builtin/diff-tree.c | 8 +++- builtin/diff.c| 2 +- builtin/fast-export.c | 4 ++-- builtin/log.c | 6 +++--- builtin/merge.c | 2 +- combine-diff.c|

[PATCH 13/33] diff: convert diff_change to struct object_id

Convert diff_change to take a struct object_id. In addition convert the function pointer type 'change_fn_t' to also take a struct object_id. Signed-off-by: Brandon Williams --- diff-lib.c | 4 ++-- diff.c | 14 +++--- diff.h | 13 ++--- revision.c

[PATCH 16/33] diff: finish conversion for prepare_temp_file to struct object_id

Signed-off-by: Brandon Williams --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 084c8b2d0..a8ceeb024 100644 --- a/diff.c +++ b/diff.c @@ -3030,13 +3030,13 @@ static struct diff_tempfile *prepare_temp_file(const char

[PATCH 17/33] patch-ids: convert to struct object_id

Signed-off-by: Brandon Williams --- builtin/log.c | 2 +- patch-ids.c | 20 ++-- patch-ids.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index a440601ef..6bdba3444 100644 --- a/builtin/log.c +++

[PATCH 33/33] diff: rename diff_fill_sha1_info to diff_fill_oid_info

Signed-off-by: Brandon Williams --- diff.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/diff.c b/diff.c index dd325e616..c758a0d73 100644 --- a/diff.c +++ b/diff.c @@ -3239,7 +3239,7 @@ static void run_diff_cmd(const char *pgm,

[PATCH 31/33] tree-diff: convert path_appendnew to object_id

Signed-off-by: Brandon Williams --- tree-diff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index 6a960f569..467e38172 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -132,7 +132,7 @@ static int

[PATCH 22/33] notes-merge: convert notes_merge* to struct object_id

Convert notes_merge and notes_merge_commit to use struct object_id. Signed-off-by: Brandon Williams --- builtin/notes.c | 6 +++--- notes-merge.c | 58 - notes-merge.h | 12 ++-- 3 files changed, 38

[PATCH 18/33] diff: convert diff_flush_patch_id to struct object_id

Signed-off-by: Brandon Williams --- diff.c | 12 ++-- diff.h | 2 +- patch-ids.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/diff.c b/diff.c index a8ceeb024..dd325e616 100644 --- a/diff.c +++ b/diff.c @@ -4584,7 +4584,7 @@ static

[PATCH 23/33] notes-merge: convert merge_from_diffs to struct object_id

Signed-off-by: Brandon Williams --- notes-merge.c | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 9dbf7f6a3..be78f1954 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -114,8 +114,8 @@

[PATCH 20/33] combine-diff: convert find_paths_* to struct object_id

Convert find_paths_generic and find_paths_multitree to use struct object_id. Signed-off-by: Brandon Williams --- combine-diff.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index 84981df75..c82364510 100644

[PATCH 29/33] tree-diff: convert try_to_follow_renames to struct object_id

Signed-off-by: Brandon Williams --- tree-diff.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index fc020d76d..29e3f6144 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -577,7 +577,9 @@ static inline int

[PATCH 30/33] tree-diff: convert diff_tree_paths to struct object_id

Signed-off-by: Brandon Williams --- combine-diff.c | 10 +- diff.h | 4 ++-- tree-diff.c| 63 +- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index

[PATCH 26/33] notes-merge: convert write_note_to_worktree to struct object_id

Signed-off-by: Brandon Williams --- notes-merge.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 962e9b1bc..7d88857a8 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -292,11 +292,11 @@ static

[PATCH 03/33] notes: convert for_each_note to struct object_id

From: "brian m. carlson" Convert for_each_note and each of the callbacks to use struct object_id. Signed-off-by: brian m. carlson Signed-off-by: Brandon Williams --- builtin/notes.c | 6 +++--- notes.c

[PATCH 19/33] combine-diff: convert diff_tree_combined to struct object_id

Signed-off-by: Brandon Williams --- builtin/diff.c | 2 +- combine-diff.c | 10 +- diff.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index b2d7c32cd..73b4ff3db 100644 --- a/builtin/diff.c +++

[PATCH 25/33] notes-merge: convert verify_notes_filepair to struct object_id

Signed-off-by: Brandon Williams --- notes-merge.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 55dbb3659..962e9b1bc 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -22,21 +22,21 @@ void

[PATCH 21/33] tree-diff: convert diff_root_tree_sha1 to struct object_id

Signed-off-by: Brandon Williams --- builtin/fast-export.c | 4 ++-- diff.h| 4 ++-- log-tree.c| 2 +- patch-ids.c | 2 +- tree-diff.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/fast-export.c

[PATCH 24/33] notes-merge: convert find_notes_merge_pair_ps to struct object_id

Signed-off-by: Brandon Williams --- notes-merge.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index be78f1954..55dbb3659 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -58,7 +58,7 @@ static

[PATCH 01/33] notes: convert internal structures to struct object_id

From: "brian m. carlson" Convert the internal structures using unsigned char [20] to take struct object_id using the following semantic patch and the standard object_id transforms: @@ struct leaf_node E1; @@ - E1.key_sha1 + E1.key_oid.hash @@ struct leaf_node *E1;

[PATCH 14/33] diff: convert fill_filespec to struct object_id

Signed-off-by: Brandon Williams --- builtin/blame.c | 2 +- builtin/diff.c| 4 ++-- combine-diff.c| 4 ++-- diff-lib.c| 2 +- diff-no-index.c | 2 +- diff.c| 16 diffcore-rename.c | 2 +- diffcore.h| 2 +- grep.c

[PATCH 05/33] notes: convert format_display_notes to struct object_id

From: "brian m. carlson" Signed-off-by: brian m. carlson Signed-off-by: Brandon Williams --- log-tree.c | 2 +- notes.c| 8 notes.h| 2 +- revision.c | 2 +- 4 files changed, 7 insertions(+), 7

[PATCH 00/33] object id conversion (grep and diff)

A month or so ago I thought I would lend a hand to Brian and do a round of conversions from sha1 -> struct object_id. Now that Brian's latest series has hit master I can finally send these patches out. The first couple patches are from Brian which convert some of the notes logic to using 'struct

[PATCH 06/33] builtin/notes: convert to struct object_id

From: "brian m. carlson" Convert most of the static functions to use struct object_id. In addition, convert copy_notes_for_rewrite and its callers. Signed-off-by: brian m. carlson Signed-off-by: Brandon Williams

[PATCH 08/33] grep: convert to struct object_id

Convert the remaining parts of grep to use struct object_id. Signed-off-by: Brandon Williams --- builtin/grep.c | 22 +++--- cache.h| 7 +++ grep.c | 17 - grep.h | 2 +- 4 files changed, 27 insertions(+), 21

[PATCH 15/33] diff: convert reuse_worktree_file to struct object_id

Signed-off-by: Brandon Williams --- diff.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index e0c179f5f..084c8b2d0 100644 --- a/diff.c +++ b/diff.c @@ -2717,7 +2717,7 @@ void fill_filespec(struct diff_filespec *spec, const

[PATCH 07/33] notes: convert some accessor functions to struct object_id

From: "brian m. carlson" Convert add_note, get_note, and copy_note to take struct object_id. Signed-off-by: brian m. carlson Signed-off-by: Brandon Williams --- builtin/notes.c | 20 ++--

[PATCH 10/33] diff: convert diff_index_show_file to struct object_id

Signed-off-by: Brandon Williams --- diff-lib.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/diff-lib.c b/diff-lib.c index a3bc78162..2c838aaf4 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -255,12 +255,12 @@ int run_diff_files(struct rev_info

[PATCH 04/33] notes: make get_note return pointer to struct object_id

From: "brian m. carlson" Make get_note return a pointer to a const struct object_id. Add a defensive check to ensure we don't accidentally dereference a NULL pointer. Signed-off-by: brian m. carlson Signed-off-by: Brandon Williams

[PATCH 02/33] notes: convert internal parts to struct object_id

From: "brian m. carlson" Convert several portions of the internals of the code to struct object_id. Introduce two macros to denote the different constants in the code: KEY_INDEX for the last byte of the object ID, and FANOUT_PATH_SEPARATORS for the number of

[PATCH 09/33] diff: convert get_stat_data to struct object_id

Signed-off-by: Brandon Williams --- diff-lib.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/diff-lib.c b/diff-lib.c index 2982bf055..a3bc78162 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -264,12 +264,12 @@ static void

Re: [WIP/RFC 00/23] repository object

On 05/29, Duy Nguyen wrote: > On Mon, May 29, 2017 at 6:23 PM, Ævar Arnfjörð Bjarmason > wrote: > >>> That said, even if we never reached the point where we could handle all > >>> submodule requests in-process, I think sticking the repo-related global > >>> state in a struct

Re: git push recurse.submodules behavior changed in 2.13

On 05/30, John Shahid wrote: > Junio, sorry for the poor report. I totally forgot to describe the > behavior that i'm currently getting vs what i expect. > > Expected behavior: > > We have a parent repo on a branch called "develop" and a submodule on > a branch called "master". Prior to git

Re: [PATCH] C style: use standard style for "TRANSLATORS" comments

2017-05-12 5:20 GMT+08:00 Ævar Arnfjörð Bjarmason : > Change all the "TRANSLATORS: [...]" comments in the C code to use the > regular Git coding style, and amend the style guide so that the > example there uses that style. > > This custom style was necessary back in 2010 when the

Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Johannes, On 29/05/17 06:59 AM, Johannes Schindelin wrote: > Hi Liam, > > On Thu, 25 May 2017, Liam Beguin wrote: > >> Johannes Schindelin writes: >> >>> diff --git a/sequencer.c b/sequencer.c >>> index 130cc868e51..88819a1a2a9 100644 >>> --- a/sequencer.c >>>

Re: [PATCH v4 00/10] The final building block for a faster rebase -i

Hi Ævar, On Mon, 29 May 2017, Ævar Arnfjörð Bjarmason wrote: > On Mon, May 29, 2017 at 12:51 PM, Johannes Schindelin > wrote: > > > > On Sat, 27 May 2017, René Scharfe wrote: > >> Am 26.05.2017 um 05:15 schrieb Liam Beguin: > >> > I tried to time the execution on an

Re: [PATCH 8/8] t0012: test "-h" with builtins

[+cc Siddharth, so quoting copiously] On Tue, May 30, 2017 at 11:27:56AM -0400, Jeff King wrote: > > Travis seems to be seeing the same failure. Curiously, the topic by > > itself passes for me; iow, pu fails, pu^2 doesn't fail. > > > > git.git/pu$ ./git rev-list -h > > BUG:

Re: 2.13.0-rc1 is broken on SPARC

* Junio C Hamano [170529 00:11]: > "Liam R. Howlett" writes: > > > My SPARC build does not function and seg bus terminates on any command. > > Sorry, known issue in the released version 2.13 (we would have > appreciated if a bug report for -rc1 came

Re: [PATCH 8/8] t0012: test "-h" with builtins

On Tue, May 30, 2017 at 10:23:54PM +0900, Junio C Hamano wrote: > Jeff King writes: > > > Nope, I have those patches directly on your e83352ef23, and it passes. I > > wonder if there's something funny between our environments. What does > > the failure look like for you? > >

revision API design, was Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Junio, On Tue, 30 May 2017, Junio C Hamano wrote: > We do not want these [revision API] implementation details to code that > does not implement command line parsing. This one is not parsing > anybody's set of options and should not be mucking with the low level > implementation details.

Re: FORMAT_PATCH_NAME_MAX increase

On 05/30/17 16:35, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 30, 2017 at 3:37 PM, Junio C Hamano wrote: >> Ævar Arnfjörð Bjarmason writes: >> >>> Just curious do you know about https://github.com/trast/tbdiff ? If >>> not it might have a high overlap with

Re: [PATCH v4 02/10] rebase -i: generate the script via rebase--helper

Hi Junio, On Tue, 30 May 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > You still ask me to pass options in plain text that has to be parsed at > > run-time, rather than compile-time-verifiable flags. > > Absolutely. In other words, you want me

Re: FORMAT_PATCH_NAME_MAX increase

On Tue, May 30, 2017 at 3:37 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Just curious do you know about https://github.com/trast/tbdiff ? If >> not it might have a high overlap with what you're doing. > > Yes, that is a very good

Re: [PATCH 1/2] mingw: verify that paths are not mistaken for remote nicknames

On 30/05/17 01:03, Junio C Hamano wrote: > Ramsay Jones writes: > >> See commit c7018be509 ("test: allow skipping the remainder", 18-05-2017) >> which is currently merged to the 'next' branch (merge 03b8a61e47 of the >> 'jc/skip-test-in-the-middle' branch). >> >>

Re: FORMAT_PATCH_NAME_MAX increase

Ævar Arnfjörð Bjarmason writes: > Just curious do you know about https://github.com/trast/tbdiff ? If > not it might have a high overlap with what you're doing. Yes, that is a very good suggestion. You'd need to be able to actually apply the patches but the way I often do a

Re: FORMAT_PATCH_NAME_MAX increase

Laszlo Ersek writes: > The problem is that I can't really automate the subject munging. The > concrete subjects in this case were: > >> OvmfPkg/QemuFwCfgLib: Implement SEV internal function for SEC phase >> OvmfPkg/QemuFwCfgLib: Implement SEV internal functions for PEI phase

Re: [PATCH 8/8] t0012: test "-h" with builtins

Jeff King writes: > Nope, I have those patches directly on your e83352ef23, and it passes. I > wonder if there's something funny between our environments. What does > the failure look like for you? Travis seems to be seeing the same failure. Curiously, the topic by itself passes

Re: [PATCH v3 4/6] fsmonitor: add test cases for fsmonitor extension

On Thu, May 25, 2017 at 8:36 PM, Ben Peart wrote: [...] > diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh > new file mode 100755 > index 00..395db46d55 > --- /dev/null > +++ b/t/t7519-status-fsmonitor.sh > @@ -0,0 +1,158 @@ > +#!/bin/sh > + >

Re: FORMAT_PATCH_NAME_MAX increase

On Tue, May 30, 2017 at 2:33 PM, Laszlo Ersek wrote: > (apologies for the self-followup:) > > On 05/30/17 14:28, Laszlo Ersek wrote: > >> Note that in such an incremental review, I specifically wish to compare >> patches against each other (i.e., I'd like to see diffs of diffs,

Re: FORMAT_PATCH_NAME_MAX increase

(apologies for the self-followup:) On 05/30/17 14:28, Laszlo Ersek wrote: > Note that in such an incremental review, I specifically wish to compare > patches against each other (i.e., I'd like to see diffs of diffs, AKA > interdiffs), and not the source tree at two, v1<->v2, commits into the >

Re: FORMAT_PATCH_NAME_MAX increase

On 05/30/17 13:36, Ævar Arnfjörð Bjarmason wrote: > On Mon, May 29, 2017 at 10:49 AM, Laszlo Ersek wrote: >> Hi, >> >> would it be possible to >> >> - increase the FORMAT_PATCH_NAME_MAX macro from 64 to, say, 128? >> >> - Or else to introduce a new git-config knob for it? >> >>

  1   2   >