Re: [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms

Hey, On Fri, Nov 18, 2016 at 12:05 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Tue, Nov 15, 2016 at 11:12 PM, Junio C Hamano wrote: >>> Jacob Keller writes: >>> ... >>> I think you are going in

Re: [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick

David Turner writes: > diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh > index 470f334..be074a1 100755 > --- a/t/t3030-merge-recursive.sh > +++ b/t/t3030-merge-recursive.sh > @@ -575,13 +575,13 @@ test_expect_success 'merge removes empty directories' '

Re: [PATCH 09/16] update submodules: add scheduling to update submodules

On Tue, Nov 15, 2016 at 4:02 PM, Brandon Williams wrote: > On 11/15, Stefan Beller wrote: >> + >> + child_process_clear(); >> + return 0; >> +} > > If run command is successful then it handles the clearing of the child > process struct, correct? Is there a negative to

Re: [PATCH 08/16] update submodules: add depopulate_submodule

On Thu, Nov 17, 2016 at 2:42 PM, Stefan Beller wrote: > > I think I'll just write this functionality in C and optionally expose > it via the submodule--helper, > such that the user facing git-submodule.sh only has to call that helper. I think it will roughly look like this:

Re: [PATCH v3 5/6] grep: enable recurse-submodules to work on objects

On 11/15, Stefan Beller wrote: > On Fri, Nov 11, 2016 at 3:51 PM, Brandon Williams wrote: > > + /* > > +* Add basename of parent project > > +* When performing grep on a object the filename is prefixed > > +* with the object's name: ':filename'. >

Re: [PATCH 08/16] update submodules: add depopulate_submodule

On Thu, Nov 17, 2016 at 2:29 PM, Brandon Williams wrote: > On 11/17, Stefan Beller wrote: >> Well first you get the warning: >> >> "cannot remove submodule '%s' because it (or one of " >> "its nested submodules) uses a .git directory"), >> >> and in case a d/f/ conflict

Re: [PATCH 08/16] update submodules: add depopulate_submodule

On 11/17, Stefan Beller wrote: > Well first you get the warning: > > "cannot remove submodule '%s' because it (or one of " > "its nested submodules) uses a .git directory"), > > and in case a d/f/ conflict arises in a later stage (e.g. when the submodule > is replaced by a file or

Re: [PATCH 08/16] update submodules: add depopulate_submodule

On Thu, Nov 17, 2016 at 3:13 AM, Heiko Voigt wrote: > On Tue, Nov 15, 2016 at 03:06:43PM -0800, Stefan Beller wrote: >> diff --git a/cache.h b/cache.h >> index a50a61a..65c47e4 100644 >> --- a/cache.h >> +++ b/cache.h >> @@ -2018,4 +2018,6 @@ void sleep_millisec(int millisec);

[ANNOUNCE] Git v2.11.0-rc2

A release candidate Git v2.11.0-rc2 is now available for testing at the usual places. It is comprised of 646 non-merge commits since v2.10.0, contributed by 68 people, 14 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following

Re: [PATCH 08/16] update submodules: add depopulate_submodule

On Tue, Nov 15, 2016 at 3:44 PM, Brandon Williams wrote: > "to that a deleted" did you mean "so that a deleted" done >> That will only work properly when the submodule uses a gitfile instead of >> a .git directory and no untracked files are present. Otherwise the removal >>

Re: merge --no-ff is NOT mentioned in help

On Thu, Nov 17, 2016 at 09:10:22AM -0800, Junio C Hamano wrote: > People interested may want to try the attached single-liner patch to > see how the output from _ALL_ commands that use parse-options API > looks when given "-h". It could be that the result may not be too > bad. The output is

Re: [PATCH v3 4/6] grep: optionally recurse into submodules

On 11/15, Stefan Beller wrote: > > + /* > > +* Limit number of threads for child process to use. > > +* This is to prevent potential fork-bomb behavior of git-grep as > > each > > +* submodule process has its own thread pool. > > +*/ > > + if

Re: [PATCH v7 16/17] branch: use ref-filter printing APIs

Junio C Hamano writes: > One worry that I have is if the strings embedded in this function to > the final format are safe. As far as I can tell, the pieces of > strings that are literally inserted into the resulting format string > by this function are maxwidth,

Re: [PATCH v15 22/27] bisect--helper: `bisect_log` shell function in C

Hi, On 10/14/2016 04:14 PM, Pranit Bauva wrote: > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > index 493034c..c18ca07 100644 > --- a/builtin/bisect--helper.c > +++ b/builtin/bisect--helper.c > @@ -858,6 +858,23 @@ static int bisect_state(struct bisect_terms *terms, > const

Re: [PATCH v15 12/27] bisect--helper: `get_terms` & `bisect_terms` shell function in C

Hi, On 10/14/2016 04:14 PM, Pranit Bauva wrote: > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > index 317d671..6a5878c 100644 > --- a/builtin/bisect--helper.c > +++ b/builtin/bisect--helper.c [...] > +static int bisect_terms(struct bisect_terms *terms, const char **argv, int

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

Hi Pranit, On 10/14/2016 04:14 PM, Pranit Bauva wrote: > Also reimplement `bisect_voc` shell function in C and call it from > `bisect_next_check` implementation in C. Please don't! ;D > +static char *bisect_voc(char *revision_type) > +{ > + if (!strcmp(revision_type, "bad")) > +

Re: [PATCH v15 10/27] bisect--helper: `check_and_set_terms` shell function in C

Hi Pranit, On 10/14/2016 04:14 PM, Pranit Bauva wrote: > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > index 3f19b68..c6c11e3 100644 > --- a/builtin/bisect--helper.c > +++ b/builtin/bisect--helper.c > @@ -20,6 +20,7 @@ static const char * const git_bisect_helper_usage[] = { >

Re: [PATCH 07/16] update submodules: introduce submodule_is_interesting

On Thu, Nov 17, 2016 at 2:57 AM, Heiko Voigt wrote: > It seems that you are only looking at the submodule config from a > commit. Should a user be able to override this with local configuration? > Haven't looked further in the patchseries so maybe that is somewhere > else? It

Re: [PATCH 07/16] update submodules: introduce submodule_is_interesting

On Tue, Nov 15, 2016 at 4:14 PM, David Turner wrote: >> +int submodule_is_interesting(const char *path, const unsigned char >> +*sha1) { > > This is apparently only ever (in this series) called with null_sha1. So > either this arg is unnecessary, or there are bugs

Re: [PATCH v7 16/17] branch: use ref-filter printing APIs

Karthik Nayak writes: > +static char *build_format(struct ref_filter *filter, int maxwidth, const > char *remote_prefix) > +{ I understand that the return value of this function is used as if the value given via --format=... option to for-each-ref. > + struct strbuf

Re: merge --no-ff is NOT mentioned in help

On 17/11/16 18:10, Junio C Hamano wrote: Mike Rappazzo writes: (Please reply inline) Indeed ;-) On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik wrote: I am running:git version 2.10.1.windows.1 I typed: git merge -h and got:

Re: [PATCH v2 0/2] bug fix with push --dry-run and submodules

On 11/17, Stefan Beller wrote: > On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams wrote: > > v2 of this series is just a small cleanup of removing a nested sub-shell > > from a > > test and rebasing on the latest version of > > 'origin/hv/submodule-not-yet-pushed-fix' > > >

Re: [PATCH v2 2/2] push: fix --dry-run to not push submodules

On 11/17, Stefan Beller wrote: > On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams wrote: > > > sha1_array_clear(); > > - die("Failed to push all needed > > submodules!"); > > + die

[Bug] gpgsign bashcompletion not available

The gpgsign feature is not available via bashcompletion on git. $ git config --global commit. commit.status commit.template $ git config --global commit.gpgsign true $ git --version git version 2.10.2 Due to this I could also find no option to automatically sign every tag that I do. If

Re: [PATCH v2 0/2] bug fix with push --dry-run and submodules

On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams wrote: > v2 of this series is just a small cleanup of removing a nested sub-shell from > a > test and rebasing on the latest version of > 'origin/hv/submodule-not-yet-pushed-fix' > > As stated above this series is based on >

Re: [PATCH v2 2/2] push: fix --dry-run to not push submodules

On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams wrote: > sha1_array_clear(); > - die("Failed to push all needed submodules!"); > + die ("Failed to push all needed submodules!");

[PATCH v2 1/2] push: --dry-run updates submodules when --recurse-submodules=on-demand

This patch adds a test to illustrate how push run with --dry-run doesn't actually perform a dry-run when push is configured to push submodules on-demand. Instead all submodules which need to be pushed are actually pushed to their remotes while any updates for the superproject are performed as a

[PATCH v2 2/2] push: fix --dry-run to not push submodules

Teach push to respect the --dry-run option when configured to recursively push submodules 'on-demand'. This is done by passing the --dry-run flag to the child process which performs a push for a submodules when performing a dry-run. In order to preserve good user experience, the additional check

[PATCH v2 0/2] bug fix with push --dry-run and submodules

v2 of this series is just a small cleanup of removing a nested sub-shell from a test and rebasing on the latest version of 'origin/hv/submodule-not-yet-pushed-fix' As stated above this series is based on 'origin/hv/submodule-not-yet-pushed-fix' Brandon Williams (2): push: --dry-run updates

Re: [PATCH 02/16] submodule: modernize ok_to_remove_submodule to use argv_array

On Wed, Nov 16, 2016 at 11:03 AM, Junio C Hamano wrote: > David Turner writes: > >>> -"-u", >> ... >>> +argv_array_pushl(, "status", "--porcelain", "-uall", >> >> This also changes -u to -uall, which is not mentioned in the >> commit

Re: [PATCH v7 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms

Karthik Nayak writes: > On Tue, Nov 15, 2016 at 11:12 PM, Junio C Hamano wrote: >> Jacob Keller writes: >> ... >> I think you are going in the right direction. I had a similar >> thought but built around a different axis. I.e.

Re: [PATCH 01/16] submodule.h: add extern keyword to functions, break line before 80

On Wed, Nov 16, 2016 at 11:08 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> submodule.h: add extern keyword to functions, break line before 80 > > The former is probably a good change for consistency. As the latter > change breaks a workflow

Re: [PATCH v4 0/4] Speedup finding of unpushed submodules

On Wed, Nov 16, 2016 at 7:11 AM, Heiko Voigt wrote: > You can find the third iteration of this series here: > > http://public-inbox.org/git/cover.1479221071.git.hvo...@hvoigt.net/ > > All comments from the last iteration should be addressed. > > Cheers Heiko Thanks for this

Re: merge --no-ff is NOT mentioned in help

Mike Rappazzo writes: > (Please reply inline) Indeed ;-) > On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik > wrote: >> I am running:git version 2.10.1.windows.1 >> >> I typed: git merge -h >> >> and got: >> >> usage: git merge []

RE: merge --no-ff is NOT mentioned in help

-Original Message- From: Mike Rappazzo [mailto:rappa...@gmail.com] Sent: Wednesday, November 16, 2016 7:58 AM To: Vanderhoof, Tzadik Cc: git@vger.kernel.org Subject: Re: merge --no-ff is NOT mentioned in help >(Please reply inline) > >On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik

Re: [Bug?] git notes are not copied during rebase

> I am currently a heavy user of rebasing and noticed that my notes > don't get correctly applied, even if notes.rewrite.rebase is set > explicitly to true (though manual says that is the default). Setting 'notes.rewrite.rebase' is, as you mentioned, not necessary, but not sufficient either. See

[PATCH/RFC] ref-filter: support sorting case-insensitively

Similar to version:refname sorting refs by versions, icase:refname will sort by refnames are usually, but strcasecmp will be used instead of strcmp. This may be helpful sometimes when people name their branches - but somebody names it -, some goes with -, or even - Syntax is a big problem. This

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

Hi, I've only got some minors to mention here ;) On 10/14/2016 04:14 PM, Pranit Bauva wrote: > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > index c542e8b..3f19b68 100644 > --- a/builtin/bisect--helper.c > +++ b/builtin/bisect--helper.c > @@ -19,9 +19,15 @@ static const char

Re: RFC: Enable delayed responses to Git clean/smudge filter requests

> On 17 Nov 2016, at 00:46, Junio C Hamano wrote: > > Jakub Narębski writes: > >>> I intend to implement this feature only for the new long running filter >>> process protocol. OK with you? >> >> If I remember and understand it correctly, current version