Re: [PATCH v3] worktree: add: fix 'post-checkout' not knowing new worktree location

On Fri, Feb 16, 2018 at 11:55 AM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 16 Feb 2018, at 00:09, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> The hook is run manually, rather than via run_hook_le(), since it needs >> to change the working dir

Re: [PATCH] merge: allow fast-forward when merging a tracked tag

On Thu, Feb 15, 2018 at 5:45 PM, Junio C Hamano wrote: > [...] > Update the default (again) for "git merge" that merges a tag object > to (1) --no-ff (i.e. create a merge commit even when side branch > fast forwards) if the tag being merged is not at its expected place > in

[PATCH v3] worktree: add: fix 'post-checkout' not knowing new worktree location

es not provide such functionality. As this is a one-off case, adding 'run_hook' overloads which allow the directory to be set does not seem warranted at this time. Reported-by: Lars Schneider <larsxschnei...@gmail.com> Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- This is a

Re: [PATCH v2] worktree: add: fix 'post-checkout' not knowing new worktree location

On Thu, Feb 15, 2018 at 4:27 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Thu, Feb 15, 2018 at 12:52:11PM -0800, Junio C Hamano wrote: >> This seems to segfault on me, without leaving hook.actual anywhere. > > I'm unable to reproduce the segfault, but I'm guessi

Re: [PATCH v2] worktree: add: fix 'post-checkout' not knowing new worktree location

On Thu, Feb 15, 2018 at 12:52:11PM -0800, Junio C Hamano wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: > > test_expect_success '"add" invokes post-checkout hook (branch)' ' > > post_checkout_hook && > > - printf "%

[PATCH v2] worktree: add: fix 'post-checkout' not knowing new worktree location

es not provide such functionality. As this is a one-off case, adding 'run_hook' overloads which allow the directory to be set does not seem warranted at this time. Reported-by: Lars Schneider <larsxschnei...@gmail.com> Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- This is a

Re: [PATCH] color.h: document and modernize header

On Mon, Feb 12, 2018 at 10:55 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Feb 12, 2018 at 8:41 PM, Stefan Beller <sbel...@google.com> wrote: >> + * Output the formatted string in the specified color (and then reset to >> normal >> + * color

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

On Tue, Feb 13, 2018 at 2:27 AM, Johannes Sixt <j...@kdbg.org> wrote: > Am 12.02.2018 um 04:15 schrieb Eric Sunshine: >> + echo $_z40 $(git rev-parse HEAD) 1 && >> + echo $(pwd)/gumby > > $(pwd) is here and in the other tests correc

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

On Mon, Feb 12, 2018 at 11:42 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > So, either approach works: removing GIT_DIR or using "worktree add"'s > existing GIT_DIR and GIT_WORK_TREE. I favor the latter since it is > consistent with how "worktree add&

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

On Mon, Feb 12, 2018 at 3:01 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 12 Feb 2018, at 04:15, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> Fix this by changing to the new worktree's directory before running >> the hook, and adjust the tests to

Re: [PATCH] color.h: document and modernize header

On Mon, Feb 12, 2018 at 8:41 PM, Stefan Beller wrote: > Add documentation explaining the functions in color.h. > While at it, migrate the function `color_set` into grep.c, > where the only callers are. > > Signed-off-by: Stefan Beller > --- > diff --git

Re: [PATCH] color.h: document and modernize header

On Mon, Feb 12, 2018 at 3:19 PM, Stefan Beller wrote: > Add documentation explaining the functions in color.h. > While at it, mark them extern and migrate the function `color_set` > into grep.c, where the only callers are. This re-roll no longer marks functions as 'extern',

Re: [PATCH 1/2] run-command: teach 'run_hook' about alternate worktrees

On Mon, Feb 12, 2018 at 3:58 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: >> On 12 Feb 2018, at 04:15, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> +int run_hook_ve(const char *const *env, const char *name, va_list args) >> +{ >> + return

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

On Mon, Feb 12, 2018 at 2:37 PM, Junio C Hamano <gits...@pobox.com> wrote: > Eric Sunshine <sunsh...@sunshineco.com> writes: >> Fix this by changing to the new worktree's directory before running >> the hook, and adjust the tests to verify that the hook is indee

Re: [PATCH v3 04/12] sequencer: introduce new commands to reset the revision

On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin wrote: > [...] > This commit implements the commands to label, and to reset to, given > revisions. The syntax is: > > label > reset > [...] > Signed-off-by: Johannes Schindelin

Re: [PATCH v3 05/12] sequencer: introduce the `merge` command

On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin wrote: > This patch is part of the effort to reimplement `--preserve-merges` with > a substantially improved design, a design that has been developed in the > Git for Windows project to maintain the dozens of

Re: [PATCH v1] worktree: set worktree environment in post-checkout hook

On Fri, Feb 9, 2018 at 8:01 PM, wrote: > In ade546be47 (worktree: invoke post-checkout hook (unless > --no-checkout), 2017-12-07) we taught Git to run the post-checkout hook > in worktrees. Unfortunately, the environment of the hook was not made > aware of the

[PATCH 0/2] worktree: change to new worktree dir before running hook(s)

. Rather than messing with GIT_WORK_TREE, this replacement patch series fixes the problem by ensuring that the directory is changed before the hook is invoked. [1]: https://public-inbox.org/git/20180210010132.33629-1-lars.schnei...@autodesk.com/ Eric Sunshine (2): run-command: teach 'run_hook' about alternate

[PATCH 1/2] run-command: teach 'run_hook' about alternate worktrees

run within the newly-created worktree, not within the worktree from which "git worktree add" was invoked. To support this case, add 'run-hook' overloads which allow the worktree directory to be specified. Signed-off-by: Eric Sunshine <sunsh...@sunshineco.com> --- run-command.c | 23 ++

[PATCH 2/2] worktree: add: change to new worktree directory before running hook

he correct directory. While at it, also add a test to verify that the hook is run within the correct directory even when the new worktree is created from a sibling worktree (as opposed to the main worktree). Reported-by: Lars Schneider <larsxschnei...@gmail.com> Signed-off-by: Eric Sunshin

Re: [PATCH v3 42/42] git-completion.bash: add GIT_COMPLETION_OPTIONS=all config

On Fri, Feb 9, 2018 at 6:02 AM, Nguyễn Thái Ngọc Duy wrote: > By default, some option names (mostly --force, scripting related or for > internal use) are not completable for various reasons. When > GIT_COMPLETION_OPTIONS is set to all, all options (except hidden ones) > are

Re: [PATCH v2 11/17] fetch tests: fetch as well as fetch []

On Fri, Feb 9, 2018 at 3:27 PM, Jeff King wrote: > On Fri, Feb 09, 2018 at 09:05:00PM +0100, Ævar Arnfjörð Bjarmason wrote: >> >> + key=$(echo $1 | sed -e 's/^remote\.origin/fetch/') >> > >> > Faster (thus more Windows-friendly) assuming that $1 always starts >> >

Re: [PATCH v2 17/17] fetch: make the --fetch-prune work with

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > fetch: make the --fetch-prune work with Do you mean s/--fetch-prune/--prune-tags/ ? > Make the new --prune-tags option work properly when git-fetch is > invoked with a parameter instead of a > parameter. > >

Re: [PATCH v2 16/17] fetch: add a --fetch-prune option and fetch.pruneTags config

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > Add a --fetch-prune option to git-fetch, along with fetch.pruneTags > config option. [...] > > Signed-off-by: Ævar Arnfjörð Bjarmason > --- > diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh >

Re: [PATCH v2 13/17] git remote doc: correct dangerous lies about what prune does

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > The "git remote prune " command uses the same machinery as "git > fetch --prune", and shares all the same caveats, but its > documentation has suggested that it'll just "delete stale > remote-tracking branches

Re: [PATCH v2 12/17] git fetch doc: add a new section to explain the ins & outs of pruning

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > Add a new section to canonically explain how remote reference pruning > works, and how users should be careful about using it in conjunction > with tag refspecs in particular. > [...] > Signed-off-by: Ævar

Re: [PATCH v2 11/17] fetch tests: fetch as well as fetch []

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > When a remote URL is supplied on the command-line the internals of the > fetch are different, in particular the code in get_ref_map(). An > earlier version of the subsequent fetch.pruneTags patch hid a segfault >

Re: [PATCH v2 02/17] fetch: trivially refactor assignment to ref_nr

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > Trivially refactor an assignment to make a subsequent patch > smaller. The "ref_nr" variable is initialized to 0 earlier, just as > "j" is, and "j" is only incremented in that loop, so this change isn't > a logic

Re: [PATCH v2 01/17] fetch: don't redundantly NULL something calloc() gave us

On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason wrote: > Stop redundantly NULL-ing the last element of the refs structure, > which was retrieved via calloc(), and is thus guaranteed to be > pre-NULL'd. > [...] > Signed-off-by: Ævar Arnfjörð Bjarmason

Re: [PATCH 3/3] t1404: use 'test_must_fail stderr='

On Thu, Feb 8, 2018 at 9:42 PM, SZEDER Gábor wrote: > Instead of 'test_must_fail git cmd... 2>output.err', which redirects > the standard error of the 'test_must_fail' helper function as well, > causing various issues as discussed in the previous patch. ECANTPARSE: This

Re: [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file

On Thu, Feb 8, 2018 at 9:42 PM, SZEDER Gábor wrote: > To check that a git command fails and to inspect its error message we > usually execute a command like this throughout our test suite: > > test_must_fail git command --option 2>output.err > > Note that this command

Re: [PATCH] CodingGuidelines: mention "static" and "extern"

On Thu, Feb 8, 2018 at 4:38 PM, Jeff King wrote: > Subject: [PATCH] CodingGuidelines: mention "static" and "extern" > [...] > > Signed-off-by: Jeff King > --- > diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines > @@ -386,6 +386,11 @@ For C

Re: [PATCH] color.h: document and modernize header

On Thu, Feb 8, 2018 at 3:43 PM, Jeff King wrote: > On Thu, Feb 08, 2018 at 12:15:46PM -0800, Stefan Beller wrote: >> +/* >> + * Resolve the constants as returned by git_config_colorbool() >> + * (specifically "auto") to a boolean answer. >> + */ >> +extern int want_color(int var);

Re: [PATCH] send-email: error out when relogin delay is missing

On Thu, Feb 8, 2018 at 1:21 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Feb 8, 2018 at 12:08 AM, Eric Sunshine <sunsh...@sunshineco.com> > wrote: >> On Wed, Feb 7, 2018 at 6:43 PM, Stefan Beller <sbel...@google.com> wrote: >>> +die __("W

Re: [PATCH] send-email: error out when relogin delay is missing

On Wed, Feb 7, 2018 at 6:43 PM, Stefan Beller wrote: > [...] > Error out for now instead of potentially confusing the user. > As 5453b83bdf (send-email: --batch-size to work around some SMTP > server limit, 2017-05-21) lays out, we rather want to not have this > interface

Re: [PATCH] send-email: have default batch size when relogin delay is given

On Wed, Feb 7, 2018 at 2:45 PM, Stefan Beller wrote: > When the batch size is neither configured nor given on the command > line, but the relogin delay is given, then the user is not using the > the feature as intended. But as the user gave a relogin delay, there is > clearly

Re: BUG: On some Linux systems, "Stage To Commit" hotkey in git-gui stages one file only, even if multiple files are selected

On Wed, Feb 7, 2018 at 8:29 AM, Birger Skogeng Pedersen wrote: > Steps to reproduce (on Ubuntu 17.10): > - Open git-gui in a repository with two or more unstaged, changed files > - Select two or more files in the "Unstaged Changes" > - Click CTRL+T to stage the files that you

Re: [PATCHv3] tag: add --edit option

On Tue, Feb 6, 2018 at 3:36 AM, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > ---

Re: [RFC PATCH 000/194] Moving global state into the repository object

On Tue, Feb 6, 2018 at 3:25 PM, Stefan Beller wrote: >> Any suggestions welcome! > > Eric repeatedly points out leaking memory. > > As of today we do not care about memory leaking as it is cleaned > up at the end of the program anyway, for example the objects > hash table is

Re: [PATCH v3 0/2] diff: add --stat-with-summary (was --compact-summary)

On Tue, Feb 6, 2018 at 5:20 AM, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 1:56 AM, Junio C Hamano wrote: >> Duy Nguyen writes: >> I actually think compact-summary was a good way to phrase it. >> >> Personally, I think it was a UI mistake

Re: [PATCH v2 1/3] worktree: improve message when creating a new worktree

On Sun, Feb 4, 2018 at 9:12 PM, Duy Nguyen wrote: > As a former translator, I'm not thrilled to see a sentence broken into > two pieces like this. I'm not a Japanese translator, but I think this > sentence is translated differently when the translator sees the whole > line

Re: [PATCH 1/1] Mark messages for translations

On Tue, Feb 6, 2018 at 1:15 AM, Alexander Shopov wrote: > Small changes in messages to fit the style and typography of rest > Reuse already translated messages if possible > Do not translate messages aimed at developers of git > Fix unit tests depending on the original string

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

On Mon, Feb 5, 2018 at 4:56 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Feb 01, 2018 at 02:16:46PM -0500, Eric Sunshine wrote: >> On Thu, Feb 1, 2018 at 5:21 AM, Duy Nguyen <pclo...@gmail.com> wrote: >> > On Thu, Feb 1, 2018 at 4:54 PM, Eric Sunshine <sun

Re: [PATCH 042/194] object-store: move alternates API to new alternates.h

On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: > This should make these functions easier to find and object-store.h > less overwhelming to read. I think you mean: s/object-store.h/cache.h/ > Signed-off-by: Stefan Beller > Signed-off-by: Jonathan

Re: [RFH/PATCH] blame: tighten command line parser

On Mon, Feb 5, 2018 at 6:37 PM, Junio C Hamano wrote: > The command line parser of "git blame" is prepared to take an > ancient odd argument order "blame " in addition to the > usual "blame [] ". It has at least two negative > ramifications: > > - In order to tell these two

Re: [PATCH 050/194] replace-object: check_replace_refs is safe in multi repo environment

On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: > In ecef23 (inline lookup_replace_object() calls, 2011-05-15) a shortcut > for checking the object replacement was added by setting check_replace_refs > to 0 once the replacements were evaluated to not exist. This works

Re: [PATCH 059/194] refs: store the main ref store inside the repository struct

On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: > diff --git a/refs.c b/refs.c > @@ -1609,9 +1609,6 @@ static struct ref_store_hash_entry > *alloc_ref_store_hash_entry( > -/* A pointer to the ref_store for the main repository: */ > -static struct ref_store

Re: [PATCH 075/194] fetch, push: do not use submodule as alternate in has_commits check

On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: > Both fetch and push still use alternates to access submodules in some > other code paths, but this is progress towards eliminating the alternates > hack that conflates access to the_repository and other repositories. > >

Re: [PATCH 092/194] object: move grafts to object parser

On Mon, Feb 5, 2018 at 6:55 PM, Stefan Beller wrote: > Grafts are only meaningful in the context of a single repository. > Therefore they cannot be global. > > Signed-off-by: Stefan Beller > Signed-off-by: Jonathan Nieder > --- > diff

Re: [PATCH 136/194] alloc: allow arbitrary repositories for alloc functions

On Mon, Feb 5, 2018 at 7:16 PM, Stefan Beller wrote: > We have to convert them all at once, because alloc_report uses funky a s/funky a/a funky/ > macro for reporting. It is better for the sake of mechanical conversion > to convert multiple functions at once rather than

Re: [PATCH v4] daemon: add --log-destination=(stderr|syslog|none)

On Sun, Feb 4, 2018 at 1:55 PM, Ævar Arnfjörð Bjarmason wrote: > On Sun, Feb 04 2018, Lucas Werkmeister jotted: >>[--inetd | >> [--listen=] [--port=] >> [--user= [--group=]]] >> + [--log-destination=(stderr|syslog|none)] > > I

Re: [PATCH v4] daemon: add --log-destination=(stderr|syslog|none)

On Sun, Feb 4, 2018 at 1:30 PM, Lucas Werkmeister wrote: > This new option can be used to override the implicit --syslog of > --inetd, or to disable all logging. (While --detach also implies > --syslog, --log-destination=stderr with --detach is useless since > --detach

Re: [GSoC][PATCH] commit: add a commit.signOff config variable

On Sun, Feb 04, 2018 at 10:03:18AM +0800, Chen Jingpiao wrote: > Add the commit.signOff configuration variable to use the -s or --signoff > option of git commit by default. > > Signed-off-by: Chen Jingpiao > --- > > Though we can configure signoff using format.signOff

Re: contrib/completion/git-completion.bash: declare -g is not portable

On Sun, Feb 4, 2018 at 4:45 AM, Duy Nguyen wrote: > On Sun, Feb 4, 2018 at 12:20 AM, Torsten Bögershausen wrote: >> After running t9902-completion.sh on Mac OS I got a failure >> in this style: > > Sorry I was new with this bash thingy. Jeff already answered

Re: [PATCH v3] daemon: add --log-destination=(stderr|syslog|none)

On Sat, Feb 3, 2018 at 6:08 PM, Lucas Werkmeister wrote: > This new option can be used to override the implicit --syslog of > --inetd, or to disable all logging. (While --detach also implies > --syslog, --log-destination=stderr with --detach is useless since > --detach

Re: [PATCH v7 19/31] merge-recursive: add get_directory_renames()

On Sat, Feb 3, 2018 at 11:42 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > [2]: https://en.wikipedia.org/wiki/Diaeresis_(diacritic) Correction: [2]: https://en.wikipedia.org/wiki/Precomposed_character

Re: [PATCH v7 19/31] merge-recursive: add get_directory_renames()

On Sat, Feb 3, 2018 at 9:04 PM, Elijah Newren wrote: > On Sat, Feb 3, 2018 at 2:32 PM, Elijah Newren wrote: >> On Fri, Feb 2, 2018 at 5:02 PM, Stefan Beller wrote: >>> On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren

Re: [PATCHv2] tag: add --edit option

On Fri, Feb 2, 2018 at 11:48 AM, Nicolas Morey-Chaisemartin wrote: > What message do you suggest ? As I said in a previous mail, a > simple "Editor failure, cancelling {commit, tag}" should be enough > as launch_editor already outputs error messages describing what >

Re: [PATCH 7/7] worktree remove: allow it when $GIT_WORK_TREE is already gone

On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote: > [...] > - $GIT_WORK_TREE _can_ be missing if the worktree is locked. In that > case we must not delete $GIT_DIR because the real $GIT_WORK_TREE may > be in a usb stick somewhere. This is already handled because

Re: [PATCH 6/7] worktree remove: new command

On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote: > This command allows to delete a worktree. Like 'move' you cannot > remove the main worktree, or one with submodules inside [1]. > [...] > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git

Re: [PATCH 3/7] worktree move: new command

On Fri, Feb 2, 2018 at 4:15 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy <pclo...@gmail.com> > wrote: >> +static int move_worktree(int ac, const char **av, const char *prefix) >> +{ >> + [...]

Re: [PATCH 5/7] worktree move: refuse to move worktrees with submodules

On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote: > Submodules contains .git files with relative paths. After a worktree > move, these files need to be updated or they may point to nowhere. > > This is a bandage patch to make sure "worktree move" don't break >

Re: [PATCHv2] tag: add --edit option

On Fri, Feb 2, 2018 at 2:15 AM, Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> wrote: > Le 02/02/2018 à 02:29, Eric Sunshine a écrit : >> On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin >> <nmoreychaisemar...@suse.com> wrote: >>&g

Re: [PATCH v2 1/3] am: add --show-current-patch

On Fri, Feb 2, 2018 at 4:25 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Wed, Jan 31, 2018 at 02:59:32PM -0800, Junio C Hamano wrote: >> Eric Sunshine <sunsh...@sunshineco.com> writes: >> > On Wed, Jan 31, 2018 at 4:30 AM, Nguyễn Thái Ngọc Duy <pclo...@gmail.co

Re: [PATCH 4/7] worktree move: accept destination as directory

On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote: > Similar to "mv a b/", which is actually "mv a b/a", we extract basename > of source worktree and create a directory of the same name at > destination if dst path is a directory. > > Signed-off-by: Nguyễn Thái Ngọc

Re: [PATCH 3/7] worktree move: new command

On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote: > This command allows to relocate linked worktrees. Main worktree cannot > (yet) be moved. > [...] > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/git-worktree.txt

Re: [PATCH 2/7] worktree.c: add update_worktree_location()

On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/worktree.c b/worktree.c > @@ -326,6 +326,24 @@ int validate_worktree(const struct worktree *wt, struct > strbuf *errmsg) > +void update_worktree_location(struct worktree *wt, const char *path_) > +{ >

Re: [PATCHv2] tag: add --edit option

On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > ---

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

On Thu, Feb 1, 2018 at 5:21 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Feb 1, 2018 at 4:54 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> I don't see that as convincing argument for two classes of "no >> complete". Since git-completion.bash alre

Re: [PATCH] tag: add --edit option

On Thu, Feb 1, 2018 at 5:43 AM, Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> wrote: > Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit : >> Le 01/02/2018 à 11:16, Eric Sunshine a écrit : >>> A little below this change is where launch_editor()

Re: [PATCH] tag: add --edit option

On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin wrote: > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-Chaisemartin > ---

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

On Wed, Jan 31, 2018 at 7:05 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Feb 1, 2018 at 4:04 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: >> On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy <pclo...@gmail.com> >> wrote: >>> Dange

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy wrote: > This option is designed to be used by git-completion.bash. For many > simple cases, what we do in there is usually > > __gitcomp "lots of completion options" > > which has to be manually updated when a new

Re: [PATCH v2 13/41] completion: use __gitcomp_builtin in _git_commit

On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy wrote: > The new comletable options are: s/comletable/completable/ > --branch > --gpg-sign > --long > --no-post-rewrite > --null > --porcelain > --status > > --allow-empty is no longer completable because it's a hidden

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy wrote: > This option is designed to be used by git-completion.bash. For many > simple cases, what we do in there is usually > > __gitcomp "lots of completion options" > > which has to be manually updated when a new

Re: [PATCH v2 14/27] connect: request remote refs using v2

On Wed, Jan 31, 2018 at 10:22 AM, Derrick Stolee wrote: > On 1/25/2018 6:58 PM, Brandon Williams wrote: >> +static int process_ref_v2(const char *line, struct ref ***list) >> +{ >> + int ret = 1; >> + int i = 0; > > nit: you set 'i' here, but first use it in a for

Re: [PATCH v2 1/3] am: add --show-current-patch

On Wed, Jan 31, 2018 at 4:30 AM, Nguyễn Thái Ngọc Duy wrote: > Pointing the user to $GIT_DIR/rebase-apply may encourage them to mess > around in there, which is not a good thing. With this, the user does > not have to keep the path around somewhere (because after a couple of >

Re: Creating sparse checkout in a new linked git worktree

On Tue, Jan 30, 2018 at 9:25 AM, Jessie Hernandez wrote: >> The sparse-checkout file is specific to each worktree, which allows you > to control "sparsity" on a worktree by worktree basis. Therefore, you > should create $GIT_DIR/worktrees//info/sparse-checkout instead >

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

On Mon, Jan 29, 2018 at 5:54 PM, Johannes Schindelin wrote: > [...] > This commit implements the commands to label, and to reset to, given > revisions. The syntax is: > > label > reset > [...] > > Signed-off-by: Johannes Schindelin

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Mon, Jan 29, 2018 at 3:50 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > On Fri, 19 Jan 2018, Eric Sunshine wrote: >> On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin >> <johannes.schinde...@gmx.de> wrote: >> > +static in

Re: [PATCH v2] daemon: add --send-log-to=(stderr|syslog|none)

On Sun, Jan 28, 2018 at 5:58 PM, Lucas Werkmeister <m...@lucaswerkmeister.de> wrote: > On 28.01.2018 07:40, Eric Sunshine wrote: >> On Sat, Jan 27, 2018 at 1:31 PM, Lucas Werkmeister >> <m...@lucaswerkmeister.de> wrote: >>> This makes it possible to use --i

Re: [PATCH 2/3] perf/aggregate: add --reponame option

On Sun, Jan 28, 2018 at 6:18 AM, Christian Couder wrote: > This makes it easier to use the aggregate script > on the command line when one wants to get the > "environment" fields set in the codespeed output. > > Previously setting GIT_REPO_NAME was needed > for this

Re: [PATCH 09/12] read-cache: abstract away uses of SHA-1

On Sun, Jan 28, 2018 at 10:57 AM, brian m. carlson wrote: > Convert various uses of direct calls to SHA-1 and 20- and 40-based > constants to use the_hash_algo instead. Don't yet convert the on-disk > data structures, which will be handled in a future commit. > >

Re: Creating sparse checkout in a new linked git worktree

On Wed, Jan 24, 2018 at 11:11 AM, Jessie Hernandez wrote: > I am trying to get a sparse checkout in a linked worktree but cannot get > it working. I have tried the following > > * git worktree add /some/new/path/new-branch --no-checkout > * git config core.sparseCheckout

Re: [PATCH v2] daemon: add --send-log-to=(stderr|syslog|none)

On Sat, Jan 27, 2018 at 1:31 PM, Lucas Werkmeister wrote: > This makes it possible to use --inetd while still logging to standard > error. --syslog is retained as an alias for --send-log-to=syslog. A mode > to disable logging explicitly is also provided. > > The

Re: [PATCH 09/10] t: make sure that 'test_i18ngrep' got enough parameters

On Fri, Jan 26, 2018 at 7:37 AM, SZEDER Gábor wrote: > Two of the previous patches in this series fixed two bogus > 'test_i18ngrep' invocations that had neither a filename parameter not s/not/nor/ > anything piped into their standard input, yet both managed to remain >

Re: [PATCH 2/2] rebase: add --show-patch

On Fri, Jan 26, 2018 at 4:55 AM, Nguyễn Thái Ngọc Duy wrote: > It is useful to see the full patch while resolving conflicts in a > rebase. The only way to do it now is > > less .git/rebase-*/patch > > which could turn out to be a lot longer to type [1] if you are in a >

Re: [PATCH 6/6] daemon: fix length computation in newline stripping

On Wed, Jan 24, 2018 at 7:58 PM, Jeff King wrote: > When git-daemon gets a pktline request, we strip off any > trailing newline, replacing it with a NUL. Clients prior to > 5ad312bede (in git v1.4.0) would send: [...] > > Reported-by: Michael Haggerty >

Re: [PATCH v3 2/3] t7505: Add tests for cherry-pick and rebase -i/-p

rry-pick -x/-s (i.e. cases where there is a new message or the > current message in modified by the command), 'squash' when squashing > with a new message and 'commit HEAD/CHERRY_PICK_HEAD' > otherwise (picking and squashing without a new message). > > Signed-off-by: Phillip

Re: [PATCH] Fixes compile warning with -Wimplicit-fallthrough CFLAGS

On Mon, Jan 22, 2018 at 6:51 PM, Elia Pinto wrote: > This patch add explicit fallthrough compiler attribute > when needed on switch case statement eliminating > the compile warning [-Werror=implicit-fallthrough=]. > It does this by means of a macro that takes into account

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Mon, Jan 22, 2018 at 1:27 PM, SZEDER Gábor wrote: > Subject: [PATCH] travis-ci: include the trash directories of failed tests in > the trace log > > The trash directory of a failed test might contain valuable > information about the cause of the failure, but we have no

Re: SQUASH convert: add tracing for 'working-tree-encoding' attribute

On Mon, Jan 22, 2018 at 1:00 PM, wrote: > diff --git a/convert.c b/convert.c > @@ -1165,8 +1165,9 @@ static struct encoding *git_path_check_encoding(struct > attr_check_item *check) > - enc = xcalloc(1, sizeof(struct convert_driver)); > - enc->name =

Re: [PATCH] t: add clone test for files differing only in case

On Sun, Jan 21, 2018 at 6:50 AM, Duy Nguyen wrote: > On Sun, Jan 21, 2018 at 3:33 AM, brian m. carlson >> +test_expect_success 'clone on case-insensitive fs' ' > > We have CASE_INSENSITIVE_FS prereq. Should we use it here? I know it > does not harm running this test on

Re: [PATCH] t: add clone test for files differing only in case

On Sun, Jan 21, 2018 at 02:46:15AM -0500, Eric Sunshine wrote: > On Sun, Jan 21, 2018 at 2:33 AM, Junio C Hamano <gits...@pobox.com> wrote: > > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > >> +test_expect_success 'clone on case-insensitive

Re: [PATCH] t: add clone test for files differing only in case

On Sun, Jan 21, 2018 at 2:33 AM, Junio C Hamano wrote: > "brian m. carlson" writes: >> +test_expect_success 'clone on case-insensitive fs' ' >> + o=$(git hash-object -w --stdin > + t=$(printf "100644 X\0${o}100644 x\0${o}" | >> +

Re: [PATCH] t: add clone test for files differing only in case

would segfault. This > segfault has already been fixed (repository: pre-initialize hash algo > pointer), but it's not the first time similar problems have arisen. > Introduce a test to catch this case and ensure the behavior does not > regress. I guess you'd probably want a

Re: [PATCH] repository: pre-initialize hash algo pointer

On Sat, Jan 20, 2018 at 2:01 AM, Junio C Hamano <gits...@pobox.com> wrote: > Junio C Hamano <gits...@pobox.com> writes: >> Eric Sunshine <sunsh...@sunshineco.com> writes: >>> Now that we know (due to Duy's excellent detective work[1]) that the >>> trigg

Re: [PATCH 8/8] rebase -i: introduce --recreate-merges=no-rebase-cousins

On Thu, Jan 18, 2018 at 10:36 AM, Johannes Schindelin wrote: > This one is a bit tricky to explain, so let's try with a diagram: > [...] > Signed-off-by: Johannes Schindelin > --- > diff --git a/builtin/rebase--helper.c

Re: [PATCH v3] mru: Replace mru.[ch] with list.h implementation

On Fri, Jan 19, 2018 at 6:36 PM, Gargi Sharma wrote: > Replace the custom calls to mru.[ch] with calls to list.h. This patch is > the final step in removing the mru API completely and inlining the logic. > This patch leads to significant code reduction and the mru API hence,

Re: [PATCH 1/2] t7505: Add tests for cherry-pick and rebase -i/-p

On Fri, Jan 19, 2018 at 9:19 AM, Phillip Wood wrote: > Check that cherry-pick and rebase call the 'prepare-commit-msg' hook > correctly. [...] > > Signed-off-by: Phillip Wood > --- > diff --git a/t/t7505-prepare-commit-msg-hook.sh >

<    5   6   7   8   9   10   11   12   13   14   >