Re: [PATCH 2/2] t5556: replace test_i18ngrep with a simple grep

Ramsay Jones writes: > I must admit that I didn't think about the effect of the useless > "| sort" on the exit status! What I saw was: a process that > received no input, sorted nothing and produced no output - pretty > much the definition of useless! ;-) I am not

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 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 correct. $PWD would be wrong on > Windows.

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

Am 12.02.2018 um 04:15 schrieb Eric Sunshine: --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -454,20 +454,29 @@ post_checkout_hook () { test_when_finished "rm -f .git/hooks/post-checkout" && mkdir -p .git/hooks && write_script .git/hooks/post-checkout

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Jake, Jacob Keller writes: > On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin > wrote: >> Hi Sergey, >> >> On Mon, 12 Feb 2018, Sergey Organov wrote: >>> > Have a look at https://github.com/git/git/pull/447, especially the >>> >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Mon, 12 Feb 2018, Sergey Organov wrote: > >> Thanks for explanations, and could you please answer this one: >> >> [...] >> >> >> I also have trouble making sense of "Recreate merge commits instead of >> >>

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Mon, 12 Feb 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> > >> > On Fri, 9 Feb 2018, Sergey Organov wrote: >> > >> >> Johannes Schindelin

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 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" invokes other command already and, >

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 wrote: >> On 12 Feb 2018, at 04:15, Eric Sunshine wrote: >> Fix this by changing to the new worktree's directory before running >> the hook, and adjust the tests to verify that the hook is indeed

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin wrote: > Hi Sergey, > > On Mon, 12 Feb 2018, Sergey Organov wrote: >> > Have a look at https://github.com/git/git/pull/447, especially the >> > latest commit in there which is an early version of the deprecation I

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

[PATCH v2] docs/interpret-trailers: fix agreement error

In the description of git interpret-trailers, we describe "a group…of lines" that have certain characteristics. Ensure both options describing this group use a singular verb for parallelism. Signed-off-by: brian m. carlson ---

Re: [PATCH 2/2] t5556: replace test_i18ngrep with a simple grep

On 12/02/18 20:18, Junio C Hamano wrote: > Ramsay Jones writes: > >> Attempting to grep the output of test_i18ngrep will not work under a >> poison build, since the output is (almost) guaranteed not to have the >> string you are looking for. In this case, the

[PATCH] color.h: document and modernize header

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 --- * fixed commit message * followed Jeffs/Erics advice and rewrote want_color()s doc once again.

Re: [PATCH 00/26] Moving global state into the repository object (part 1)

On Mon, Feb 12, 2018 at 5:22 PM, Stefan Beller wrote: > I developed this series [...] on top of current master. also available at https://github.com/stefanbeller/git/tree/object-store-part1

[PATCH 04/26] object-store: move packed_git and packed_git_mru to object store

In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. Patch generated by 1. Moving the struct packed_git declaration to

[PATCH 06/26] pack: move prepare_packed_git_run_once to object store

From: Jonathan Nieder Each repository's object store can be initialized independently, so they must not share a run_once variable. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 8 +++-

[PATCH 22/26] sha1_file: allow stat_sha1_file to handle arbitrary repositories

From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index fddada5756..21ddbff846

[PATCH 23/26] sha1_file: allow open_sha1_file to handle arbitrary repositories

From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 21ddbff846..50202f0959

[PATCH 17/26] sha1_file: add repository argument to open_sha1_file

Add a repository argument to allow the open_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 16/26] sha1_file: add repository argument to stat_sha1_file

Add a repository argument to allow the stat_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 25/26] sha1_file: allow map_sha1_file to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/object-store.h b/object-store.h index b4756444bb..f164c4e5c9 100644 ---

[PATCH 18/26] sha1_file: add repository argument to map_sha1_file_1

Add a repository argument to allow the map_sha1_file_1 caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch

[PATCH 12/26] sha1_file: add repository argument to prepare_alt_odb

See previous patch for explanation. While at it, move the declaration to object-store.h, where it should be easier to find. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- builtin/fsck.c | 2 +- cache.h| 1 - object-store.h |

[PATCH 13/26] sha1_file: allow link_alt_odb_entries to handle arbitrary repositories

Actually this also allows read_info_alternates and link_alt_odb_entry to handle arbitrary repositories, but link_alt_odb_entries is the most interesting function in this set of functions, hence the commit subject. These functions span a strongly connected component in the function graph, i.e. the

[PATCH 24/26] sha1_file: allow map_sha1_file_1 to handle arbitrary repositories

From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 50202f0959..86b0ca7089

[PATCH 26/26] sha1_file: allow sha1_loose_object_info to handle arbitrary repositories

From: Jonathan Nieder Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 6237d59a59..c3f35914ce

[PATCH 11/26] sha1_file: add repository argument to link_alt_odb_entries

See previous patch for explanation. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index

[PATCH 10/26] sha1_file: add repository argument to read_info_alternates

See previous patch for explanation. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 7dc5f690e2..4fdfdd945a 100644

[PATCH 19/26] sha1_file: add repository argument to map_sha1_file

From: Jonathan Nieder Add a repository argument to allow map_sha1_file callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the

[PATCH 09/26] sha1_file: add repository argument to link_alt_odb_entry

Add a repository argument to allow the link_alt_odb_entry caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. Since the implementation does not yet work with

[PATCH 15/26] sha1_file: add repository argument to sha1_file_name

From: Jonathan Nieder Add a repository argument to allow sha1_file_name callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the

[PATCH 20/26] sha1_file: add repository argument to sha1_loose_object_info

Add a repository argument to allow the sha1_loose_object_info caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to

[PATCH 21/26] sha1_file: allow sha1_file_name to handle arbitrary repositories

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 3 +-- sha1_file.c| 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/object-store.h b/object-store.h index 0a4561f476..b4756444bb 100644 ---

[PATCH 14/26] sha1_file: allow prepare_alt_odb to handle arbitrary repositories

Signed-off-by: Stefan Beller --- object-store.h | 3 +-- sha1_file.c| 21 +++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/object-store.h b/object-store.h index d96a16edd1..add1d4e27c 100644 --- a/object-store.h +++ b/object-store.h

[PATCH 08/26] sha1_file: add raw_object_store argument to alt_odb_usable

Add a raw_object_store to alt_odb_usable to be more specific about which repository to act on. The choice of the repository is delegated to its only caller link_alt_odb_entry. Signed-off-by: Stefan Beller --- sha1_file.c | 8 +--- 1 file changed, 5 insertions(+), 3

[PATCH 00/26] Moving global state into the repository object (part 1)

This is a real take on the first part of the recent RFC[1]. Jonathan Tan suggested[2] that "sha1_loose_object_info to handle arbitrary repositories" might be a good breaking point for a first part at that RFC at patch 38. This series is smaller and contains only 26 patches as the patches in the

[PATCH 07/26] pack: move approximate object count to object store

From: Jonathan Nieder The approximate_object_count() function maintains a rough count of objects in a repository to estimate how long object name abbreviates should be. Object names are scoped to a repository and the appropriate length may differ by repository, so the object

[PATCH 05/26] object-store: close all packs upon clearing the object store

Signed-off-by: Stefan Beller --- builtin/am.c | 2 +- builtin/clone.c| 2 +- builtin/fetch.c| 2 +- builtin/merge.c| 2 +- builtin/receive-pack.c | 2 +- object.c | 6 ++ packfile.c | 4 ++-- packfile.h

[PATCH 03/26] object-store: free alt_odb_list

Free the memory and reset alt_odb_{list, tail} to NULL. Signed-off-by: Stefan Beller --- object.c | 17 + 1 file changed, 17 insertions(+) diff --git a/object.c b/object.c index 9b5b65e189..d778f09717 100644 --- a/object.c +++ b/object.c @@ -446,7 +446,24 @@

[PATCH 02/26] object-store: move alt_odb_list and alt_odb_tail to object store

In a process with multiple repositories open, alternates should be associated to a single repository and not shared globally. Move alt_odb_list and alt_odb_tail into the_repository and adjust callers to reflect this. Now that the alternative object data base is per repository, we're leaking its

[PATCH 01/26] repository: introduce raw object store field

The raw object store field will contain any objects needed for access to objects in a given repository. This patch introduces the raw object store and populates it with the `objectdir`, which used to be part of the repository struct. As the struct gains members, we'll also populate the function

Re: please change stash

Hi Karsten, > Normal git tooling creates different files file.ORIG file.LOCAL > file.REMOTE in case of conflicts. Which tools are you referring to here? Can you give a short sequence of commands that show what you mean? > However `git stash pop` manipulates your files directly resulting in >

Re: [PATCH v3 02/35] pkt-line: introduce struct packet_reader

Hi, Brandon Williams wrote: > Subject: pkt-line: introduce struct packet_reader nit: this subject line doesn't describe what the purpose/intent behind the patch is. Maybe something like pkt-line: allow peeking at a packet line without consuming it would make it clearer. > Sometimes

[PATCH] t6300-for-each-ref: fix "more than one quoting style" tests

'git for-each-ref' should error out when invoked with more than one quoting style options. The tests checking this have two issues: - They run 'git for-each-ref' upstream of a pipe, hiding its exit code, thus don't actually checking that 'git for-each-ref' exits with error code. -

Re: Question about rebasing - unexpected result, can't figure out why

On Sat, Feb 10, 2018 at 09:47:57PM +0100, Jonas Thiem wrote: > == Why did I expect that == > > Of course after the client rebase, C3.txt should be gone (since it's > gone at the original last commit of the client branch). > > But since it still exists in the server branch at the final commit, >

Re: [PATCH v3 01/35] pkt-line: introduce packet_read_with_status

Hi, Brandon Williams wrote: > The current pkt-line API encodes the status of a pkt-line read in the > length of the read content. An error is indicated with '-1', a flush > with '0' (which can be confusing since a return value of '0' can also > indicate an empty pkt-line), and a positive

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

On Mon, Feb 12, 2018 at 11:15:06PM +0100, Martin Ågren wrote: > On 12 February 2018 at 10:56, Duy Nguyen wrote: > > On Wed, Feb 7, 2018 at 3:05 AM, Martin Ågren wrote: > >> On 6 February 2018 at 03:13, Jeff King wrote: > >>> On Mon, Feb

Re: linux-next: unnecessary merge in the v4l-dvb tree

Em Mon, 12 Feb 2018 15:42:44 -0800 Junio C Hamano escreveu: > Linus Torvalds writes: > > > And some maintainers end up using multiple repositories as branches > > (the old _original_ git model). Again, you can just use "git fetch + > > git

Re: linux-next: unnecessary merge in the v4l-dvb tree

Linus Torvalds writes: > And some maintainers end up using multiple repositories as branches > (the old _original_ git model). Again, you can just use "git fetch + > git reset", of course, but that's a bit unsafe. In contrast, doing > "git pull --ff-only" is a safe

Re: [PATCH 1/3] t7006: add tests for how git config paginates

On 12 February 2018 at 23:17, Junio C Hamano wrote: > Martin Ågren writes: > >> +test_expect_success TTY 'git config respects pager.config when setting' ' >> + rm -f paginated.out && >> + test_terminal git -c pager.config config foo.bar bar &&

Re: [PATCH 1/3] t7006: add tests for how git config paginates

Martin Ågren writes: > +test_expect_success TTY 'git config respects pager.config when setting' ' > + rm -f paginated.out && > + test_terminal git -c pager.config config foo.bar bar && > + test -e paginated.out > +' I am debating myself if this test should

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

On 12 February 2018 at 10:56, Duy Nguyen wrote: > On Wed, Feb 7, 2018 at 3:05 AM, Martin Ågren wrote: >> On 6 February 2018 at 03:13, Jeff King wrote: >>> On Mon, Feb 05, 2018 at 08:28:10PM +0700, Duy Nguyen wrote: I learned

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: linux-next: unnecessary merge in the v4l-dvb tree

On Mon, Feb 12, 2018 at 1:44 PM, Junio C Hamano wrote: > > But I wonder why "update to upstream" is merging a signed tag in the > first place. Wouldn't downstream's "try to keep up with" pull be > grabbing from branch tips, not tags? I'm actually encouraging maintainers to

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

On Mon, Feb 12, 2018 at 3:58 PM, Lars Schneider wrote: >> On 12 Feb 2018, at 04:15, Eric Sunshine wrote: >> +int run_hook_ve(const char *const *env, const char *name, va_list args) >> +{ >> + return run_hook_cd_ve(NULL, env, name, args); >>

Re: [PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

René Scharfe writes: > Am 12.02.2018 um 22:04 schrieb Junio C Hamano: >> Stefan Beller writes: >> >>> I thought it may be a helpful >>> for merging this series with the rest of the evolved code base which >>> may make use of one of the converted functions. So

Re: linux-next: unnecessary merge in the v4l-dvb tree

Linus Torvalds writes: > Maybe we could just tell people to have something like > >git config --global alias.update pull --ff-only > > and use that for "try to update to upstream". I guess our mails crossed. I admit that I indeed wondered why you were not

Re: [PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

[removed rene.scha...@lsrfire.ath.cx from cc:; I lost that domain a few years ago. Thanks for the heads-up, Stefan!] Am 12.02.2018 um 20:00 schrieb Stefan Beller: > On Fri, Feb 9, 2018 at 2:09 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>>

Re: [PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

Am 12.02.2018 um 22:04 schrieb Junio C Hamano: > Stefan Beller writes: > >> I thought it may be a helpful >> for merging this series with the rest of the evolved code base which >> may make use of one of the converted functions. So instead of fixing >> that new instance

Re: linux-next: unnecessary merge in the v4l-dvb tree

On Mon, Feb 12, 2018 at 1:15 PM, Linus Torvalds wrote: > > The reasoning is to avoid losing the signature from the tag (when > merging a signed tag, the signature gets inserted into the merge > commit itself - use "git log --show-signature" to see them). I think

Re: linux-next: unnecessary merge in the v4l-dvb tree

Linus Torvalds writes: > On Mon, Feb 12, 2018 at 1:00 PM, Stephen Rothwell > wrote: > > The problem, of course, is that since git is distributed, git doesn't > know who is "upstream" and who is "downstream", so there's no > _technical_

Re: linux-next: unnecessary merge in the v4l-dvb tree

Em Mon, 12 Feb 2018 13:15:04 -0800 Linus Torvalds escreveu: > On Mon, Feb 12, 2018 at 1:00 PM, Stephen Rothwell > wrote: > > > > Linus, this happens a bit after the merge window, so I am wondering > > about the rational of not doing a fast

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

On 2/12/2018 3:37 PM, Junio C Hamano wrote: Junio C Hamano writes: Derrick Stolee writes: It is possible to have multiple commit graph files in a pack directory, but only one is important at a time. Use a 'graph_head' file to point to the important

Re: linux-next: unnecessary merge in the v4l-dvb tree

On Mon, Feb 12, 2018 at 1:00 PM, Stephen Rothwell wrote: > > Linus, this happens a bit after the merge window, so I am wondering > about the rational of not doing a fast forward merge when merging a > signed tag (I forget the reasoning). The reasoning is to avoid losing

Re: [PATCH 2/2] t5556: replace test_i18ngrep with a simple grep

Junio C Hamano writes: >> -test_i18ngrep -E '^(fatal|warning):' actual >> | sort && >> +grep -E '^(fatal|warning):' actual && >> test_i18ncmp expected actual > > OK, but not quite OK. > > Two grep invocations will not leave anything useful in 'actual' > under

Re: [PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

Stefan Beller writes: > I thought it may be a helpful > for merging this series with the rest of the evolved code base which > may make use of one of the converted functions. So instead of fixing > that new instance manually, cocinelle could do that instead. Having the

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

> On 12 Feb 2018, at 04:15, Eric Sunshine wrote: > > Git commands which run hooks do so at the top level of the worktree in > which the command itself was invoked. However, the 'git worktree' > command may need to run hooks within some other directory. For > instance,

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

Hi Eric, On Mon, 12 Feb 2018, Eric Sunshine wrote: > 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 > >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Sergey, On Mon, 12 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > > On Fri, 9 Feb 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > >> [...] > >> > >> > With this patch, the goodness of the

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

Junio C Hamano writes: > Derrick Stolee writes: > >> It is possible to have multiple commit graph files in a pack directory, >> but only one is important at a time. Use a 'graph_head' file to point >> to the important file. Teach git-commit-graph to write

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 wrote: > Eric Sunshine 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 indeed run >> within the correct

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Sergey, On Mon, 12 Feb 2018, Sergey Organov wrote: > Thanks for explanations, and could you please answer this one: > > [...] > > >> I also have trouble making sense of "Recreate merge commits instead of > >> flattening the history by replaying merges." Is it " >> commits by replaying

[PATCH] color.h: document and modernize header

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. Signed-off-by: Stefan Beller --- * removed the extern keyword * reworded the docs for want_color once again.

Re: [PATCH 2/2] t5556: replace test_i18ngrep with a simple grep

Ramsay Jones writes: > Attempting to grep the output of test_i18ngrep will not work under a > poison build, since the output is (almost) guaranteed not to have the > string you are looking for. In this case, the output of test_i18ngrep > is further filtered by a

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

Hi Eric, On Mon, 12 Feb 2018, Eric Sunshine wrote: > 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

[no subject]

Belove My name is Elizabeth M. Philips, i am going on a radical hysterectomy cervical cancer surgery today. I have WILLED £12,379,000.00 British pounds to you for the work of the lord. Contact my attorney with my reference number (NW/XXR/017/053K/PDQ/613X1/UK) for further info. Barr.Luis

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

> On 12 Feb 2018, at 04:15, Eric Sunshine wrote: > > Although "git worktree add" learned to run the 'post-checkout' hook in > ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it > neglects to change to the directory of the newly-created worktree > before

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

When the batch size is neither configured nor given on the command line, but the relogin delay is given, then the current code ignores the relogin delay setting. This is unsafe as there was some intention when setting the batch size. One workaround would be to just assume a batch size of 1 as a

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

Eric Sunshine writes: > Although "git worktree add" learned to run the 'post-checkout' hook in > ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it > neglects to change to the directory of the newly-created worktree > before running the hook. Instead, the

The Minerals, Metals & Materials Society Annual - TMS

Hi, I understand your company is exhibiting in The Minerals, Metals & Materials Society Annual on MAR/11 - MAR/15/2018. Would you be interested in the complete contact information with email addresses of Materials scientists and Engineers? Available Data Fields: Practice Name, Web

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: Fetch-hooks

On 02/10, Leo Gaspard wrote: > On 02/10/2018 01:21 PM, Jeff King wrote: > > On Sat, Feb 10, 2018 at 01:37:20AM +0100, Leo Gaspard wrote: > > > >>> Yeah, tag-following may be a little tricky, because it usually wants to > >>> write to refs/tags/. One workaround would be to have your config look >

Re: [PATCH 046/194] object-store: move replace_objects back to object-store

On Fri, Feb 9, 2018 at 3:15 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> @@ -32,7 +31,15 @@ struct object_store { >>* Objects that should be substituted by other objects >>* (see git-replace(1)). >>*/ >> - struct

Re: [PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

On Fri, Feb 9, 2018 at 2:09 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Patch generated by >> >> 2. Applying the semantic patch contrib/coccinelle/packed_git.cocci >> to adjust callers. > > About this part... > >> diff --git

Re: [PATCH v3 07/14] commit-graph: update graph-head during write

Derrick Stolee writes: > It is possible to have multiple commit graph files in a pack directory, > but only one is important at a time. Use a 'graph_head' file to point > to the important file. Teach git-commit-graph to write 'graph_head' upon > writing a new commit graph file.

Re: REQUEST NEW TRANSLATION (INDONESIAN/id_ID)

On Sun, Feb 11, 2018 at 9:53 AM, wrote: > Hello git-l10n Team cc'd Jiang Xi, who coordinates the git-l10n team. > > I want to join to this project as a translator for Indonesian language (ID) > I have read the README file located in the >

Re: [PATCH] describe: confirm that blobs actually exist

On Mon, Feb 12, 2018 at 9:23 AM, Jeff King wrote: > Prior to 644eb60bd0 (builtin/describe.c: describe a blob, > 2017-11-15), we noticed and complained about missing > objects, since they were not valid commits: > > $ git describe >

Re: What's cooking in git.git (Feb 2018, #01; Wed, 7)

* jh/status-no-ahead-behind (2018-01-24) 4 commits - status: support --no-ahead-behind in long format - status: update short status to respect --no-ahead-behind - status: add --[no-]ahead-behind to status and commit for V2 format. - stat_tracking_info: return +1 when branches not equal

Re: partial fetch

On 2/12/2018 11:24 AM, Basin Ilya wrote: Hi. In 2017 a set of patches titled "add object filtering for partial fetch" was accepted. Is it what I think it is? Will we be able to download only a subdirectory from a large project? yes, that is the goal. there are several caveats, but yes,

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

On 2/12/2018 5:20 AM, Duy Nguyen wrote: On Wed, Feb 7, 2018 at 9:13 PM, Ben Peart wrote: On 2/6/2018 7:27 AM, Duy Nguyen wrote: This is another thing that bugs me. I know you're talking about huge index files, but at what size should we start this sort of optimization?

Re: [PATCH] describe: confirm that blobs actually exist

On Mon, Feb 12, 2018 at 12:23:06PM -0500, Jeff King wrote: > We can fix this by replacing the lookup_blob() call with a > check of the true type via sha1_object_info(). This is not > quite as efficient as we could possibly make this check. We > know in most cases that the object was already

[PATCH] describe: confirm that blobs actually exist

Prior to 644eb60bd0 (builtin/describe.c: describe a blob, 2017-11-15), we noticed and complained about missing objects, since they were not valid commits: $ git describe fatal: is not a valid 'commit' object

partial fetch

Hi. In 2017 a set of patches titled "add object filtering for partial fetch" was accepted. Is it what I think it is? Will we be able to download only a subdirectory from a large project?

Re: totally confused as to what "git bisect skip" is supposed to do

On Mon, Feb 12, 2018 at 11:44 AM, Robert P. J. Day wrote: > On Fri, 9 Feb 2018, Junio C Hamano wrote: > >> "Robert P. J. Day" writes: >> >> > i'm confused ... why, after skipping a good chunk in the interval >> > [v4.13,v4.14], do i still have

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

On Mon, Feb 12, 2018 at 04:03:49PM +0100, Alexander Shopov wrote: > @Jeff: > > we may want to avoid this anti-pattern > Current state of these tests is wrong and I should rework them. > > Here is what I intend to do: > 1. Fix the commit message > 2. Check whether I can get the tests in

please change stash

Dear great team, Normal git tooling creates different files file.ORIG file.LOCAL file.REMOTE in case of conflicts. However `git stash pop` manipulates your files directly resulting in lines like: <<< Updated upstream >>> Stashed changes This can seriously corrupt files and workflows.

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

Let me repeat what you said so I know how to improve the patch: @Junio: > Perhaps end each sentence with a full-stop? I should end each sentence in the *log* message with "." (rather than the translatable strings in the patch) > Shouldn't this rather be like so instead? > if test_i18ngrep !

Re: [PATCH v3 00/35] protocol version 2

On 2/6/2018 8:12 PM, Brandon Williams wrote: Changes in v3: * There were some comments about how the protocol should be designed stateless first. I've made this change and instead of having to supply the `stateless-rpc=true` capability to force stateless behavior, the protocol

*Beachtung*

Herzlichen Glückwunsch, Sie haben am 31. Januar 2018 in den monatlichen Gewinnspielen von Euro Millions/Google Promo 650.000 gewonnen. Kontaktieren Sie unseren Schadenregulierungsbeauftragten mit den folgenden Informationen 1. Vollst?ndiger Name 2. Adresse 3. Geschlecht 4. Alter 5. Beruf 6.

Hi Dear.

Hi Dear, How are you today I hope that everything is OK with you as it is my great pleasure to contact you in having communication with you starting from today, I was just going through the Internet search when I found your email address, I want to make a very new and special friend, so I

  1   2   >