Antw: Re: Q: What happened to "--no-commit" merges?

>>> Elijah Newren schrieb am 22.01.2019 um 22:29 in Nachricht : > Hello, > > On Tue, Jan 22, 2019 at 1:05 PM Ulrich Windl > wrote: >> >> Hi! >> >> Using git version 2.16.4 on OpenSUSE Leap 15.0, it seems that "--no-commit" > no >> longer does what it did before (AFAIR, but I mostly did --no-ff

Re: [PATCH/RFC v2 1/1] test-lint: Only use only sed [-n] [-e command] [-f command_file]

On 22.01.19 22:15, Eric Sunshine wrote: > On Tue, Jan 22, 2019 at 3:00 PM Torsten Bögershausen wrote: >> On 22.01.19 20:47, Junio C Hamano wrote: >>> tbo...@web.de writes: -/\bsed\s+-i/ and err 'sed -i is not portable'; +/\bsed\s+-[^efn]\s+/ and err 'Not portable option with sed

Re: [PATCH v3 2/2] setup: fix memory leaks with `struct repository_format`

On Tue, Jan 22, 2019 at 10:45:48PM +0100, Martin Ågren wrote: > Call `clear_...()` at the start of `read_...()` instead of just zeroing > the struct, since we sometimes enter the function multiple times. This > means that it is important to initialize the struct before calling > `read_...()`, so d

Re: [PATCH] attr: do not mark queried macros as unset

On Tue, Jan 22, 2019 at 01:48:10PM -0800, Junio C Hamano wrote: > > When 06a604e670 later refactored the macro code, it dropped maybe_real > > I think 60a12722ac is what you meant here. Yes indeed, too many 6's, 0's, and a's. :) I see you marked it up when you picked up the patch. Thanks. I sho

[PATCH v6 1/4] commit: extract cleanup_mode functions to sequencer

Signed-off-by: Denton Liu --- builtin/commit.c | 21 ++--- sequencer.c | 29 + sequencer.h | 4 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 004b816635..3ac0a21a22 100644 ---

[PATCH v6 0/4] Add git-merge --cleanup support

There were some merge conflicts since v5 so I've rebased the last few patches on the latest master and fixed the conflicts. Not related to this but while I was making my changes, I noticed that -F and -m don't die properly in git-merge when they accept invalid arguments. Instead, they just print a

[PATCH v6 4/4] merge: add scissors line on merge conflict

This fixes a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Next, if commit.cleanup = scissors is specified, don't produce a scissors line in commit if one already exists in the MERGE_MSG file. Signed-of

[PATCH v6 3/4] merge: cleanup messages like commit

This change allows git-merge messages to be cleaned up with the commit.cleanup configuration or --cleanup option, just like how git-commit does it. We also give git-pull the passthrough option of --cleanup so that it can also take advantage of this change. Finally, add testing to ensure that mess

[PATCH v6 2/4] t7600: clean up 'merge --squash c3 with c7' test

This cleans up the original test by removing some unnecessary braces and removing a pipe. Helped-by: SZEDER Gábor Signed-off-by: Denton Liu --- t/t7600-merge.sh | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 106148254d..d879e

Re: [PATCH 10/14] pack-objects: add trace2 regions

On 1/22/2019 4:22 PM, Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee When studying the performance of 'git push' we would like to know how much time is spent at various parts of the command. One area that could cause performance trouble is 'git pack-objects'. Add trace2 regions ar

Re: [PATCH v2] pack-objects: Use packing_data lock instead of read_mutex

On Tue, Jan 22, 2019 at 5:43 PM Junio C Hamano wrote: > > Patrick Hogg writes: > > > As I mentioned in the prior thread I think that it will be simpler > > to simply use the existing lock in packing_data instead of moving > > read_mutex. I can go back to simply moving read_mutex to the > > packin

Re: [PATCH v3 7/8] checkout: introduce --{,no-}overlay option

Hi, Thomas Gummerer wrote: > Currently 'git checkout' is defined as an overlay operation, which > means that if in 'git checkout -- []' we have an > entry in the index that matches , but that doesn't exist in > , that entry will not be removed from the index or the > working tree. > > Introduce

[PATCH v6 3/3] branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree

From: Nickolai Belakovski --- Documentation/git-branch.txt | 7 +-- builtin/branch.c | 4 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index b3eca6ffdc..a1aef00af0 100644 --- a/Documentation/git-br

[PATCH v6 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree

From: Nickolai Belakovski The output of git branch is modified to mark branches checkout out in a linked worktree with a "+" and color them in cyan (in contrast to the current branch, which will still be denoted with a "*" and colored in green) This is meant to communicate to the user that the b

[PATCH v6 0/3]

From: Nickolai Belakovski >From the latest round of comments: -Added a check in populate_value to only do the hashmap lookup for refs of type branch, since other types would not be checked out in a worktree -Reworded the commit message on 2/3 to make it clearer that the change in output is mean

[PATCH v6 1/3] ref-filter: add worktreepath atom

From: Nickolai Belakovski Add an atom providing the path of the linked worktree where this ref is checked out, if it is checked out in any linked worktrees, and empty string otherwise. --- Documentation/git-for-each-ref.txt | 5 +++ ref-filter.c | 74 ++

Re: [PATCH 00/14] Trace2 tracing facility

"Jeff Hostetler via GitGitGadget" writes: > This patch series contains a greatly refactored version of my original > Trace2 series [1] from August 2018. Great to see this series revived. Looking forward to reading it thru. Thanks. > A new design doc in Documentation/technical/api-trace2.txt (

Re: [PATCH 3/3] diff.c: simplify diff_opt_break_rewrites()

Junio C Hamano writes: > It would make it even easier to follow if you did > > if (*arg == '/') { > opt2 = ...; > arg++; > } else { Oops, this should read "else if (!*arg) {", of course, to match the original. Sorry for the noise. > opt2 =

Re: [PATCH] pack-objects.c: Initialize read mutex in cmd_pack_objects

Patrick Hogg writes: > @@ -3319,6 +3327,8 @@ int cmd_pack_objects(int argc, const char **argv, const > char *prefix) > OPT_END(), > }; > > + init_read_mutex(); > + > if (DFS_NUM_STATES > (1 << OE_DFS_STATE_BITS)) > BUG("too many dfs states, increase

Re: [PATCH v2] pack-objects: Use packing_data lock instead of read_mutex

Patrick Hogg writes: > As I mentioned in the prior thread I think that it will be simpler > to simply use the existing lock in packing_data instead of moving > read_mutex. I can go back to simply moving read_mutex to the > packing_data struct if that that is preferable, though. I'll let others c

Re: [PATCH v3 4/5] Add `human` format to test-tool

"Stephen P. Smith" writes: > Add the human format support to the test tool so that TEST_DATE_NOW > can be used to specify the current time. This sounds sensible, but let's do s/TEST_DATE_NOW/GIT_&/ to make sure that we will not pick up somebody else's random environment variable in production Gi

git status OOM on mmap of large file

joey@darkstar:~/tmp/t> ls -l big-file -rw-r--r-- 1 joey joey 11811160064 Jan 22 17:48 big-file joey@darkstar:~/tmp/t> git status fatal: Out of memory, realloc failed This file is checked into git, but using a smudge/clean filter, so the actual data checked into git is a hash. I did so using git-an

Re: [PATCH] attr: do not mark queried macros as unset

Jeff King writes: > And here's a resurrection of the optimization that _seems_ to work, but > I'm not 100% confident in. > > In particular, it does not care about macros at all. It simply asks: is > this queried attribute a thing which was ever mentioned in the > attributes files (either as a pat

Re: [PATCH] attr: do not mark queried macros as unset

Jeff King writes: > On Fri, Jan 18, 2019 at 11:58:01AM -0500, Jeff King wrote: > >> Now, on to the actual bug. The simplest reproduction is: >> >> (echo "[attr]foo bar"; echo "* foo") >.gitattributes >> git check-attr foo file > > Actually, even simpler is to just "binary", which is pre-defi

[PATCH v3 1/2] setup: free old value before setting `work_tree`

Before assigning to `data->work_tree` in `read_worktree_config()`, free any value we might already have picked up, so that we do not leak it. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano --- setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.c b/setup.c index 1be5037

[PATCH v3 0/2] setup: fix memory leaks with `struct repository_format`

On Tue, 22 Jan 2019 at 14:34, Martin Ågren wrote: > > On Tue, 22 Jan 2019 at 08:07, Jeff King wrote: > > > For the record, I can live with it either way. There are so many funky > > little setup corner cases in the code already, and we don't even really > > have a real-world case to dissect at th

[PATCH v3 2/2] setup: fix memory leaks with `struct repository_format`

After we set up a `struct repository_format`, it owns various pieces of allocated memory. We then either use those members, because we decide we want to use the "candidate" repository format, or we discard the candidate / scratch space. In the first case, we transfer ownership of the memory to a fe

Re: [PATCH v4 2/2] commit-tree: add missing --gpg-sign flag

On Tue, 22 Jan 2019 at 20:07, Junio C Hamano wrote: > > Martin Ågren writes: > > >> + echo 11 | git commit-tree --gpg-sign HEAD^{tree} >oid && > >> + test_line_count = 1 oid && > >> + git tag eleventh-signed $(cat oid) && > >> +... > > Let's see if there any opinions from others

Re: [PATCH] git-submodule.sh: shorten submodule SHA-1s using rev-parse

On 22/01/19 20:22, Junio C Hamano wrote: One thing it is not clear to me is that this codepath is prepared to handle sha1_src and sha1_dst referring to an object that does not exist (i.e. $missing_(src|dst)=t); the original code will still give us 7 hexdigit to show on the headline, but does the

Re: Q: What happened to "--no-commit" merges?

Hello, On Tue, Jan 22, 2019 at 1:05 PM Ulrich Windl wrote: > > Hi! > > Using git version 2.16.4 on OpenSUSE Leap 15.0, it seems that "--no-commit" no > longer does what it did before (AFAIR, but I mostly did --no-ff merges in > SLES11): > Like this (sorry German): > > > git merge --no-commit loca

[PATCH 10/14] pack-objects: add trace2 regions

From: Derrick Stolee When studying the performance of 'git push' we would like to know how much time is spent at various parts of the command. One area that could cause performance trouble is 'git pack-objects'. Add trace2 regions around the three main actions taken in this command: 1. Enumerat

[PATCH 06/14] trace2:data: add trace2 sub-process classification

From: Jeff Hostetler Add trace2 classification for long-running processes started in sub-process.c Signed-off-by: Jeff Hostetler --- sub-process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sub-process.c b/sub-process.c index 8d2a1707cf..3f4af93555 100644 --- a/sub-process.c +++ b/sub

[PATCH 11/14] trace2:data: add subverb to checkout command

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/checkout.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/builtin/checkout.c b/builtin/checkout.c index 6fadf412e8..8939ae99ed 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -262,6 +262,8 @@ static int check

[PATCH 09/14] trace2:data: add trace2 instrumentation to index read/write

From: Jeff Hostetler Add trace2 events to measure reading and writing the index. Signed-off-by: Jeff Hostetler --- read-cache.c | 47 ++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index bfff271a3d..f6d8

[PATCH 04/14] trace2:data: add trace2 regions to wt-status

From: Jeff Hostetler Add trace2_region_enter() and trace2_region_leave() calls around the various phases of a status scan. This gives elapsed time for each phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target. Also, these Trace2 calls now use s->repo rather than the_repository. Signed-off-

[PATCH 08/14] trace2:data: add trace2 hook classification

From: Jeff Hostetler Classify certain child processes as hooks. Signed-off-by: Jeff Hostetler --- builtin/am.c | 1 + builtin/receive-pack.c | 4 builtin/worktree.c | 1 + sequencer.c| 2 ++ transport.c| 1 + 5 files changed, 9 insertions(+) diff --g

[PATCH 01/14] trace2: Documentation/technical/api-trace2.txt

From: Jeff Hostetler Created design document for Trace2 feature. Signed-off-by: Jeff Hostetler --- Documentation/technical/api-trace2.txt | 1158 1 file changed, 1158 insertions(+) create mode 100644 Documentation/technical/api-trace2.txt diff --git a/Documentation/t

[PATCH 13/14] trace2:data: add subverb for rebase

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/rebase.c | 19 +++ 1 file changed, 19 insertions(+) diff --git a/builtin/rebase.c b/builtin/rebase.c index 00de70365e..aac0d52ade 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -819,6 +819,16 @@ int cmd_reb

[PATCH 05/14] trace2:data: add editor/pager child classification

From: Jeff Hostetler Add trace2 process classification for editor and pager child processes. Signed-off-by: Jeff Hostetler --- editor.c | 1 + pager.c | 1 + 2 files changed, 2 insertions(+) diff --git a/editor.c b/editor.c index c985eee1f9..71547674ab 100644 --- a/editor.c +++ b/editor.c @@

[PATCH 12/14] trace2:data: add subverb to reset command

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/reset.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/builtin/reset.c b/builtin/reset.c index 59898c972e..b65b4a66db 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -340,6 +340,7 @@ int cmd_reset(int argc, const ch

[PATCH 07/14] trace2:data: add trace2 transport child classification

From: Jeff Hostetler Add trace2 child classification for transport processes. Signed-off-by: Jeff Hostetler --- connect.c | 3 +++ transport-helper.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/connect.c b/connect.c index 24281b6082..3c6f829a05 100644 --- a/connect.c +++ b/

[PATCH 02/14] trace2: create new combined trace facility

From: Jeff Hostetler Create a new unified tracing facility for git. The eventual intent is to replace the current trace_printf* and trace_performance* routines with a unified set of git_trace2* routines. In addition to the usual printf-style API, trace2 provides higer-level event verbs with fix

[PATCH 00/14] Trace2 tracing facility

This patch series contains a greatly refactored version of my original Trace2 series [1] from August 2018. A new design doc in Documentation/technical/api-trace2.txt (in the first commit) explains the relationship of Trace2 to the current tracing facility. Calls to the current tracing facility hav

[PATCH 14/14] trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

From: Jeff Hostetler Create unit tests for Trace2. Signed-off-by: Jeff Hostetler --- Makefile | 1 + t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/helper/test-trace2.c| 273 ++ t/t0210-trace2-normal.sh | 135

[PATCH 03/14] trace2: collect platform-specific process information

From: Jeff Hostetler Add optional platform-specific code to log information about the current process. On Windows, this includes whether git.exe is running under a debugger and information about the ancestors of the process. The purpose of this information is to help indicate if the process was

Re: [PATCH/RFC v2 1/1] test-lint: Only use only sed [-n] [-e command] [-f command_file]

On Tue, Jan 22, 2019 at 3:00 PM Torsten Bögershausen wrote: > On 22.01.19 20:47, Junio C Hamano wrote: > > tbo...@web.de writes: > >> -/\bsed\s+-i/ and err 'sed -i is not portable'; > >> +/\bsed\s+-[^efn]\s+/ and err 'Not portable option with sed (use only > >> [-n] [-e command] [-f comma

Q: What happened to "--no-commit" merges?

Hi! Using git version 2.16.4 on OpenSUSE Leap 15.0, it seems that "--no-commit" no longer does what it did before (AFAIR, but I mostly did --no-ff merges in SLES11): Like this (sorry German): > git merge --no-commit local/f-linux-firefox Aktualisiere 520aaae..c11e3da Fast-forward bin/fval.xsl |

Re: [PATCH 1/1] tests: explicitly use `test-tool.exe` on Windows

"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > In 8abfdf44c882 (tests: explicitly use `git.exe` on Windows, > 2018-11-14), we made sure to use the `.exe` file extension when > using an absolute path to `git.exe`, to avoid getting confused with a > file or director

Re: Contributor Summit Topics and Logistics

On Tue, Jan 22, 2019 at 10:21:56AM -0800, Stefan Beller wrote: > > > There's no set agenda; we'll decide what to discuss that day. But if > > > anybody would like to mention topics they are interested in (whether you > > > want to present on them, or just have an open discussion), please do so > >

Re: [PATCH 3/3] diff.c: simplify diff_opt_break_rewrites()

Nguyễn Thái Ngọc Duy writes: > - int opt1, opt2; > + int opt1, opt2 = 0; > > BUG_ON_OPT_NEG(unset); > if (!arg) > arg = ""; > opt1 = parse_rename_score(&arg); > - switch (*arg) { > - case '\0': > - opt2 = 0; > - break; > -

Re: [PATCH v4 5/8] git-rebase, sequencer: extend --quiet option for the interactive machinery

Elijah Newren writes: > Also, I have a fuzzy memory of discussing a very similar case with > some rebase-oriented option and its on-disk representation, where the > concern was more about users upgrading git versions during an > incomplete rebase rather than power users looking at internal file >

Re: [PATCH v2] pack-objects: Use packing_data lock instead of read_mutex

Duy, Patrick, On Tue, Jan 22, 2019 at 9:52 AM Elijah Newren wrote: > > On Mon, Jan 21, 2019 at 2:02 AM Duy Nguyen wrote: > > > > On Sat, Jan 19, 2019 at 10:45 PM Patrick Hogg wrote: > > > > > > ac77d0c37 ("pack-objects: shrink size field in struct object_entry", > > > 2018-04-14) added an extra

Re: Contributor Summit Topics and Logistics

On Mon, Jan 21, 2019 at 11:52 PM Jeff King wrote: > > The Git Merge Contributor Summit is a little over a week away. If you're > interested in coming but haven't signed up, please do! We have a few > spaces available still. Details are in the previous announcement: > > http://public-inbox.org/gi

Re: pw/add-p-select, was Re: What's cooking in git.git (Dec 2018, #01; Sun, 9)

Hi Dscho On 21/01/2019 20:58, Johannes Schindelin wrote: Hi Phillip, On Tue, 11 Dec 2018, Phillip Wood wrote: On 11/12/2018 09:56, Johannes Schindelin wrote: On Mon, 10 Dec 2018, Phillip Wood wrote: On 09/12/2018 20:31, Johannes Schindelin wrote: I could imagine, however, that it would

Re: [PATCH] git-submodule.sh: shorten submodule SHA-1s using rev-parse

Johannes Schindelin writes: >> +sha1_abbr_src=$(GIT_DIR="$name/.git" git rev-parse --short >> $sha1_src) > > How about `git -C "$name" rev-parse --short`? That would less likely run > over 80 columns/line, either. That would be a separate patch, either as a preliminary or a follow-u

Re: [PATCH] git-submodule.sh: shorten submodule SHA-1s using rev-parse

Sven van Haastregt writes: > Until now, `git submodule summary` was always emitting 7-character > SHA-1s that have a higher chance of being ambiguous for larger > repositories. Use `git rev-parse --short` instead, which will > determine suitable short SHA-1 lengths. In general I think it is a g

[PATCH] doc: tidy asciidoc style

This mainly refers to enforcing indentation on additional lines of items of lists. Signed-off-by: Jean-Noël Avila --- Documentation/git-add.txt | 8 ++-- Documentation/git-branch.txt | 8 ++-- Documentation/git-checkout.txt | 16 +++ Documentation/git-cherry-pick.txt |

Re: [PATCH v2 1/1] Support working-tree-encoding "UTF-16LE-BOM"

tbo...@web.de writes: > The unicode standard itself defines 3 possible ways how to encode UTF-16. > a) UTF-16, without BOM, big endian: > b) UTF-16, with BOM, little endian: > c) UTF-16, with BOM, big endian: Is it OK to interpret "possible" as "allowed" above? > iconv (and libiconv) can generat

Re: [PATCH/RFC v2 1/1] test-lint: Only use only sed [-n] [-e command] [-f command_file]

On 22.01.19 20:47, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> From `man sed` (on a Mac OS X box): >> The -E, -a and -i options are non-standard FreeBSD extensions and may not be >> available >> on other operating systems. >> >> -/\bsed\s+-i/ and err 's

Re: [PATCH 2/8] evolve: Implement oid_array_contains_nondestructive

On Mon, Jan 21, 2019 at 2:32 PM wrote: > > evolve: Implement oid_array_contains_nondestructive I'd think I would word this sha1-array: implement oid_array_contains_nondestructive as for this patch it is not relevant what we we'll be using it for later, but rather that it touches the oidset

Re: [PATCH/RFC v2 1/1] test-lint: Only use only sed [-n] [-e command] [-f command_file]

tbo...@web.de writes: > From: Torsten Bögershausen > > From `man sed` (on a Mac OS X box): > The -E, -a and -i options are non-standard FreeBSD extensions and may not be > available > on other operating systems. > > - /\bsed\s+-i/ and err 'sed -i is not portable'; > + /\bsed\s+-[^efn]\s+

Re: [PATCH v6 00/10] commit-graph write: progress output improvements

Ævar Arnfjörð Bjarmason writes: > Improvements since v6: > > * Integrate my "commit-graph write: use pack order when finding >commits" patch, and per Junio's suggestion put it at the start so >it's easier to split the two apart. > > * A signed-off-by of mine was missing on that patch.

Re: [PATCH v2 2/3] blame: add the ability to ignore commits and their changes

On 2019-01-22 at 10:14 Junio C Hamano wrote: > René Scharfe writes: > > > Am 17.01.2019 um 21:29 schrieb Barret Rhoden: > >> The blame_entry will get passed up the tree until we find a commit that > >> has a diff chunk that affects those lines. If an ignored commit added > >> more lines than

Re: [PATCH v2 0/2] Fix regression in checkout -b

On 1/22/2019 1:54 PM, Junio C Hamano wrote: Ben Peart writes: diff --git a/builtin/checkout.c b/builtin/checkout.c index af6b5c8336..9c6e94319e 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -517,12 +517,6 @@ static int skip_merge_working_tree(const struct checkout_opts *opts,

Re: [PATCH v4 2/2] commit-tree: add missing --gpg-sign flag

Martin Ågren writes: >> + echo 11 | git commit-tree --gpg-sign HEAD^{tree} >oid && >> + test_line_count = 1 oid && >> + git tag eleventh-signed $(cat oid) && >> +... > Let's see if there any opinions from others about this more verbose > construction, vs placing the oid in a var

Re: [PATCH v2 0/2] Fix regression in checkout -b

Ben Peart writes: > diff --git a/builtin/checkout.c b/builtin/checkout.c > index af6b5c8336..9c6e94319e 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -517,12 +517,6 @@ static int skip_merge_working_tree(const struct > checkout_opts *opts, > if (core_apply_sparse_checkou

Re: [PATCH v2 2/2] checkout: fix regression in checkout -b on intitial checkout

On Tue, Jan 22, 2019 at 03:35:21PM +0100, Johannes Schindelin wrote: > I also looked at the implementation of `file_exists()` and found that it > uses `lstat()`. Peff, you introduced this (using `stat()`) in c91f0d92efb3 > (git-commit.sh: convert run_status to a C builtin, 2006-09-08), could you >

Re: [PATCH v2 2/2] checkout: fix regression in checkout -b on intitial checkout

Johannes Schindelin writes: > I also looked at the implementation of `file_exists()` and found that it > uses `lstat()`. Peff, you introduced this (using `stat()`) in c91f0d92efb3 > (git-commit.sh: convert run_status to a C builtin, 2006-09-08), could you > enlighten me why you chose `stat()` ove

Re: [PATCH 1/1] stash: fix segmentation fault when files were added with intent

Johannes Schindelin writes: > when I want to see whether a given branch is buggy and when I cannot > simply `git cherry-pick `: > > git cherry-pick > git checkout HEAD^ -- :^/t/ Yup. It is easy to just apply the t/ part to grab the test update to see breakage (which I already said

Re: [PATCH v2 4/5] Add `human` format to test-tool

"Stephen P. Smith" writes: > Why don't I create a second patch set after I git this one to next for > relative to match your suggestion. I don't like the idea of conflating two > topics. I'd prefer two separate patches, too, and I'd prefer to see clean-up first and then a new feature. Thanks

Re: [PATCH v6 00/10] commit-graph write: progress output improvements

On 1/19/2019 3:21 PM, Ævar Arnfjörð Bjarmason wrote: Improvements since v6: * Integrate my "commit-graph write: use pack order when finding commits" patch, and per Junio's suggestion put it at the start so it's easier to split the two apart. * A signed-off-by of mine was missing on

Re: [PATCH v2 1/3] Move init_skiplist() outside of fsck

On Tue, Jan 22, 2019 at 10:46:56AM +0100, Ævar Arnfjörð Bjarmason wrote: > > At which point, I think it might be simpler to just make git more > > permissive with respect to those minor data errors (and in fact, we are > > already pretty permissive for the most part in non-fsck operations). > > Y

Re: Contributor Summit Topics and Logistics

On 1/22/2019 2:50 AM, Jeff King wrote: For people who want to try to join remotely, I don't think we're going to have a particularly fancy AV setup. But there should at least be a big screen (which we typically do not really use for presenting), and I hope we can provide some connectivity. I'll b

Re: Contributor Summit Topics and Logistics

On Tue, Jan 22, 2019 at 12:26 AM Jeff King wrote: > > On Tue, Jan 22, 2019 at 02:50:27AM -0500, Jeff King wrote: > > > There's no set agenda; we'll decide what to discuss that day. But if > > anybody would like to mention topics they are interested in (whether you > > want to present on them, or j

Re: [PATCH/RFC] fsck: complain when .gitignore and .gitattributes are symlinks

On 22/01/2019 07:23, Jeff King wrote: > On Fri, Jan 18, 2019 at 01:41:08AM +, Ramsay Jones wrote: > >> I don't do this "from time to time", but *every* build on all >> platforms! :-D >> >> As I have mentioned before, I run the script on 'master', 'next' >> and 'pu', but I don't look at the

Re: [PATCHv3 0/2] git-p4: shelved change update with move/copy

> This updates the patchset to support copy, as suggested by Andrey. > > Luke Diamand (2): > git-p4: add failing test for shelved CL update involving move/copy > git-p4: handle update of moved/copied files when updating a shelve > > git-p4.py| 2 ++ > t/t9807-git-p4-submit.s

Re: [PATCH v2 2/3] blame: add the ability to ignore commits and their changes

René Scharfe writes: > Am 17.01.2019 um 21:29 schrieb Barret Rhoden: >> The blame_entry will get passed up the tree until we find a commit that >> has a diff chunk that affects those lines. If an ignored commit added >> more lines than it removed, the blame will fall on a commit that made a >> c

Re: [PATCH v2 1/3] Move init_skiplist() outside of fsck

Ævar Arnfjörð Bjarmason writes: > It needing to be bidirectional is a very good point, and I think that > makes my suggestion a non-starter. Thanks. Yes, it is a bit sad that we need to carry the mistakes forward while moving to the new hash, but bidi convertibility is a must for the transition

Re: [PATCH v2] pack-objects: Use packing_data lock instead of read_mutex

On Mon, Jan 21, 2019 at 2:02 AM Duy Nguyen wrote: > > On Sat, Jan 19, 2019 at 10:45 PM Patrick Hogg wrote: > > > > ac77d0c37 ("pack-objects: shrink size field in struct object_entry", > > 2018-04-14) added an extra usage of read_lock/read_unlock in the newly > > introduced oe_get_size_slow for th

Re: Improved Error Message

Hi, Ralph. This feels like an issue of how homebrew relays information rather than with git: santiago at ~ ✔ git clone nonexistent fatal: repository 'nonexistent' does not exist santiago at ~ ✗ git clone https://nonexistent.git Cloning into 'nonexistent'... fatal: unable to ac

Re: [RFC PATCH 3/3] git-rebase.sh: make git-rebase--interactive the default

Hi Elijah, On Mon, 21 Jan 2019, Elijah Newren wrote: > Before worrying about adding extra options and deprecation periods, > though, perhaps we could start by by omitting the --cherry-pick for > implicitly_interactive rebases, like --merge? (In particular, I'm > thinking that when we switch the

Re: Potential bug in pack-objects.c

On Tue, 22 Jan 2019 at 07:29, Jeff King wrote: > > On Mon, Jan 21, 2019 at 10:10:16PM +, Alex Netkachov wrote: > > > On the location builtin/pack-objects.c:1996 the code tries to set > > read_lock (pthread_mutex_lock(&read_mutex)) and fails. I suspect that > > read_mutex is not initialised yet

Re: [PATCH v4 03/16] sequencer: remove the 'arg' field from todo_item

Hi Phillip, On Mon, 21 Jan 2019, Phillip Wood wrote: > const char *get_item_arg(struct todo_list *todo, struct todo_list_item *item) > { > return todo->buf.buf + item->arg_offset; > } I like that a lot. Thanks, Dscho

Re: [PATCH v2 2/3] blame: add the ability to ignore commits and their changes

On 2019-01-20 at 19:19 René Scharfe wrote: > Am 17.01.2019 um 21:29 schrieb Barret Rhoden: > > The blame_entry will get passed up the tree until we find a commit that > > has a diff chunk that affects those lines. If an ignored commit added > > more lines than it removed, the blame will fall on a

Re: [PATCH] git-submodule.sh: shorten submodule SHA-1s using rev-parse

Hi Sven, On Sun, 20 Jan 2019, Sven van Haastregt wrote: > Until now, `git submodule summary` was always emitting 7-character > SHA-1s that have a higher chance of being ambiguous for larger > repositories. Use `git rev-parse --short` instead, which will > determine suitable short SHA-1 lengths.

[PATCH v2 08/13] Use promisor_remote_get_direct() and has_promisor_remote()

Instead of using the repository_format_partial_clone global and fetch_objects() directly, let's use has_promisor_remote() and promisor_remote_get_direct(). This way all the configured promisor remotes will be taken into account, not only the one specified by extensions.partialClone. Also when clo

[PATCH v2 02/13] partial-clone: add missing 'is' in doc

Signed-off-by: Christian Couder --- Documentation/technical/partial-clone.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt index 1ef66bd788..896c7b3878 100644 --- a/Documentation/technica

[PATCH v2 09/13] promisor-remote: parse remote.*.partialclonefilter

This makes it possible to specify a different partial clone filter for each promisor remote. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 27 +++ list-objects-filter-options.h | 3 ++- promisor-remote.c

[PATCH v2 00/13] Many promisor remotes

This path series is a follow up from the "remote odb" patch series that I sent last year, which were a follow up from previous series. See the links section for more information. The goal of this patch series is to make it possible to have and to fetch missing objects from multiple remotes instead

[PATCH v2 01/13] fetch: fix extensions.partialclone name in error message

There is "extensions.partialclone" and "core.partialCloneFilter", but not "core.partialclone". Only "extensions.partialclone" is meant to contain a remote name. While at it, let's wrap the relevant code lines to keep them at a reasonable length. Signed-off-by: Christian Couder --- builtin/fetch

[PATCH v2 13/13] remote: add promisor and partial clone config to the doc

Signed-off-by: Christian Couder --- Documentation/config/remote.txt | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt index 6c4cad83a2..a8e6437a90 100644 --- a/Documentation/config/remote.txt +++ b/Documentation/config/re

[PATCH v2 05/13] promisor-remote: implement promisors_get_direct()

From: Christian Couder This is implemented for now by calling fetch_objects(). It fetches from all the promisor remotes. Signed-off-by: Christian Couder --- promisor-remote.c | 17 + promisor-remote.h | 1 + 2 files changed, 18 insertions(+) diff --git a/promisor-remote.c b/p

[PATCH v2 10/13] builtin/fetch: remove unique promisor remote limitation

--- builtin/fetch.c | 20 +--- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 75746c50e0..ed883399c7 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1464,26 +1464,16 @@ static inline void fetch_one_setup_partial(struct

[PATCH v2 06/13] promisor-remote: add promisor_remote_reinit()

From: Christian Couder We will need to reinitialize the promisor remote configuration as we will make some changes to it in a later commit. Signed-off-by: Christian Couder --- promisor-remote.c | 14 -- promisor-remote.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) di

[PATCH v2 03/13] fetch-object: make functions return an error code

From: Christian Couder The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- fetch-object.c | 13 - fetch-object.h | 4 ++-- sha1-file.c| 4 +

[PATCH v2 07/13] promisor-remote: use repository_format_partial_clone

A remote specified using the extensions.partialClone config option should be considered a promisor remote too. This remote should be at the end of the promisor remote list, so that it is used only if objects have not been found in other remotes. Signed-off-by: Christian Couder --- promisor-remo

[PATCH v2 04/13] Add initial support for many promisor remotes

From: Christian Couder The promisor-remote.{c,h} files will contain functions to manage many promisor remotes. We expect that there will not be a lot of promisor remotes, so it is ok to use a simple linked list to manage them. Helped-by: Jeff King Signed-off-by: Christian Couder --- Makefile

[PATCH v2 11/13] t0410: test fetching from many promisor remotes

From: Christian Couder This shows that it is now possible to fetch objects from more than one promisor remote, and that fetching from a new promisor remote can configure it as one. Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 47 +++- 1 fil

[PATCH v2 12/13] partial-clone: add multiple remotes in the doc

While at it, let's remove a reference to ODB effort as the ODB effort has been replaced by directly enhancing partial clone and promisor remote features. Signed-off-by: Christian Couder --- Documentation/technical/partial-clone.txt | 83 --- 1 file changed, 58 insertions(+),

Re: [PATCH v2 2/2] checkout: fix regression in checkout -b on intitial checkout

Hi, On Mon, 21 Jan 2019, Ben Peart wrote: > diff --git a/builtin/checkout.c b/builtin/checkout.c > index 6fadf412e8..9c6e94319e 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -592,6 +592,13 @@ static int skip_merge_working_tree(const struct > checkout_opts *opts, >* Re

  1   2   >