Re: [PATCH v14 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

2016-08-24 Thread Junio C Hamano
Pranit Bauva writes: > +static int is_expected_rev(const char *expected_hex) > +{ > + struct strbuf actual_hex = STRBUF_INIT; > + int res = 0; > + if (strbuf_read_file(&actual_hex, git_path_bisect_expected_rev(), 0) >= > 0) { > + strbuf_trim(&actual_hex); > +

Re: [PATCHv2] push: change submodule default to check

2016-08-24 Thread Stefan Beller
On Wed, Aug 24, 2016 at 12:37 PM, Junio C Hamano wrote: > Jeff King writes: > > This seems to be dropped from the list, probably due to no "To:" > header in the original, which led to "no", "To-header" "on" and > "input <" on YOUR recipient list, so I am quoting it in full without > trimming. > >

Re: [PATCH v14 11/27] bisect--helper: `bisect_next_check` & bisect_voc shell function in C

2016-08-24 Thread Junio C Hamano
Pranit Bauva writes: > +static int mark_good(const char *refname, const struct object_id *oid, > + int flag, void *cb_data) > +{ > + int *m_good = (int *)cb_data; > + *m_good = 0; > + return 1; > +} > + > +static char *bisect_voc(char *revision_type) > +{ > + if (

Re: [PATCH v14 09/27] bisect--helper: `bisect_write` shell function in C

2016-08-24 Thread Junio C Hamano
Pranit Bauva writes: > +struct bisect_terms { > + struct strbuf term_good; > + struct strbuf term_bad; > +}; I think "struct strbuf" is overrated. For things like this, where these fields will never change once it is set (and setting it is done atomically, not incrementally), there is n

Re: [PATCHv5 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-24 Thread Stefan Beller
On Tue, Aug 23, 2016 at 11:29 PM, Jacob Keller wrote: > On Tue, Aug 23, 2016 at 4:03 PM, Stefan Beller wrote: + + if (option_recursive) { + if (option_required_reference.nr && + option_optional_reference.nr) + di

Re: [PATCHv2] push: change submodule default to check

2016-08-24 Thread Jeff King
On Wed, Aug 24, 2016 at 03:37:29PM -0700, Stefan Beller wrote: > > That sounds massively ... broken. So before even thinking about > > flipping it to default, this needs to be fixed first. > > I agree. That sounds bad. > > However having the --auto-check feels like papering over the > actual pr

Re: Git for Windows documentation, was Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

2016-08-24 Thread Philip Oakley
From: "Dakota Hawkins" On Wed, Aug 24, 2016 at 11:41 AM, Johannes Schindelin wrote: Hi Dakota, On Tue, 23 Aug 2016, Dakota Hawkins wrote: I use GFW almost exclusively, but I pretty much always consult the upstream documentation anyway (because I find it easier). Oh... I thought that typin

Re: [PATCHv5 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-24 Thread Jacob Keller
On Wed, Aug 24, 2016 at 3:52 PM, Stefan Beller wrote: > On Tue, Aug 23, 2016 at 11:29 PM, Jacob Keller wrote: >> On Tue, Aug 23, 2016 at 4:03 PM, Stefan Beller wrote: > + > + if (option_recursive) { > + if (option_required_reference.nr && > +

Re: [L10N] Kickoff of translation for Git 2.10.0 round 1

2016-08-24 Thread Alex Henrie
2016-08-20 10:01 GMT-06:00 Jean-Noël AVILA : > 2. in sequencer.c, there is a mistake in the original string to translate > "Cannot revert during a another revert" There's also "In both case" in git-rebase--interactive.sh. -Alex -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH v2] for-each-ref: add %(upstream:gone) to mark missing refs

2016-08-24 Thread Karthik Nayak
On Thu, Aug 25, 2016 at 12:03 AM, Jeff King wrote: > On Wed, Aug 24, 2016 at 08:26:26PM +0200, Øystein Walle wrote: > >> In the mean time, however, I have discovered that this conflicts with >> kn/ref-filter-branch-list in pu. In that topic this specific feature is >> implemented as well. They inc

Re: on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

2016-08-24 Thread Michael Haggerty
On 08/24/2016 11:39 PM, Jeff King wrote: > On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote: > >> Elastic File System (EFS) is Amazon's scalable filesystem product that >> is exposed to the OS as an NFS mount. We're using EFS to host the >> filesystem used by a Jenkins CI server. Sometim

<    1   2