Re: [PATCH] submodule: use cheaper check for submodule pushes

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 5:53 PM, Junio C Hamano wrote: > Jonathan Nieder writes: > >>> In the function push_submodule[1] we use add_submodule_odb[2] to determine >>> if a submodule has been populated. However the function does not work with >>> the

Re: My Second Email to You, Pls Reply Me

2017-07-12 Thread Makl Na
Hello Dear, How are you doing? I hope you are doing well. I am writing as I have written to you previously without any response from you. I hope all is well with you.I will appreciate if you will acknowledge your receipt of this mail. Thank you and have a good day. Miss Naya Please Write Me

Re: [PATCH 1/2] commit: convert lookup_commit_graft to struct object_id

2017-07-12 Thread brian m. carlson
On Wed, Jul 12, 2017 at 05:44:14PM -0700, Stefan Beller wrote: > With this patch, commit.h doesn't contain the string 'sha1' any more. From a relatively quick look, these look sane to me. -- brian m. carlson / brian with sandals: Houston, Texas, US https://www.crustytoothpaste.net/~bmc | My

Re: [PATCH] submodule: use cheaper check for submodule pushes

2017-07-12 Thread Junio C Hamano
Jonathan Nieder writes: >> In the function push_submodule[1] we use add_submodule_odb[2] to determine >> if a submodule has been populated. However the function does not work with >> the submodules objects that are added, instead a new child process is used >> to perform the

[PATCH 2/2] tag: convert gpg_verify_tag to use struct object_id

2017-07-12 Thread Stefan Beller
Signed-off-by: Stefan Beller --- builtin/tag.c| 2 +- builtin/verify-tag.c | 9 + tag.c| 10 +- tag.h| 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index

[PATCH 1/2] commit: convert lookup_commit_graft to struct object_id

2017-07-12 Thread Stefan Beller
With this patch, commit.h doesn't contain the string 'sha1' any more. Signed-off-by: Stefan Beller --- Before diving into the "RFC object store" series further, I want to get rid of the final sha1s in {commit,tag}.{c,h}. commit.c | 6 +++--- commit.h | 2 +- fsck.c|

reftable: new ref storage format

2017-07-12 Thread Shawn Pearce
We've been having scaling problems with insane number of references (>866k), so I started thinking a lot about improving ref storage. I've written a simple approach, and implemented it in JGit. Performance is promising: - 62M packed-refs compresses to 27M - 42.3 usec lookup You can read a

Re: [PATCH] submodule: use cheaper check for submodule pushes

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 5:01 PM, Jonathan Nieder wrote: > These footnotes don't answer the question that I really have: why did > this use add_submodule_odb in the first place? oh, I forgot to put that down: presumably add_submodule_odb was used because it was available back

Re: [PATCH] submodule: use cheaper check for submodule pushes

2017-07-12 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > In the function push_submodule[1] we use add_submodule_odb[2] to determine > if a submodule has been populated. However the function does not work with > the submodules objects that are added, instead a new child process is used > to perform the actual push in the

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Junio C Hamano
Jeff King writes: > I could see somebody arguing that format-patch should respect a project > preference, since its primary purpose is to communicate your work to the > rest of the project. > > But then you could make a similar argument for other diff options, too. Yeah, and that

[PATCH] submodule: use cheaper check for submodule pushes

2017-07-12 Thread Stefan Beller
In the function push_submodule[1] we use add_submodule_odb[2] to determine if a submodule has been populated. However the function does not work with the submodules objects that are added, instead a new child process is used to perform the actual push in the submodule. Use

Reducing redundant build at Travis?

2017-07-12 Thread Junio C Hamano
I usually try to stay as late as possible to finish all the integration branches in order before pushing out the result; it is more efficient to be able to batch things (for humans). I however noticed that This often means we would have multiple build jobs at Travis for branches and builds on

Re: [PATCH v2 0/3] interpret-trailers: add --where, --if-exists, --if-missing

2017-07-12 Thread Paolo Bonzini
On 13/07/2017 01:02, Junio C Hamano wrote: > Paolo Bonzini writes: > >> From: Paolo Bonzini >> >> These options are useful to experiment with "git interpret-trailers" >> without having to tinker with .gitconfig. It can also be useful in the >> oddball case

Re: Git on macOS shows committed files as untracked

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 06:21:28PM -0400, roeder@mailnull.com wrote: > In Git on macOS (git version 2.13.2 | brew install git) the status > command will show folders as untracked even though they are committed > and checked out from the repository. Does not reproduce on Windows and > Ubuntu.

[ANNOUNCE] Git v2.13.3

2017-07-12 Thread Junio C Hamano
The latest maintenance release Git v2.13.3 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.13.3' tag and the 'maint' branch that the tag points at: url =

Re: [PATCH v2 0/3] interpret-trailers: add --where, --if-exists, --if-missing

2017-07-12 Thread Junio C Hamano
Paolo Bonzini writes: > From: Paolo Bonzini > > These options are useful to experiment with "git interpret-trailers" > without having to tinker with .gitconfig. It can also be useful in the > oddball case where you want a different placement for the

Git on macOS shows committed files as untracked

2017-07-12 Thread roeder . git
In Git on macOS (git version 2.13.2 | brew install git) the status command will show folders as untracked even though they are committed and checked out from the repository. Does not reproduce on Windows and Ubuntu. Repro steps: 1. Download

[PATCH v2 3/3] interpret-trailers: add options for actions

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini Allow using non-default values for trailers without having to set them up in .gitconfig first. For example, if you have the following configuration trailer.signed-off-by.where = end you may use "--where before" when a patch author forgets his

[PATCH v2 1/3] trailers: create struct trailer_opts

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini Pass the command-line arguments as a pointer to a new struct. This will be extended in the next patch to include more options. Signed-off-by: Paolo Bonzini --- v1->v2: constify builtin/interpret-trailers.c | 13

[PATCH v2 0/3] interpret-trailers: add --where, --if-exists, --if-missing

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini These options are useful to experiment with "git interpret-trailers" without having to tinker with .gitconfig. It can also be useful in the oddball case where you want a different placement for the trailer. Compared to "git -c", they are more easily

[PATCH v2 2/3] trailers: export action enums and corresponding lookup functions

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini Separate the mechanical changes out of the next patch. The functions are changed to take a pointer to enum, because struct conf_info is not going to be public. Set the default values explicitly in default_conf_info, since they are not anymore close to

Re: Mirroring for offline use - best practices?

2017-07-12 Thread Joachim Durchholz
Am 12.07.2017 um 19:40 schrieb Stefan Beller: Thanks for the feedback - it's been very, very useful to me! > Yes, a local path implies --local in git-clone, which (a) uses hardlinks > and (b) avoids some other protocol overhead. I guess (a) is the most important one for repositories large

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 2:37 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> 2. collaboration. >> When I want to review a patch from the mailing list, >> I could (a) download the patch, apply locally, see the diff >> formatted nicely

Re: [PATCH 2/3] setup: have the_repository use the_index

2017-07-12 Thread Junio C Hamano
Jonathan Nieder writes: > > All that said, I don't have a strong opinion on this. Both the 1-word > approach (a pointer) and 24-word approach (embedding) are tolerable > and there are reasons to prefer each. I do not care too much about 24-word wastage. If this were not "a

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Junio C Hamano
Stefan Beller writes: > 2. collaboration. > When I want to review a patch from the mailing list, > I could (a) download the patch, apply locally, see the diff > formatted nicely according to diff.orderFile. If you are not doing a review of a patch with complex

Re: [PATCH 3/3] interpret-trailers: add options for actions

2017-07-12 Thread Paolo Bonzini
On 12/07/2017 23:10, Jonathan Tan wrote: > When I would expect the last 2 commands to produce the same output. Maybe > invoke set_where(where, NULL) when "unset" is true? And change set_where() > accordingly. Same for the other two option parsing functions. Sounds good, and I'll also add a test

Re: [PATCH 2/3] setup: have the_repository use the_index

2017-07-12 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: > Brandon Williams writes: >> Since it is a pointer then using a '#define' to replace 'the_index' >> (which is not a pointer) would be a little more challenging. > > The above is merely realizing another downside that stems from the > earlier design

Re: [git-for-windows] Call to developers with access to Windows XP

2017-07-12 Thread Philip Oakley
From: "Johannes Schindelin" Hi all, it has been a while since Windows XP support has been dropped from Git for Windows (v2.10.0 was the last version to support it), mainly due to the code changes inherited from Cygwin's code base, which discontinued supporting

Re: [PATCH/RFC] rebase: make resolve message clearer for inexperienced users

2017-07-12 Thread Junio C Hamano
William Duclot writes: >> - The original said "When you have resolved this problem", without >>giving a guidance how to resolve, and without saying what the >>problem is. The updated one says "conflict" to clarify the >>"problem", and suggests "git add" as

Re: [PATCH 1/3] trailers: create struct trailer_opts

2017-07-12 Thread Jonathan Tan
On Wed, 12 Jul 2017 15:46:44 +0200 Paolo Bonzini wrote: > -static void print_all(FILE *outfile, struct list_head *head, int trim_empty) > +static void print_all(FILE *outfile, struct list_head *head, > + struct trailer_opts *opts) This can be "const struct

Re: [PATCH 2/3] trailers: export action enums and corresponding lookup functions

2017-07-12 Thread Jonathan Tan
On Wed, 12 Jul 2017 15:46:45 +0200 Paolo Bonzini wrote: > -static struct conf_info default_conf_info; > +static struct conf_info default_conf_info = { > + .where = WHERE_END, > + .if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR, > + .if_missing = MISSING_ADD, > +}; I'm

Re: [PATCH 3/3] interpret-trailers: add options for actions

2017-07-12 Thread Jonathan Tan
On Wed, 12 Jul 2017 15:46:46 +0200 Paolo Bonzini wrote: > +static int option_parse_where(const struct option *opt, > + const char *arg, int unset) > +{ > + enum action_where *where = opt->value; > + > + if (unset) > + return 0; > + >

Re: [PATCH] gc: run pre-detach operations under lock

2017-07-12 Thread Junio C Hamano
Jeff King writes: > ... And I > really think it's not "a little more work". Even if we decided to keep > the same file and replace the PID in it with the daemonized one, I think > that still isn't quite right. Because we don't do so atomically unless > we take gc.pid.lock again.

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 1:57 PM, Jeff King wrote: > On Wed, Jul 12, 2017 at 01:44:46PM -0700, Junio C Hamano wrote: > >> Stefan Beller writes: >> >> > I want to force myself to think about the design before pointing out >> > memory leaks and coding style,

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-12 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Tue, Jul 11 2017, Junio C. Hamano jotted: > >> Just so that people do not misunderstand, it is not our goal to >> declare that now you need a fully C99 compiler to build Git. >> ... > > I think in the context of this desire Johannes Sixt's

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Ævar Arnfjörð Bjarmason
On Wed, Jul 12 2017, Junio C. Hamano jotted: > Stefan Beller writes: > >> I want to force myself to think about the design before pointing out >> memory leaks and coding style, so the least I would wish for is: >> *.h >> *.c >> but as we have more to look at, I

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 1:44 PM, Junio C Hamano wrote: > Stefan Beller writes: > > Just set diff.orderFile to suit your taste without bothering other > people, I would say. I must have explained it very badly, I'll try again: There are 2 different use

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 01:44:46PM -0700, Junio C Hamano wrote: > Stefan Beller writes: > > > I want to force myself to think about the design before pointing out > > memory leaks and coding style, so the least I would wish for is: > > *.h > > *.c > > but as we

Re: [PATCH] RFC: Introduce '.gitorderfile'

2017-07-12 Thread Junio C Hamano
Stefan Beller writes: > I want to force myself to think about the design before pointing out > memory leaks and coding style, so the least I would wish for is: > *.h > *.c > but as we have more to look at, I would want to have the most abstract > thing to come

Re: git gc --auto aquires *.lock files that make a subsequent git-fetch error out

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 10:30:25PM +0200, Ævar Arnfjörð Bjarmason wrote: > > Is it really "in a row" that's a problem? The second fetch should not > > begin until the first one is done, including until its auto-gc exits. > > And even with background gc, we do the ref-locking operations first, due

Re: [PATCH 2/3] setup: have the_repository use the_index

2017-07-12 Thread Junio C Hamano
Brandon Williams writes: > For all intents and purposes the index struct that is stored in 'struct > repository' is an embedded instance, its just stored as a pointer > instead of being a direct part of the struct itself. The question really is this. In order to realize the

Re: [RFC PATCH 3/3] sha1_file: add promised blob hook support

2017-07-12 Thread Jonathan Nieder
Hi, Ben Peart wrote: > On 7/11/2017 3:48 PM, Jonathan Tan wrote: >> Teach sha1_file to invoke a hook whenever a blob is requested and >> unavailable but is promised. The hook is a shell command that can be >> configured through "git config"; this hook takes in a list of hashes and >> writes (if

Re: git gc --auto aquires *.lock files that make a subsequent git-fetch error out

2017-07-12 Thread Ævar Arnfjörð Bjarmason
On Wed, Jul 12 2017, Jeff King jotted: > On Wed, Jul 12, 2017 at 09:38:46PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> In 131b8fcbfb ("fetch: run gc --auto after fetching", 2013-01-26) first >> released with v1.8.2 Jeff changed git-fetch to run "git gc --auto" >> afterwards. >> >> This means

Re: git gc --auto aquires *.lock files that make a subsequent git-fetch error out

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 09:38:46PM +0200, Ævar Arnfjörð Bjarmason wrote: > In 131b8fcbfb ("fetch: run gc --auto after fetching", 2013-01-26) first > released with v1.8.2 Jeff changed git-fetch to run "git gc --auto" > afterwards. > > This means that if you run two git fetches in a row the second

Re: [RFC PATCH 1/3] promised-blob, fsck: introduce promised blobs

2017-07-12 Thread Jonathan Nieder
Hi, Jeff Hostetler wrote: > My primary concern is scale and managing the list of objects over time. [...] > For > example, on the Windows repo we have (conservatively) 100M+ blobs (and > growing). Assuming 28 bytes per, gives a

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-12 Thread Ævar Arnfjörð Bjarmason
On Tue, Jul 11 2017, Junio C. Hamano jotted: > Ben Peart writes: > >>> If this patch can survive a few releases without complaint, >>> then we can feel more confident that designated initializers >>> are widely supported by our user base. It also is an >>> indication that

Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

2017-07-12 Thread Jonathan Tan
On Tue, 20 Jun 2017 09:54:34 +0200 Christian Couder wrote: > Git can store its objects only in the form of loose objects in > separate files or packed objects in a pack file. > > To be able to better handle some kind of objects, for example big > blobs, it would be

Re: [PATCH 3/3] grep: recurse in-process using 'struct repository'

2017-07-12 Thread Brandon Williams
On 07/11, Stefan Beller wrote: > On Tue, Jul 11, 2017 at 3:04 PM, Brandon Williams wrote: > > > + if (repo_submodule_init(, superproject, path)) > > + return 0; > > What happens if we go through the "return 0", do we rather want to > print an error ?

Re: [PATCH 3/3] grep: recurse in-process using 'struct repository'

2017-07-12 Thread Brandon Williams
On 07/11, Jacob Keller wrote: > On Tue, Jul 11, 2017 at 3:04 PM, Brandon Williams wrote: > > Convert grep to use 'struct repository' which enables recursing into > > submodules to be handled in-process. > > > > Signed-off-by: Brandon Williams > > --- > >

Re: [PATCH 3/3] grep: recurse in-process using 'struct repository'

2017-07-12 Thread Brandon Williams
On 07/11, Jonathan Nieder wrote: > Hi, > > Brandon Williams wrote: > > > Convert grep to use 'struct repository' which enables recursing into > > submodules to be handled in-process. > > \o/ > > This will be even nicer with the changes described at >

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 11:24:47AM -0700, Jonathan Nieder wrote: > Jeff King wrote: > > On Wed, Jul 12, 2017 at 11:06:03AM -0700, Brandon Williams wrote: > > >> Each 'struct repository' does have its own config so we could > >> potentially want a config in a submodule to override some config in

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 11:09:23AM -0700, Jonathan Nieder wrote: > > I didn't follow the rest of the "struct repository" series closely, but > > I don't feel like we ever reached a resolution on how config would be > > handled. I notice that the in-process "ls-files" behaves differently > > than

Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT

2017-07-12 Thread Johannes Sixt
Am 12.07.2017 um 03:26 schrieb brian m. carlson: On Tue, Jul 11, 2017 at 07:24:07AM +0200, Johannes Sixt wrote: I can revive the patches if there is interest. I'd be interested in at least a pointer to them if you have one. I think it might allow us to take advantage of desirable features

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Jonathan Nieder
Jeff King wrote: > On Wed, Jul 12, 2017 at 11:06:03AM -0700, Brandon Williams wrote: >> Each 'struct repository' does have its own config so we could >> potentially want a config in a submodule to override some config in the >> superproject. Though for right now it may be simpler to not worry

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 11:06:03AM -0700, Brandon Williams wrote: > > I didn't follow the rest of the "struct repository" series closely, but > > I don't feel like we ever reached a resolution on how config would be > > handled. I notice that the in-process "ls-files" behaves differently > > than

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 11:09 AM, Jonathan Nieder wrote: > Hi, > > Jeff King wrote: > >> I didn't follow the rest of the "struct repository" series closely, but >> I don't feel like we ever reached a resolution on how config would be >> handled. I notice that the in-process

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Jonathan Nieder
Hi, Jeff King wrote: > I didn't follow the rest of the "struct repository" series closely, but > I don't feel like we ever reached a resolution on how config would be > handled. I notice that the in-process "ls-files" behaves differently > than the old one when config differs between the

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Brandon Williams
On 07/12, Jeff King wrote: > On Tue, Jul 11, 2017 at 03:04:05PM -0700, Brandon Williams wrote: > > > This series utilizes the new 'struct repository' in order to convert grep > > to be > > able to recurse into submodules in-process much like how ls-files was > > converted > > to recuse

Re: [PATCH 2/3] setup: have the_repository use the_index

2017-07-12 Thread Brandon Williams
On 07/11, Junio C Hamano wrote: > Brandon Williams writes: > > > Have the index state which is stored in 'the_repository' be a pointer to > > the in-core instead 'the_index'. This makes it easier to begin > > transitioning more parts of the code base to operate on a 'struct >

Re: [PATCH] sha1_file: add slash once in for_each_file_in_obj_subdir()

2017-07-12 Thread René Scharfe
Am 10.07.2017 um 04:10 schrieb Junio C Hamano: Jeff King writes: ... And you could even drop origlen by replacing it with "baselen - 3" at the end. But somehow doing the computation on the fly actually seems more complicated to me (from the perspective of a reader who is trying

Re: Mirroring for offline use - best practices?

2017-07-12 Thread Stefan Beller
On Wed, Jul 12, 2017 at 3:47 AM, Joachim Durchholz wrote: > Hi all, > > I'm pretty sure this is a FAQ, but articles I found on the Internet were > either mere "recipes" (i.e. tell you how, but don't explain why), or bogged > down in so many details that I was never sure how to

Re: [RFC PATCH 3/3] sha1_file: add promised blob hook support

2017-07-12 Thread Ben Peart
On 7/11/2017 3:48 PM, Jonathan Tan wrote: Teach sha1_file to invoke a hook whenever a blob is requested and unavailable but is promised. The hook is a shell command that can be configured through "git config"; this hook takes in a list of hashes and writes (if successful) the corresponding

Re: [PATCH 2/3] setup: have the_repository use the_index

2017-07-12 Thread Brandon Williams
On 07/11, Jonathan Nieder wrote: > Hi, > > Brandon Williams wrote: > > > Have the index state which is stored in 'the_repository' be a pointer to > > the in-core instead 'the_index'. This makes it easier to begin > > transitioning more parts of the code base to operate on a 'struct > >

Re: [RFC PATCH 1/3] promised-blob, fsck: introduce promised blobs

2017-07-12 Thread Jeff Hostetler
On 7/11/2017 3:48 PM, Jonathan Tan wrote: Currently, Git does not support repos with very large numbers of blobs or repos that wish to minimize manipulation of certain blobs (for example, because they are very large) very well, even if the user operates mostly on part of the repo, because Git

Re: [PATCH 1/3] repo_read_index: don't discard the index

2017-07-12 Thread Brandon Williams
On 07/11, Jonathan Nieder wrote: > Brandon Williams wrote: > > > Have 'repo_read_index()' behave more like the other read_index family of > > functions and don't discard the index if it has already been populated. > > > > Signed-off-by: Brandon Williams > > --- > >

Re: [PATCH 1/3] repo_read_index: don't discard the index

2017-07-12 Thread Brandon Williams
On 07/11, Stefan Beller wrote: > On Tue, Jul 11, 2017 at 3:04 PM, Brandon Williams wrote: > > Have 'repo_read_index()' behave more like the other read_index family of > > functions and don't discard the index if it has already been populated. > > instead rely on the quick

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

2017-07-12 Thread Junio C Hamano
Miguel Torroja writes: > The motivation for setting skip_info default to True is because any > extra message output by a p4 trigger to stdout, seems to be reported > as {'code':'info'} when the p4 command output is marshalled. > > I though it was the less intrusive way

Re: [PATCH] gc: run pre-detach operations under lock

2017-07-12 Thread Jeff King
On Wed, Jul 12, 2017 at 09:46:25AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Instead, we can do something a bit simpler: take the lock > > only for the duration of the pre-detach work, then detach, > > then take it again for the post-detach work. Technically, > >

Re: [PATCH] gc: run pre-detach operations under lock

2017-07-12 Thread Junio C Hamano
Jeff King writes: > Instead, we can do something a bit simpler: take the lock > only for the duration of the pre-detach work, then detach, > then take it again for the post-detach work. Technically, > this means that the post-detach lock could lose to another > process doing

git <-> cvs synch script with git cvsexportcommit -W

2017-07-12 Thread Osamu Aoki
Hi, Here is my old mail with updated pointer. This may be useful for people to migrate git to cvs while keeping cvs up-to-date. On Wed, Jul 12, 2017 at 03:41:58PM +0200, Johannes Schindelin wrote: > Hi, > > On Mon, 13 Jul 2015, Osamu Aoki wrote: > > > Thanks for "git cvsexportcommit -W"

Re: [PATCH 0/3] interpret-trailers: add --where, --if-exists, --if-missing

2017-07-12 Thread Paolo Bonzini
On 12/07/2017 16:47, Christian Couder wrote: > On Wed, Jul 12, 2017 at 3:46 PM, Paolo Bonzini wrote: >> >> These options are useful to experiment with "git interpret-trailers" >> without having to tinker with .gitconfig. It can also be useful in the >> oddball case where you

Re: [PATCH 0/3] interpret-trailers: add --where, --if-exists, --if-missing

2017-07-12 Thread Christian Couder
On Wed, Jul 12, 2017 at 3:46 PM, Paolo Bonzini wrote: > > These options are useful to experiment with "git interpret-trailers" > without having to tinker with .gitconfig. It can also be useful in the > oddball case where you want a different placement for the trailer. > > The

[PATCH 2/3] trailers: export action enums and corresponding lookup functions

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini Separate the mechanical changes out of the next patch. The functions are changed to take a pointer to enum, because struct conf_info is not going to be public. Write down the defaults explicitly in default_conf_info, since they are not anymore close to

[PATCH 0/3] interpret-trailers: add --where, --if-exists, --if-missing

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini These options are useful to experiment with "git interpret-trailers" without having to tinker with .gitconfig. It can also be useful in the oddball case where you want a different placement for the trailer. The case that stimulated the creation of the

[PATCH 1/3] trailers: create struct trailer_opts

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini Pass the command-line arguments as a pointer to a new struct. This will be extended soon to include more options. Signed-off-by: Paolo Bonzini --- builtin/interpret-trailers.c | 13 ++--- trailer.c| 14

[PATCH 3/3] interpret-trailers: add options for actions

2017-07-12 Thread Paolo Bonzini
From: Paolo Bonzini Allow using non-default values for trailers without having to set them up in .gitconfig first. For example, if you have the following configuration trailer.signed-off-by.where = end you may use "--where before" when a patch author forgets his

Mirroring for offline use - best practices?

2017-07-12 Thread Joachim Durchholz
Hi all, I'm pretty sure this is a FAQ, but articles I found on the Internet were either mere "recipes" (i.e. tell you how, but don't explain why), or bogged down in so many details that I was never sure how to proceed from there. Basic situation: There's a master repository (Github or

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

2017-07-12 Thread Miguel Torroja
The motivation for setting skip_info default to True is because any extra message output by a p4 trigger to stdout, seems to be reported as {'code':'info'} when the p4 command output is marshalled. I though it was the less intrusive way to filter out the verbose server trigger scripts, as some

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

2017-07-12 Thread Luke Diamand
On 11 July 2017 at 23:53, Miguel Torroja wrote: > The option -G of p4 (python marshal output) gives more context about the > data being output. That's useful when using the command "change -o" as > we can distinguish between warning/error line and real change

Re: [PATCH 0/3] Convert grep to recurse in-process

2017-07-12 Thread Jeff King
On Tue, Jul 11, 2017 at 03:04:05PM -0700, Brandon Williams wrote: > This series utilizes the new 'struct repository' in order to convert grep to > be > able to recurse into submodules in-process much like how ls-files was > converted > to recuse in-process. The result is a much smaller code

Re: [PATCH 0/7] tag: more fine-grained pager-configuration

2017-07-12 Thread Martin Ågren
On 11 July 2017 at 00:42, Junio C Hamano wrote: > Martin Ågren writes: >> I am not moving all builtins to handling the pager on their own, >> but instead introduce a flag IGNORE_PAGER_CONFIG and use it only >> with the tag builtin. That means there's