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

2018-02-12 Thread Nguyễn Thái Ngọc Duy
This command allows to delete a worktree. Like 'move' you cannot remove the main worktree, or one with submodules inside [1]. For deleting $GIT_WORK_TREE, Untracked files or any staged entries are considered precious and therefore prevent removal by default. Ignored files are not precious. When

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

2018-02-12 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 17 + worktree.h | 6 ++ 2 files changed, 23 insertions(+) diff --git a/worktree.c b/worktree.c index b238d87bf1..0373faf0dc 100644 --- a/worktree.c +++ b/worktree.c @@ -326,6 +326,23 @@ int

[PATCH v2 0/7] nd/worktree-move reboot

2018-02-12 Thread Nguyễn Thái Ngọc Duy
v2 basically fixes lots of comments from Eric (many thanks!): memory leak, typos, document updates, tests, corner case fixes. Interdiff: diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 6f83723d9a..d322acbc67 100644 --- a/Documentation/git-worktree.txt +++

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

2018-02-12 Thread Nguyễn Thái Ngọc Duy
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 Duy --- builtin/worktree.c | 11 ++- strbuf.c

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

2018-02-12 Thread Nguyễn Thái Ngọc Duy
"git worktree remove" basically consists of two things - delete $GIT_WORK_TREE - delete $GIT_DIR (which is $SUPER_GIT_DIR/worktrees/something) If $GIT_WORK_TREE is already gone for some reason, we should be able to finish the job by deleting $GIT_DIR. Two notes: - $GIT_WORK_TREE _can_ be

[PATCH v2 1/7] worktree.c: add validate_worktree()

2018-02-12 Thread Nguyễn Thái Ngọc Duy
This function is later used by "worktree move" and "worktree remove" to ensure that we have a good connection between the repository and the worktree. For example, if a worktree is moved manually, the worktree location recorded in $GIT_DIR/worktrees/.../gitdir is incorrect and we should not move

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

2018-02-12 Thread Nguyễn Thái Ngọc Duy
This command allows to relocate linked worktrees. Main worktree cannot (yet) be moved. There are two options to move the main worktree, but both have complications, so it's not implemented yet. Anyway the options are: - convert the main worktree to a linked one and move it away, leave the git

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

2018-02-12 Thread Nguyễn Thái Ngọc Duy
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 people's worktrees by accident. When .git file update code is in place, this

Re: What's cooking in git.git (Jan 2018, #04; Wed, 31)

2018-02-12 Thread Duy Nguyen
On Sun, Feb 11, 2018 at 9:44 PM, Ævar Arnfjörð Bjarmason wrote: > > On Sat, Feb 10 2018, Duy Nguyen jotted: > >> On Sat, Feb 10, 2018 at 1:37 AM, Ævar Arnfjörð Bjarmason >> wrote: >>> >>> On Thu, Feb 01 2018, Junio C. Hamano jotted: >>> *

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

2018-02-12 Thread Duy Nguyen
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? Writing down a few MBs on

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

2018-02-12 Thread Duy Nguyen
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 SANITIZE=leak today! It not only catches this but also "dst". >>> >>> Jeff is

i wait your respond

2018-02-12 Thread Mr Aziz Ousmane Ibrahim
-- Greetings, I wonder why you continue neglecting my emails. Please, acknowledge the receipt of this message in reference to the subject above as I intend to send to you the details of the project. Sometimes, try to check your spam box because most of these correspondences fall out

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

2018-02-12 Thread Robert P. J. Day
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 exactly 7300 revisions to bisect? what > > am i so hopelessly misunderstanding here? > > Are

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

2018-02-12 Thread Duy Nguyen
On Fri, Feb 2, 2018 at 6:47 PM, Eric Sunshine wrote: > 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].

Re: "git bisect run make" adequate to locate first unbuildable commit?

2018-02-12 Thread Robert P. J. Day
On Fri, 9 Feb 2018, Philip Oakley wrote: > From: "Robert P. J. Day" > > On Fri, 9 Feb 2018, Philip Oakley, CEng MIET wrote: > (apologies for using the fancy letters after the name ID...) > > > >> From: "Robert P. J. Day" > >> > > >> > writing a

Re: "git bisect run make" adequate to locate first unbuildable commit?

2018-02-12 Thread SZEDER Gábor
> > 1. there may be feature branches that bypass the known good starting > >commit, which can cause understanding issues as those side > >branches that predate the start point are also considered > >potential bu commits. > > ok, but let's make sure i understand what defines a

*Beachtung*

2018-02-12 Thread Euro Millions
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.

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

2018-02-12 Thread Alexander Shopov
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

2018-02-12 Thread Derrick Stolee
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

please change stash

2018-02-12 Thread Karsten Fluegge
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.

Hi Dear.

2018-02-12 Thread Jennifer Williams
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

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

2018-02-12 Thread Jeff King
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

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

2018-02-12 Thread Stefan Beller
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: REQUEST NEW TRANSLATION (INDONESIAN/id_ID)

2018-02-12 Thread Stefan Beller
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 003/194] object-store: move packed_git and packed_git_mru to object store

2018-02-12 Thread Stefan Beller
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: Fetch-hooks

2018-02-12 Thread Brandon Williams
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 v3 04/12] sequencer: introduce new commands to reset the revision

2018-02-12 Thread Eric Sunshine
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

The Minerals, Metals & Materials Society Annual - TMS

2018-02-12 Thread Sheryl Droege
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 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Junio C Hamano
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

[PATCH] describe: confirm that blobs actually exist

2018-02-12 Thread Jeff King
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

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

2018-02-12 Thread Junio C Hamano
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.

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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Lars Schneider
> 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

Re: partial fetch

2018-02-12 Thread Jeff Hostetler
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,

partial fetch

2018-02-12 Thread Basin Ilya
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: [PATCH] describe: confirm that blobs actually exist

2018-02-12 Thread Stefan Beller
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: [PATCH] describe: confirm that blobs actually exist

2018-02-12 Thread Jeff King
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

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

2018-02-12 Thread Ben Peart
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: totally confused as to what "git bisect skip" is supposed to do

2018-02-12 Thread Christian Couder
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: What's cooking in git.git (Feb 2018, #01; Wed, 7)

2018-02-12 Thread Jeff Hostetler
* 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: [PATCH 5/8] rebase: introduce the --recreate-merges option

2018-02-12 Thread Johannes Schindelin
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 2/2] t5556: replace test_i18ngrep with a simple grep

2018-02-12 Thread Junio C Hamano
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 v3 07/14] commit-graph: update graph-head during write

2018-02-12 Thread Derrick Stolee
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

2018-02-12 Thread Mauro Carvalho Chehab
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 003/194] object-store: move packed_git and packed_git_mru to object store

2018-02-12 Thread René Scharfe
[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

2018-02-12 Thread René Scharfe
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: [PATCH] color.h: document and modernize header

2018-02-12 Thread Eric Sunshine
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/3] t7006: add tests for how git config paginates

2018-02-12 Thread Junio C Hamano
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

2018-02-12 Thread Martin Ågren
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 1/3] t7006: add tests for how git config paginates

2018-02-12 Thread Martin Ågren
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 &&

[PATCH] color.h: document and modernize header

2018-02-12 Thread Stefan Beller
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] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Eric Sunshine
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 v3 07/14] commit-graph: update graph-head during write

2018-02-12 Thread Junio C Hamano
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 003/194] object-store: move packed_git and packed_git_mru to object store

2018-02-12 Thread 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 manually, cocinelle could do that instead. Having the

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

2018-02-12 Thread Junio C Hamano
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: [PATCH 003/194] object-store: move packed_git and packed_git_mru to object store

2018-02-12 Thread Junio C Hamano
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: [PATCH 1/2] run-command: teach 'run_hook' about alternate worktrees

2018-02-12 Thread Eric Sunshine
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 v3 05/12] sequencer: introduce the `merge` command

2018-02-12 Thread Johannes Schindelin
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

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

2018-02-12 Thread Johannes Schindelin
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

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

2018-02-12 Thread Lars Schneider
> 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: linux-next: unnecessary merge in the v4l-dvb tree

2018-02-12 Thread Junio C Hamano
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

[no subject]

2018-02-12 Thread Elizabeth M. Philips
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] t5556: replace test_i18ngrep with a simple grep

2018-02-12 Thread Junio C Hamano
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 04/12] sequencer: introduce new commands to reset the revision

2018-02-12 Thread Johannes Schindelin
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: linux-next: unnecessary merge in the v4l-dvb tree

2018-02-12 Thread Linus Torvalds
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: linux-next: unnecessary merge in the v4l-dvb tree

2018-02-12 Thread Linus Torvalds
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

2018-02-12 Thread Linus Torvalds
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 v3 05/12] sequencer: introduce the `merge` command

2018-02-12 Thread Eric Sunshine
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] color.h: document and modernize header

2018-02-12 Thread Eric Sunshine
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] color.h: document and modernize header

2018-02-12 Thread Stefan Beller
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 2/2] t5556: replace test_i18ngrep with a simple grep

2018-02-12 Thread Ramsay Jones
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 v2] docs/interpret-trailers: fix agreement error

2018-02-12 Thread brian m. carlson
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: linux-next: unnecessary merge in the v4l-dvb tree

2018-02-12 Thread Mauro Carvalho Chehab
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: [PATCH 3/7] worktree move: new command

2018-02-12 Thread Duy Nguyen
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: [PATCH v3 01/35] pkt-line: introduce packet_read_with_status

2018-02-12 Thread Jonathan Nieder
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

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

2018-02-12 Thread SZEDER Gábor
'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

2018-02-12 Thread brian m. carlson
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 02/35] pkt-line: introduce struct packet_reader

2018-02-12 Thread Jonathan Nieder
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

Re: please change stash

2018-02-12 Thread Andrew Ardill
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 >

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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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 21/26] sha1_file: allow sha1_file_name to handle arbitrary repositories

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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 11/26] sha1_file: add repository argument to link_alt_odb_entries

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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 25/26] sha1_file: allow map_sha1_file to handle arbitrary repositories

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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 26/26] sha1_file: allow sha1_loose_object_info to handle arbitrary repositories

2018-02-12 Thread Stefan Beller
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 12/26] sha1_file: add repository argument to prepare_alt_odb

2018-02-12 Thread Stefan Beller
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

2018-02-12 Thread Stefan Beller
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 22/26] sha1_file: allow stat_sha1_file to handle arbitrary repositories

2018-02-12 Thread Stefan Beller
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

  1   2   >