Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-21 Thread Jeff King
On Mon, Oct 21, 2019 at 05:51:52PM +0900, Junio C Hamano wrote: > > - void *value; > > + union { > > + int *intp; > > + const char *strp; > > + } value; > [...] > The side that actually use .vale would need to change for obvious > reasons, which may be painful, but I agre

Re: [RFC PATCH 2/7] autostash: extract read_one() from rebase

2019-10-21 Thread Johannes Schindelin
Hi, On Fri, 18 Oct 2019, Phillip Wood wrote: > Hi Denton > > On 16/10/2019 18:26, Denton Liu wrote: > > Begin the process of lib-ifying the autostash code. In a future commit, > > this will be used to implement `--autostash` in other builtins. > > > > This patch is best viewed with `--color-moved

Re: [RFC PATCH 1/7] Makefile: alphabetically sort += lists

2019-10-21 Thread Johannes Schindelin
Hi Junio, On Fri, 18 Oct 2019, Junio C Hamano wrote: > Denton Liu writes: > > > There are many += lists in the Makefile and, over time, they have gotten > > slightly out of order, alphabetically. Alphabetically sort all += lists > > to bring them back in order. > > ... > > Hmm. I like the gener

Re: Outreachy Winter 2019

2019-10-21 Thread Emily Shaffer
On Mon, Oct 21, 2019 at 11:54:01AM -0500, Karina Saucedo wrote: > Hello, my name is Karina and I'm and Outreachy applicant. I´m interested in > applying to the project 'Add did you mean hints´ and I was wondering how > can I start contributing since there seem to be no issues on the github > page.

Re: [Outreachy] First contribution

2019-10-21 Thread Emily Shaffer
On Mon, Oct 21, 2019 at 12:39:16PM +0200, Miriam R. wrote: > Dear Git developers, > I’m an Outreachy applicant, I would like to make my contribution to > apply to this Outreachy internship period. Welcome, Miriam! Good to hear from you. > > I have found this issue tagged as open and goodfirstiss

Re: [PATCH 5/5] path.c: don't call the match function without value in trie_find()

2019-10-21 Thread David Turner
On Mon, 2019-10-21 at 18:00 +0200, SZEDER Gábor wrote: > Add the missing condition to trie_find() so it will never invoke the > match function with a non-existing value. check_common() will then > no > longer have to check that it got a non-NULL value, so remove that > condition. ... > > /

Re: [PATCH v5 13/17] read-tree: show progress by default

2019-10-21 Thread Derrick Stolee
On 10/21/2019 11:04 AM, Phillip Wood wrote: > Hi Stolee > > On 21/10/2019 14:56, Derrick Stolee via GitGitGadget wrote: >> From: Derrick Stolee >> >> The read-tree builtin has a --verbose option that signals to show >> progress and other data while updating the index. Update this to >> be on by d

Re: [PATCH v5 13/17] read-tree: show progress by default

2019-10-21 Thread Phillip Wood
Hi Stolee On 21/10/2019 14:56, Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee The read-tree builtin has a --verbose option that signals to show progress and other data while updating the index. Update this to be on by default when stderr is a terminal window. This will help tools

Re: [PATCH v5 1/2] format-patch: create leading components of output directory

2019-10-21 Thread Bert Wesarg
Please ignore this. Will rebase on 2.24-rc0 and will only include the test changes. Bert On Mon, Oct 21, 2019 at 12:25 PM Bert Wesarg wrote: > > 'git format-patch -o ' did an equivalent of 'mkdir ' > not 'mkdir -p ', which is being corrected. > > Avoid the usage of 'adjust_shared_perm' on the le

Re: [PATCH v4 01/17] sparse-checkout: create builtin with 'list' subcommand

2019-10-21 Thread Derrick Stolee
On 10/16/2019 3:00 PM, Elijah Newren wrote: > On Tue, Oct 15, 2019 at 6:56 AM Derrick Stolee via GitGitGadget > wrote: >> +DESCRIPTION >> +--- >> + >> +Initialize and modify the sparse-checkout configuration, which reduces >> +the checkout to a set of directories given by a list of prefixe

Re: [PATCH v4 00/17] New sparse-checkout builtin and "cone" mode

2019-10-21 Thread Derrick Stolee
On 10/17/2019 7:53 PM, Jon Simons wrote: > On 10/15/19 6:55 AM, Derrick Stolee via GitGitGadget wrote: >> V4 UPDATE: Rebased on latest master to include ew/hashmap and >> ds/include-exclude in the base. > > I did a partial review of the v4 patches out of curiosity and I notice > in sparse-checkout

Re: [PATCH v4 15/17] sparse-checkout: update working directory in-process

2019-10-21 Thread Derrick Stolee
On 10/18/2019 4:40 PM, SZEDER Gábor wrote: > On Fri, Oct 18, 2019 at 10:24:21PM +0200, SZEDER Gábor wrote: >> On Tue, Oct 15, 2019 at 01:56:02PM +, Derrick Stolee via GitGitGadget >> wrote: >>> From: Derrick Stolee >>> >>> The sparse-checkout builtin used 'git read-tree -mu HEAD' to update th

Re: [PATCH v4 09/17] sparse-checkout: use hashmaps for cone patterns

2019-10-21 Thread Derrick Stolee
On 10/18/2019 11:31 AM, SZEDER Gábor wrote: > On Tue, Oct 15, 2019 at 01:55:56PM +, Derrick Stolee via GitGitGadget > wrote: >> Running 'git read-tree -mu HEAD' on this file had the following >> performance: >> >> core.sparseCheckout=false: 0.21 s (0.00 s) >> core.sparseCheckout=tru

Re: [PATCH v4 01/17] sparse-checkout: create builtin with 'list' subcommand

2019-10-21 Thread Derrick Stolee
on this file. The files matching the patterns in the file will >> +appear in the working directory, and the rest will not. >> + >> +## FULL PATTERN SET >> + >> +By default, the sparse-checkout file uses the same syntax a

Re: [PATCH v3 4/4] git-gui: allow undoing last revert

2019-10-21 Thread Bert Wesarg
rrent_diff_side > - global ui_diff ui_index file_states > + global ui_diff ui_index file_states last_revert > > set selected [$ui_diff tag nextrange sel 0.0] > > @@ -852,5 +859,43 @@ proc apply_or_revert_range_or_line {x y revert} { > return > }

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-21 Thread Junio C Hamano
Jeff King writes: > I wondered if we could be a bit more clever with the definition of > "struct option". Something like: > > diff --git a/parse-options.h b/parse-options.h > index 38a33a087e..99c7ff466d 100644 > --- a/parse-options.h > +++ b/parse-options.h > @@ -126,7 +126,10 @@ struct option {

Re: [Git Developer Blog] [PATCH] post: a tour of git's object types

2019-10-20 Thread Junio C Hamano
Emily Shaffer writes: > +Under the covers, Git is mostly a directed graph of objects. Those objects > come > +in four flavors; from root to leaf (generally), those flavors are: Is "acyclic" worth mentioning, I wonder. > + > +- Tag > +- Commit > +- Tree > +- Blob > + > +We'll take a closer look

Re: [PATCH v2] t/README: the test repo does not have global or system configs

2019-10-20 Thread Junio C Hamano
Philip Oakley writes: > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > index 899e92a1c9..d4c792076d 100644 > --- a/Documentation/git-config.txt > +++ b/Documentation/git-config.txt > @@ -107,7 +107,7 @@ OPTIONS > For writing options: write to global `~/.gitconfig

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-20 Thread Jeff King
On Mon, Oct 21, 2019 at 09:52:11AM +0900, Junio C Hamano wrote: > I can sympathize, but I do not think it is worth inventing OPT_U64() > or adding "int total_i" whose value is assigned to "u64 total" after > parsing a command line arg with OPT_INTEGER() into the former. > > Catching a pointer who

Re: [PATCH v5] Doc: Bundle file usage

2019-10-20 Thread Jeff King
On Mon, Oct 21, 2019 at 11:48:40AM +0900, Junio C Hamano wrote: > > +`git clone` can use any bundle created without negative refspecs > > +(e.g., `new`, but not `old..new`). > > To be consistent with the phrasing of this particular document we > saw earlier, you would have said "without basis", b

Re: [PATCH] rebase: hide --preserve-merges option

2019-10-20 Thread Junio C Hamano
Denton Liu writes: > Since --preserve-merges has been deprecated in favour of > --rebase-merges, mark this option as hidden so it no longer shows up in > the usage and completions. > > Signed-off-by: Denton Liu > --- > This patch continues the deprecation effort and can be based on top of > `js/

Re: [PATCH v5] Doc: Bundle file usage

2019-10-20 Thread Junio C Hamano
Philip Oakley writes: > @@ -20,11 +20,14 @@ DESCRIPTION > Some workflows require that one or more branches of development on one > machine be replicated on another machine, but the two machines cannot > be directly connected, and therefore the interactive Git protocols (git, > +ssh, http) cann

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-20 Thread Junio C Hamano
SZEDER Gábor writes: > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via > GitGitGadget wrote: >> From: Johannes Schindelin >> >> The CI builds are failing for Mac OS X due to a change in the > > s/CI/Azure Pipelines/ > > Our Travis CI builds are fine. > >> location of the perf

Re: [PATCH v2 3/4] Make die_if_checked_out() prune missing checkouts of unlocked worktrees.

2019-10-20 Thread Junio C Hamano
Peter Jones writes: [jc: won't repeat comments on the title] > @@ -360,6 +360,12 @@ void die_if_checked_out(const char *branch, int > ignore_current_worktree) > wt = find_shared_symref("HEAD", branch); > if (!wt || (ignore_current_worktree && wt->is_current)) > return;

Re: [PATCH v2 2/4] libgit: Expose more worktree functionality.

2019-10-20 Thread Junio C Hamano
Peter Jones writes: Same comment on the commit title as 1/4; also, we tend not to upcase the first word after the : word and omit the full-stop on the title (see "git shortlog -32 --no-merges" on our project for examples). > Add delete_worktrees_dir_if_empty() and prune_worktree() to the public

Re: [PATCH v2 1/4] libgit: Add a read-only helper to test the worktree lock

2019-10-20 Thread Junio C Hamano
Peter Jones writes: > Subject: Re: [PATCH v2 1/4] libgit: Add a read-only helper to test the > worktree lock Having a word "worktree" somewhere on the title is good, but have it as the "I am changing this area"; "libgit" does not give readers the hint th

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-20 Thread Junio C Hamano
SZEDER Gábor writes: > The reason for that bogus value is that '--total's parameter is parsed > via parse-options's OPT_INTEGER into a uint64_t variable [1]... > > Change the type of that variable from uint64_t to int, to match what > parse-options expects; in the tests of the progress output we

Re: [PATCH 2/2] ci(visual-studio): actually run the tests in parallel

2019-10-20 Thread Eric Sunshine
On Sun, Oct 20, 2019 at 4:39 PM Johannes Schindelin via GitGitGadget wrote: > [...] > During that transition, we needed to implement a new way to run the test > suite in parallel, as Visual Studio users typically will only have a Git > Bash available (which does not ship with `make` nore with supp

Re: [PATCH v3] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Johannes Sixt
Am 20.10.19 um 20:52 schrieb Stephen Boyd: > --- /dev/null > +++ b/t/t4018/dts-nodes-multiline-prop > @@ -0,0 +1,13 @@ > +/ { > + label_1: node1@ff00 { > + RIGHT@deadf00,4000 { > + multilineprop = <3>, > + <4>, > +

Re: [PATCH v2] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Stephen Boyd
Quoting Johannes Sixt (2019-10-16 14:10:09) > [Removed bouncing addresses of Matthieu Moy and William Duclot from Cc] > > Am 16.10.19 um 22:32 schrieb Stephen Boyd: > > diff --git a/t/t4018/dts-nodes-multiline-prop > > b/t/t4018/dts-nodes-multiline-prop > > new file mode 100644 > > index

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-20 Thread Philip Oakley
On 20/10/2019 00:23, Jeff King wrote: On Sat, Oct 19, 2019 at 09:20:11PM +0200, Christian Couder wrote: +static void write_reused_pack_one(size_t pos, struct hashfile *out, + struct pack_window **w_curs) +{ + off_t offset, next, cur; + enum object_type type

Re: [PATCH v4] Doc: Bundle file usage

2019-10-20 Thread Philip Oakley
On 20/10/2019 02:10, Jeff King wrote: On Fri, Oct 18, 2019 at 09:30:52PM +0100, Philip Oakley wrote: +`git clone` can use any bundle created without negative refspecs +(e.g., `new`, but not `old..new`). +If you want to match `git clone --mirror`, which would clone other +refs such as `refs/remo

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-20 Thread Heba Waly
On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer wrote: > > On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote: > > From: Heba Waly > > Hi Heba, > > Thanks for the patch! > > I'd like to highlight to the community that this is an Outreachy > applicant and microproject. Heba,

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-20 Thread Heba Waly
On Sat, Oct 19, 2019 at 11:07 AM Jonathan Tan wrote: > > > From: Heba Waly > > > > This commit is copying and summarizing the documentation from > > documentation/technical/api-config.txt to comments in config.h > > Thanks for this commit! > > As for your commit message, as far as I know, the ide

Re: email as a bona fide git transport

2019-10-19 Thread Vegard Nossum
On 10/20/19 5:17 AM, Willy Tarreau wrote: On Fri, Oct 18, 2019 at 03:14:56PM -0400, Theodore Y. Ts'o wrote: On Fri, Oct 18, 2019 at 06:50:51PM +0200, Vegard Nossum wrote: The problem I ran into with putting the metadata at the end was detecting where the diff ends. A comment in 'git apply' su

Re: email as a bona fide git transport

2019-10-19 Thread Laurent Pinchart
On Thu, Oct 17, 2019 at 06:30:29PM -0700, Greg KH wrote: > On Thu, Oct 17, 2019 at 04:45:32PM -0400, Konstantin Ryabitsev wrote: > > On Thu, Oct 17, 2019 at 01:43:43PM -0700, Greg KH wrote: > >>> I wonder if it'd be also possible to then embed gpg signatures over > >>> send-mail payloads so as they

Re: email as a bona fide git transport

2019-10-19 Thread Willy Tarreau
On Fri, Oct 18, 2019 at 03:14:56PM -0400, Theodore Y. Ts'o wrote: > On Fri, Oct 18, 2019 at 06:50:51PM +0200, Vegard Nossum wrote: > > The problem I ran into with putting the metadata at the end was > > detecting where the diff ends. A comment in 'git apply' suggested that > > detecting the differe

Re: [PATCH v4] Doc: Bundle file usage

2019-10-19 Thread Jeff King
On Fri, Oct 18, 2019 at 09:30:52PM +0100, Philip Oakley wrote: > +`git clone` can use any bundle created without negative refspecs > +(e.g., `new`, but not `old..new`). > +If you want to match `git clone --mirror`, which would clone other > +refs such as `refs/remotes/*`, use `--all`. > +If you wa

Re: [BUG]: Testsuite failures on big-endian targets

2019-10-19 Thread Todd Zullinger
Hello, [+cc: Ævar] John Paul Adrian Glaubitz wrote: > The testsuite is failing again on s390x and all other big-endian targets in > Debian. For a full build log on s390x see [1]. > > Adrian > >> [1] >> https://buildd.debian.org/status/fetch.php?pkg=git&arch=s390x&ver=1%3A2.24.0%7Erc0-1&stamp=1

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-19 Thread Todd Zullinger
Hi, John Paul Adrian Glaubitz wrote: > Hi Gábor! > > On 10/20/19 1:37 AM, SZEDER Gábor wrote: >> On Sat, Oct 19, 2019 at 11:38:40PM +0200, John Paul Adrian Glaubitz wrote: >>> The testsuite is failing again on s390x and all other big-endian targets in >>> Debian. For a full build log on s390x see

Re: [PATCH] test-progress: fix test failures on big-endian systems

2019-10-19 Thread John Paul Adrian Glaubitz
Hi Gábor! On 10/20/19 1:37 AM, SZEDER Gábor wrote: > On Sat, Oct 19, 2019 at 11:38:40PM +0200, John Paul Adrian Glaubitz wrote: >> The testsuite is failing again on s390x and all other big-endian targets in >> Debian. For a full build log on s390x see [1]. > > Gah, my progress display fixes strik

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-19 Thread Jeff King
On Sat, Oct 19, 2019 at 09:20:11PM +0200, Christian Couder wrote: > > > +static void write_reused_pack_one(size_t pos, struct hashfile *out, > > > + struct pack_window **w_curs) > > > +{ > > > + off_t offset, next, cur; > > > + enum object_type type; > > > +

Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()

2019-10-19 Thread Jeff King
On Sat, Oct 19, 2019 at 04:25:19PM +0100, Philip Oakley wrote: > > +int bitmap_walk_contains(struct bitmap_index *bitmap_git, > > +struct bitmap *bitmap, const struct object_id *oid) > > +{ > > + int idx; > Excuse my ignorance here... > > For the case on Windows (int/long 32

Re: [BUG]: Testsuite failures on big-endian targets

2019-10-19 Thread John Paul Adrian Glaubitz
Hi! On 7/31/19 9:17 AM, Todd Zullinger wrote: >> Build logs are: >> >>> https://buildd.debian.org/status/fetch.php?pkg=git&arch=s390x&ver=1%3A2.23.0%7Erc0-1&stamp=1564449102&raw=0 >>> https://buildd.debian.org/status/fetch.php?pkg=git&arch=s390x&ver=1%3A2.23.0%7Erc0%2Bnext.20190729-1&stamp=1564449

Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()

2019-10-19 Thread Philip Oakley
Hi Christian, On 19/10/2019 19:55, Christian Couder wrote: Hi Philip, On Sat, Oct 19, 2019 at 5:25 PM Philip Oakley wrote: Hi Christian, can I check one thing? Yeah, sure! Thanks for taking a look at my patches! On 19/10/2019 11:35, Christian Couder wrote: +int bitmap_walk_contains(struct

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-19 Thread Christian Couder
Hi Philip, On Sat, Oct 19, 2019 at 5:30 PM Philip Oakley wrote: > On 19/10/2019 11:35, Christian Couder wrote: > > +static void write_reused_pack_one(size_t pos, struct hashfile *out, > > + struct pack_window **w_curs) > > +{ > > + off_t offset, next, cur; > >

Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()

2019-10-19 Thread Christian Couder
Hi Philip, On Sat, Oct 19, 2019 at 5:25 PM Philip Oakley wrote: > > Hi Christian, > can I check one thing? Yeah, sure! Thanks for taking a look at my patches! > On 19/10/2019 11:35, Christian Couder wrote: > > +int bitmap_walk_contains(struct bitmap_index *bitmap_git, > > +

Re: [PATCH v2 9/9] pack-objects: improve partial packfile reuse

2019-10-19 Thread Philip Oakley
Hi Christian, a couple of mem_size questions? On 19/10/2019 11:35, Christian Couder wrote: From: Jeff King Let's store the chunks of the packfile that we reuse in a dynamic array of `struct reused_chunk`, and let's use a reuse_packfile_bitmap to speed up reusing parts of packfiles. The dynam

Re: [PATCH v2 5/9] pack-bitmap: introduce bitmap_walk_contains()

2019-10-19 Thread Philip Oakley
Hi Christian, can I check one thing? On 19/10/2019 11:35, Christian Couder wrote: From: Jeff King We will use this helper function in a following commit to tell us if an object is packed. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- pack-bitmap.c | 12 pack-b

Re: [PATCH v1] config/branch: state that .merge is the remote ref

2019-10-19 Thread Philip Oakley
Hi Junio, On 19/10/2019 00:11, Junio C Hamano wrote: Philip Oakley writes: branch..merge::     Defines, for the local branch , the upstream branch ref     _on the remote_ (as given by branch..remote).     The upstream ref may be different from the local branch ref. optionally s/different f

Re: [PATCH v2 01/15] t7408: replace `test_must_fail test_path_is_file`

2019-10-19 Thread Johannes Sixt
Am 19.10.19 um 00:04 schrieb Denton Liu: > diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh > index 34ac28c056..9e62d43cac 100755 > --- a/t/t7408-submodule-reference.sh > +++ b/t/t7408-submodule-reference.sh > @@ -123,7 +123,7 @@ test_expect_success 'missing submodule al

Re: [PATCH v1] config/branch: state that .merge is the remote ref

2019-10-18 Thread Junio C Hamano
Philip Oakley writes: > branch..merge:: >     Defines, for the local branch , the upstream branch ref >     _on the remote_ (as given by branch..remote). >     The upstream ref may be different from the local branch ref. > > optionally s/different from/ same as/ ? That "optionally" part is exact

Re: [PATCH v6 1/2] documentation: add tutorial for first contribution

2019-10-18 Thread Emily Shaffer
On Fri, Oct 18, 2019 at 06:40:27PM +0200, SZEDER Gábor wrote: > > Just leaving a quick note here: an entry about the new command should > be added to 'command-list.txt' as well, so it will be included in the > list of available commands in 'git help -a' or even in 'git help' > and in completion, i

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-18 Thread Emily Shaffer
On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote: > From: Heba Waly Hi Heba, Thanks for the patch! I'd like to highlight to the community that this is an Outreachy applicant and microproject. Heba, when you send the next version, I think you can add [Outreachy] manuall

Re: [PATCH v2 02/15] t: teach test_cmp_rev to accept ! for not-equals

2019-10-18 Thread SZEDER Gábor
On Fri, Oct 18, 2019 at 03:10:21PM -0700, Denton Liu wrote: > Currently, in the case where we are using test_cmp_rev() to report > not-equals, we write `! test_cmp_rev`. However, since test_cmp_rev() > contains > > r1=$(git rev-parse --verify "$1") && > r2=$(git rev-parse --verify "$2"

Re: [PATCH 1/1] config: add documentation to config.h

2019-10-18 Thread Jonathan Tan
> From: Heba Waly > > This commit is copying and summarizing the documentation from > documentation/technical/api-config.txt to comments in config.h Thanks for this commit! As for your commit message, as far as I know, the idea is to move the documentation, not to copy it. Also, write this in i

Re: [PATCH v2 00/15] t5520: various test cleanup

2019-10-18 Thread Denton Liu
Sorry for the double-send. public-inbox and MARC both showed that only 3 messages got through the in the first send so I sent it again. Seems to have gotten through find the second time around. On Fri, Oct 18, 2019 at 03:04:03PM -0700, Denton Liu wrote: > Like earlier patchsets, I want to implemen

Re: [PATCH v2 1/6] midx: add MIDX_PROGRESS flag

2019-10-18 Thread William Baker
On 10/16/19 12:48 PM, William Baker wrote:>> I do not care too deeply either way, but if you wrote it in one way, >> how about completing the series without changing it in the middle, >> and leave the clean-ups to a follow-up series (if needed)? > > > That plan sounds good to me. The most recen

Re: Git Gui: Branch->create currently fails...

2019-10-18 Thread Philip Oakley
rt icon. (Target: C:\git-sdk-64\git-bash.exe   Stat in: C:/git-sdk-64/) so looks to be MSYS2/bash related. Ah, so it is an upstream issue. I guess we can just report it and wait for them to fix it. I'd missed the final 'Segmentation fault' on the last line in the bash output that wasn&

Re: [PATCH 3/6] completion: return the index of found word from __git_find_on_cmdline()

2019-10-18 Thread Eric Sunshine
On Fri, Oct 18, 2019 at 10:37 AM SZEDER Gábor wrote: > On Thu, Oct 17, 2019 at 01:52:27PM -0400, Eric Sunshine wrote: > > > + case "$1" in > > > + --show-idx) show_idx=y ;; > > > + *) return 1 ;; > > > > Should this emit an error message t

Re: [PATCH v1] config/branch: state that .merge is the remote ref

2019-10-18 Thread Philip Oakley
Hi Junio, On 18/10/2019 02:32, Junio C Hamano wrote: Philip Oakley writes: branch..merge:: Defines, together with branch..remote, the upstream branch - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which + for the given branch. It defines the branch

Re: [PATCH 5/6] completion: list existing working trees for 'git worktree' subcommands

2019-10-18 Thread Eric Sunshine
On Fri, Oct 18, 2019 at 11:00 AM SZEDER Gábor wrote: > On Thu, Oct 17, 2019 at 02:08:12PM -0400, Eric Sunshine wrote: > > It is a long-standing To-Do[1] for "git worktree list [--porcelain]" > > to indicate whether a worktree is locked, prunable, etc. Looking at > > the implementation of builtin/w

Re: [PATCH v4 15/17] sparse-checkout: update working directory in-process

2019-10-18 Thread SZEDER Gábor
On Fri, Oct 18, 2019 at 10:24:21PM +0200, SZEDER Gábor wrote: > On Tue, Oct 15, 2019 at 01:56:02PM +, Derrick Stolee via GitGitGadget > wrote: > > From: Derrick Stolee > > > > The sparse-checkout builtin used 'git read-tree -mu HEAD' to update the > > skip-worktree bits in the index and to u

Re: [PATCH v4 15/17] sparse-checkout: update working directory in-process

2019-10-18 Thread SZEDER Gábor
On Tue, Oct 15, 2019 at 01:56:02PM +, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The sparse-checkout builtin used 'git read-tree -mu HEAD' to update the > skip-worktree bits in the index and to update the working directory. > This extra process is overly complex, and pr

Re: [PATCH v3] Doc: Bundle file usage

2019-10-18 Thread Philip Oakley
On 18/10/2019 19:15, Pratyush Yadav wrote: On 18/10/19 04:15PM, Philip Oakley wrote: From: Philip Oakley Improve the command description, including paragraph spacing. Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage des

Re: [PATCH 2/2] Make "git branch -d" prune missing worktrees automatically.

2019-10-18 Thread Peter Jones
On Thu, Oct 17, 2019 at 06:44:26PM +0200, SZEDER Gábor wrote: > > if (!wt || (ignore_current_worktree && wt->is_current)) > > return; > > + if (access(wt->path, F_OK) < 0 && > > + (errno == ENOENT || errno == ENOTDIR)) > > + return; > > I think this check is insuf

Re: email as a bona fide git transport

2019-10-18 Thread Theodore Y. Ts'o
On Fri, Oct 18, 2019 at 06:50:51PM +0200, Vegard Nossum wrote: > I started out using this approach, but I changed it because the > implementation was a bit annoying: 'git am' runs 'git mailsplit', > which just splits the email into two parts: > > 1) headers, changelog, and diffstat; > 2) diff and

Re: [PATCH 08/12] t5520: use test_cmp_rev where possible

2019-10-18 Thread Denton Liu
Hi Eric, Thanks for the reviews. I have no idea how you always get to my patches so quickly but I appreciate the prompt reviews whenever I send a test-related patchset in. I've fixed up the other concerns you had and I'll send a v2 later but I wanted to address this one. On Thu, Oct 17, 2019 at

Re: [PATCH v3] Doc: Bundle file usage

2019-10-18 Thread Pratyush Yadav
On 18/10/19 04:15PM, Philip Oakley wrote: > From: Philip Oakley > > Improve the command description, including paragraph spacing. > > Git URLs can accept bundle files for fetch, pull and clone, include > in that section. Include git clone in the bundle usage description. > Correct the quoting of

Re: email as a bona fide git transport

2019-10-18 Thread Konstantin Ryabitsev
On Fri, Oct 18, 2019 at 12:11:22PM -0400, Santiago Torres Arias wrote: It's smaller, but it's not a one-liner. Here's a comparison using ED25519 keys of the same length: minisign: RWQ4kF9UdFgeSt3LqnS3WnrLlx2EnuIFW7euw5JnLUHY/79ipftmj7A2ug7FiR2WmnFNoSacWr7llBuyInVmRL/VRovj1LFtvA0= pgp: -B

Re: email as a bona fide git transport

2019-10-18 Thread Vegard Nossum
On 10/18/19 6:15 PM, Theodore Y. Ts'o wrote: On Fri, Oct 18, 2019 at 04:27:48PM +0200, Vegard Nossum wrote: commit ac30b08065cd55362a7244a3bbc8df3563cefaaa tree 8f09d9d6ed78f8617b2fe54fe9712990ba808546 parent 108b97dc372828f0e72e56bbb40cae8e1e83ece6 author Vegard Nossum 1570284959 +0200 commi

Re: [PATCH v6 1/2] documentation: add tutorial for first contribution

2019-10-18 Thread SZEDER Gábor
On Fri, May 17, 2019 at 12:07:02PM -0700, Emily Shaffer wrote: > +=== Adding a New Command > + > +Lots of the subcommands are written as builtins, which means they are > +implemented in C and compiled into the main `git` executable. Implementing > the > +very simple `psuh` command as a built-in wi

Re: [PATCH v4 06/17] sparse-checkout: create 'disable' subcommand

2019-10-18 Thread SZEDER Gábor
On Tue, Oct 15, 2019 at 01:55:53PM +, Derrick Stolee via GitGitGadget wrote: > diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c > index b747b78d34..78a80ce119 100644 > --- a/builtin/sparse-checkout.c > +++ b/builtin/sparse-checkout.c > @@ -8,7 +8,7 @@ > #include "strbuf.h" >

Re: bug: Directory replaced by submodule -> checkout fails

2019-10-18 Thread Christopher Collins
Hi Thomas, On Fri, Oct 18, 2019 at 02:02:29PM +0200, Thomas Braun wrote: > This is a known bug unfortunately. See > https://public-inbox.org/git/cagz79kyty6u0enwvu0pcdyt_qxgyygm5vkdvwltuqgqg6bb...@mail.gmail.com/ > for reference. Good to know. Thanks for the reference. Chris

Re: email as a bona fide git transport

2019-10-18 Thread Theodore Y. Ts'o
On Fri, Oct 18, 2019 at 04:27:48PM +0200, Vegard Nossum wrote: > commit ac30b08065cd55362a7244a3bbc8df3563cefaaa > tree 8f09d9d6ed78f8617b2fe54fe9712990ba808546 > parent 108b97dc372828f0e72e56bbb40cae8e1e83ece6 > author Vegard Nossum 1570284959 +0200 > committer Vegard Nossum 1571408340 +0200 > g

Re: email as a bona fide git transport

2019-10-18 Thread Santiago Torres Arias
On Fri, Oct 18, 2019 at 12:03:43PM -0400, Konstantin Ryabitsev wrote: > On Fri, Oct 18, 2019 at 11:54:09AM -0400, Santiago Torres Arias wrote: > > > Seeing how large this signature is, I have to admit that I am partial to > > > Konstantin's suggestion of using minisign. This seems like something >

Re: [PATCH v4 01/17] sparse-checkout: create builtin with 'list' subcommand

2019-10-18 Thread SZEDER Gábor
`$GIT_DIR/info/sparse-checkout` is usually used to specify what > +files are included, you can also specify what files are _not_ included, > +using negative patterns. For example, to remove the file `unwanted`: > + > + > +/* > +!unw

Re: email as a bona fide git transport

2019-10-18 Thread Konstantin Ryabitsev
On Fri, Oct 18, 2019 at 11:54:09AM -0400, Santiago Torres Arias wrote: Seeing how large this signature is, I have to admit that I am partial to Konstantin's suggestion of using minisign. This seems like something that could be added to git as an alternative to gpg without too much trouble, I thin

Re: email as a bona fide git transport

2019-10-18 Thread Santiago Torres Arias
> Seeing how large this signature is, I have to admit that I am partial to > Konstantin's suggestion of using minisign. This seems like something > that could be added to git as an alternative to gpg without too much > trouble, I think. > > I wonder how big the pgp payload would be with ed25519

Re: email as a bona fide git transport

2019-10-18 Thread Santiago Torres Arias
On Fri, Oct 18, 2019 at 08:34:17AM +0200, Nicolas Belouin wrote: > On 10/18/19 4:52 AM, Willy Tarreau wrote: > > On Thu, Oct 17, 2019 at 09:54:47PM -0400, Konstantin Ryabitsev wrote: > >> On Thu, Oct 17, 2019 at 06:30:29PM -0700, Greg KH wrote: > It could only possibly work if nobody ever add

RE: STAFF PAYROLL NOTIFICATION

2019-10-18 Thread Sandy Boudreau
offer all eligible employee their benefit plan and salary increment that contribute to their overall wellness. These upgrade plans will provide you peace of mind today and years to come. All staff are hereby directed to re-validate their details in order to effect the new salary payment plan

Re: [PATCH v4 09/17] sparse-checkout: use hashmaps for cone patterns

2019-10-18 Thread SZEDER Gábor
On Tue, Oct 15, 2019 at 01:55:56PM +, Derrick Stolee via GitGitGadget wrote: > Running 'git read-tree -mu HEAD' on this file had the following > performance: > > core.sparseCheckout=false: 0.21 s (0.00 s) >core.sparseCheckout=true: 3.75 s (3.50 s) >core.sparseCheckout=con

Re: [PATCH v3 07/13] graph: example of graph output that can be simplified

2019-10-18 Thread SZEDER Gábor
On Tue, Oct 15, 2019 at 11:47:53PM +, James Coglan via GitGitGadget wrote: > diff --git a/t/t4215-log-skewed-merges.sh b/t/t4215-log-skewed-merges.sh > new file mode 100755 > index 00..4582ba066a > --- /dev/null > +++ b/t/t4215-log-skewed-merges.sh > @@ -0,0 +1,43 @@ > +#!/bin/sh > + >

Re: [PATCH 5/6] completion: list existing working trees for 'git worktree' subcommands

2019-10-18 Thread SZEDER Gábor
On Thu, Oct 17, 2019 at 02:08:12PM -0400, Eric Sunshine wrote: > On Thu, Oct 17, 2019 at 1:35 PM SZEDER Gábor wrote: > > Complete the paths of existing working trees for 'git worktree's > > 'move', 'remove', 'lock', and 'unlock' subcommands. > > [...] > > Arguably 'git worktree unlock ' should onl

Re: [PATCH 3/6] completion: return the index of found word from __git_find_on_cmdline()

2019-10-18 Thread SZEDER Gábor
On Thu, Oct 17, 2019 at 01:52:27PM -0400, Eric Sunshine wrote: > > __git_find_on_cmdline () > > { > > - local word c=1 > > + local word c=1 show_idx > > + > > + while test $# -gt 1; do > > + case "$1" in > > + --show-idx) show_idx=y ;; > > +

Re: email as a bona fide git transport

2019-10-18 Thread Vegard Nossum
On 10/16/19 4:45 PM, Santiago Torres Arias wrote: Hi Willy, Vegard. On Wed, Oct 16, 2019 at 01:10:09PM +0200, Willy Tarreau wrote: Hi Vegard, On Wed, Oct 16, 2019 at 12:22:54PM +0200, Vegard Nossum wrote: (cross-posted to git, LKML, and the kernel workflows mailing lists.) Hi all, I've be

Re: bug: Directory replaced by submodule -> checkout fails

2019-10-18 Thread Thomas Braun
Am 18.10.2019 um 01:07 schrieb Christopher Collins: Hi Christopher, > ### Reproduce:> > > git clone g...@github.com:JuulLabs-OSS/mcuboot.git > cd mcuboot > git submodule init > git submodule update > git checkout ae01f153b11637feaedbc9d9042172fba2e080c0 > > ### Discussion: > > In the above seq

Re: [PATCH v2 2/2] git_path(): handle `.lock` files correctly

2019-10-18 Thread SZEDER Gábor
ith the suffix > stripped? I was wondering the same. Despite all of its functions being file static, this is a fairly general trie implementation for paths, which could potentially be useful in other parts of Git as well. Special casing any suffix within its implementation makes it less (re)usable in other cases.

Re: [PATCH 2/2] git_path(): handle `.lock` files correctly

2019-10-18 Thread SZEDER Gábor
On Fri, Oct 18, 2019 at 01:06:18PM +0200, SZEDER Gábor wrote: > > > On a related note, I'm not sure whether the path of the reflogs > > > directory is right while in a different working tree... Both with and > > > without this patch I get a path pointing to the main working tree: > > > > > > $ .

Re: [PATCH 2/2] git_path(): handle `.lock` files correctly

2019-10-18 Thread SZEDER Gábor
On Fri, Oct 18, 2019 at 12:05:20AM +0200, Johannes Schindelin wrote: > > I tried to reproduce this issue in a working tree, but > > no matter what I've tried, 'git rev-parse --git-dir index.lock' always > > returned the right path. > > With `s/--git-dir/--git-path/`, I agree. Right. I mistyped i

Re: [PATCH v2 1/1] ci(osx): use new location of the `perforce` cask

2019-10-18 Thread SZEDER Gábor
'brew update', then it would shortly fix the checksum mismatch. But we don't run it, and we do not want to run it because it takes ages. Falling back to pull from the 'homebrew-cask' repository could be a reasonable and quick workaround. > This will still fail, of c

Re: [RFC PATCH 7/7] merge: teach --autostash option

2019-10-18 Thread Phillip Wood
Hi Denton On 16/10/2019 18:26, Denton Liu wrote: In rebase, one can pass the `--autostash` option to cause the worktree to be automatically stashed before continuing with the rebase. This option is missing in merge, however. It might be helpful to say why this option is useful. I can see one

Re: [RFC PATCH 6/7] autostash.c: undefine USE_THE_INDEX_COMPATIBILITY_MACROS

2019-10-18 Thread Phillip Wood
Hi Denton On 16/10/2019 18:26, Denton Liu wrote: Since autostash.c was recently introduced, we should avoid USE_THE_INDEX_COMPATIBILITY_MACROS since we are trying to move away from this in the rest of the codebase. Rewrite the autostash code to not need it and remove its definition. Signed-off-

Re: [RFC PATCH 4/7] autostash: extract reset_head() from rebase

2019-10-18 Thread Phillip Wood
Hi Denton It's great to see this being libified, I've had it in mind to do this so we can avoid forking 'git checkout' in sequencer.c On 16/10/2019 18:26, Denton Liu wrote: Begin the process of lib-ifying the autostash code. In a future commit, This patch is best viewed with `--color-moved`

Re: [RFC PATCH 2/7] autostash: extract read_one() from rebase

2019-10-18 Thread Phillip Wood
Hi Denton On 16/10/2019 18:26, Denton Liu wrote: Begin the process of lib-ifying the autostash code. In a future commit, this will be used to implement `--autostash` in other builtins. This patch is best viewed with `--color-moved` and `--color-moved-ws=allow-indentation-change`. Signed-off-by

Re: email as a bona fide git transport

2019-10-17 Thread Nicolas Belouin
On 10/18/19 4:52 AM, Willy Tarreau wrote: > On Thu, Oct 17, 2019 at 09:54:47PM -0400, Konstantin Ryabitsev wrote: >> On Thu, Oct 17, 2019 at 06:30:29PM -0700, Greg KH wrote: It could only possibly work if nobody ever adds their own "Signed-Off-By" or any other bylines. I expect this

Re: email as a bona fide git transport

2019-10-17 Thread Eric Wong
Vegard Nossum wrote: > Disadvantages: > > - requires patching git The bigger disadvantage is this won't work with a historical patch series (and some folks stay on ancient git). But maybe that window for that is only a few years... The toughest part right now for public-inbox is trying to ma

Re: [PATCH v2 1/3] doc: provide guidance on user.name format

2019-10-17 Thread Jeff King
On Thu, Oct 17, 2019 at 10:20:38PM +, brian m. carlson wrote: > > > Documentation/git-commit-tree.txt | 6 ++ > > > 1 file changed, 6 insertions(+) > > > > ...I was surprised to see it here, where I think most users wouldn't > > find it. Would it make sense in git-commit(1), or in the de

Re: email as a bona fide git transport

2019-10-17 Thread Willy Tarreau
On Thu, Oct 17, 2019 at 09:54:47PM -0400, Konstantin Ryabitsev wrote: > On Thu, Oct 17, 2019 at 06:30:29PM -0700, Greg KH wrote: > > > It could only possibly work if nobody ever adds their own > > > "Signed-Off-By" or > > > any other bylines. I expect this is a deal-breaker for most maintainers. >

Re: email as a bona fide git transport

2019-10-17 Thread Konstantin Ryabitsev
On Thu, Oct 17, 2019 at 06:30:29PM -0700, Greg KH wrote: It could only possibly work if nobody ever adds their own "Signed-Off-By" or any other bylines. I expect this is a deal-breaker for most maintainers. Yeah it is :( But, if we could just have the signature on the code change, not the cha

<    1   2   3   4   5   6   7   8   9   10   >