[PATCH v6 7/7] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

[PATCH v6 3/7] submodule: check argc count for git submodule--helper clone

From: Jacob Keller <jacob.kel...@gmail.com> Extra unused arguments to git submodule--helper clone subcommand were being silently ignored. Add a check to the argc count after options handling to ensure that no extra arguments were left on the argv array. Signed-off-by: Jacob Keller <

[PATCH v6 5/7] submodule: fix segmentation fault in submodule--helper clone

From: Jacob Keller <jacob.kel...@gmail.com> The git submodule--helper clone command will fail with a segmentation fault when given a null url or null path variable. Since these are required for proper functioning of the submodule--helper clone subcommand, add checks to prevent running an

[PATCH v6 0/7] submodule--helper credential.* pass into submodule

From: Jacob Keller <jacob.kel...@gmail.com> This series implements ability to pass the credential.* configuration variables from the command line directly into the submodule. The other patches in this series are small fixups noticed along the way. --> Interdiff between v5 and v6 <--

[PATCH v6 6/7] quote: implement sq_quotef()

From: Jacob Keller <jacob.kel...@gmail.com> Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- quote.c | 13 + quote.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/quote.c b/quote.c index fe884d24521f..b281a8fe454e 100644 --- a/quote.c +++ b/quote.c @@

Re: [PATCH v5 3/3] git: submodule honor -c credential.* from command line

On Mon, Feb 29, 2016 at 11:47 AM, Junio C Hamano wrote: > I was talking about the "not even an equal sign" true, i.e. > > $ git -c random.what -c random.false=no -c random.true=yes \ > config --bool --get-regexp 'random.*' > random.what true > random.false

Re: [PATCH v5 1/3] sumodule--helper: fix submodule--helper clone usage and check argc count

On Mon, Feb 29, 2016 at 11:44 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: >> That actually is required because otherwise adding a check for argc >> would break the things. I could split them and do this first and th

Re: [PATCH v5 3/3] git: submodule honor -c credential.* from command line

On Mon, Feb 29, 2016 at 10:20 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> +static int sanitize_submodule_config(const char *var, const char *value, >> void *data) >> +{ >> + struct strbuf qu

Re: [PATCH v5 1/3] sumodule--helper: fix submodule--helper clone usage and check argc count

On Mon, Feb 29, 2016 at 9:49 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: >> Fix the usage description to match implementation. Add an argc check to >> enforce no extra arguments. > > The above sounds very

Re: [PATCH v5 0/3] pass credential.* to submodules

On Fri, Feb 26, 2016 at 4:13 PM, Jacob Keller <jacob.e.kel...@intel.com> wrote: > From: Jacob Keller <jacob.kel...@gmail.com> > > This version of the series fixes up a few issues and implements > sq_quotef function to help make intent more clear in the code. I al

[PATCH v5 3/3] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

[PATCH v5 2/3] quote: implement sq_quotef()

From: Jacob Keller <jacob.kel...@gmail.com> Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- quote.c | 13 + quote.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/quote.c b/quote.c index fe884d24521f..b281a8fe454e 100644 --- a/quote.c +++ b/quote.c @@

[PATCH v5 0/3] pass credential.* to submodules

From: Jacob Keller <jacob.kel...@gmail.com> This version of the series fixes up a few issues and implements sq_quotef function to help make intent more clear in the code. I also chose to use Jeff's implementation for the test fix since I think it works better and I prefer the consi

[PATCH v5 1/3] sumodule--helper: fix submodule--helper clone usage and check argc count

From: Jacob Keller <jacob.kel...@gmail.com> git submodule--helper clone usage specified that paths come after the -- as a sequence. However, the actual implementation does not, and requires only a single path passed in via --path. In addition, argc was unchecked. (allowing arbitrary

Re: [PATCH v4 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 2:20 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> that is slightly more verbose, but it does let us keep the main body >> inside single-quotes, without restoring to confusing backslash escaping. >> > > I think I prefer the dou

Re: [PATCH v3 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 11:41 AM, Stefan Beller wrote: > > In the future, would you mind to try interdiffs in a cover letter? > > (I do git diff HEAD...$(previousSeries) with previousSerier either > local branch or rather what Junio picked up already. There is also tbdiff, >

Re: [PATCH v4 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 2:05 PM, Jeff King <p...@peff.net> wrote: > On Fri, Feb 26, 2016 at 11:18:48AM -0800, Jacob Keller wrote: > >> +test_expect_success 'sanitize-config keeps credential.helper' " >> + git -c credential.helper=helper submodule--helpe

Re: [PATCH] credential: let empty credential specs reset helper list

On Fri, Feb 26, 2016 at 11:34 AM, Junio C Hamano wrote: > > Of course, the code in the configuration subsystem for updated > version of Git needs to become aware of the new syntax, and those > that deal with the multi-value variables need custom code, which is > similar to the

Re: [PATCH v4 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

On Fri, Feb 26, 2016 at 11:31 AM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Feb 26, 2016 at 11:18 AM, Jacob Keller <jacob.e.kel...@intel.com> > wrote: >> From: Jacob Keller <jacob.kel...@gmail.com> >> - git submodule--helper

[PATCH v4 3/3] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

[PATCH v4 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

From: Jacob Keller <jacob.kel...@gmail.com> git submodule--helper clone usage specified that paths come after the -- as a sequence. However, the actual implementation does not, and requires only a single path passed in via --path. In addition, argc was unchecked. (allowing arbitrary

[PATCH v4 1/3] t/lib-httpd: load mod_unixd

From: Michael J Gruber In contrast to apache 2.2, apache 2.4 does not load mod_unixd in its default configuration (because there are choices). Thus, with the current config, apache 2.4.10 will not be started and the httpd tests will not run on distros with default

[PATCH v3 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

From: Jacob Keller <jacob.kel...@gmail.com> git submodule--helper clone usage specified that paths come after the -- as a sequence. However, the actual implementation does not, and requires only a single path passed in via --path. In addition, argc was unchecked. (allowing arbitrary

[PATCH v3 3/3] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

Re: Fwd: git clone does not respect command line options

On Thu, Feb 25, 2016 at 11:59 PM, Jeff King wrote: > Right. The "git-config" program doesn't know about the semantics of > particular values (remember that in the early days, there were many > porcelains which built on top of git, and they could all store their own > config). Using

Re: [PATCH 01/16] bisect: write about `bisect next` in documentation

On Thu, Feb 25, 2016 at 6:04 PM, Stephan Beyer wrote: > This patch considers the source code comment that says to be > "not sure we want 'next' at the UI level anymore", and replies with > "Yes, we want it!". Therefore, the "git bisect next" functionality > is explicitly

Re: [PATCH v3 2/2] git: submodule honor -c credential.* from command line

On Thu, Feb 25, 2016 at 10:07 PM, Jeff King wrote: > Of the two you suggested, I think I like the here-doc better, as it does > not leave any question to a reader that there is other interpolation > going on. > > -Peff Agreed. Since I forgot the parts about argc checking, I will

Re: [PATCH v3 2/2] git: submodule honor -c credential.* from command line

On Thu, Feb 25, 2016 at 6:26 PM, Eric Sunshine wrote: > One thing I elided accidentally was that when changing the second > argument of test_expect_success to double-quotes, you would altogether > drop the double-quotes around "helper" in: > > git -c

Re: [PATCH v3 2/2] git: submodule honor -c credential.* from command line

On Thu, Feb 25, 2016 at 5:55 PM, Eric Sunshine wrote: > Not worth a re-roll, but these quote sequences are brain-melting. > Easier would have been to double-quote the second argument of > test_expect_success() and then do either: > They are. I fiddled with things till I

Re: [PATCH v3 1/2] t/lib-http/apache.conf: load mod_unixd module in apache 2.4

On Thu, Feb 25, 2016 at 3:41 PM, Junio C Hamano wrote: > Actually, let's wait a bit to avoid unnecessary conflicts between topics. > sb/submodule-fetch-nontip changes the way how these calls to "clean env" > helper function are made. Ya there will be some superficial conflicts

Re: [PATCH v3 1/2] t/lib-http/apache.conf: load mod_unixd module in apache 2.4

On Thu, Feb 25, 2016 at 3:18 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >>> Michael (cc'd) posted an identical patch with some more discussion back >>> in May: >>> >>> http://article.gmane.org/gmane.comp.version-control.git/268770 >>> >>> The

Re: [PATCH v2] git: submodule honor -c credential.* from command line

On Thu, Feb 25, 2016 at 12:32 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> On Wed, Feb 24, 2016 at 11:11 PM, Jeff King <p...@peff.net> wrote: >>> static int clone_submodule(const char *path, c

[PATCH v3 1/2] t/lib-http/apache.conf: load mod_unixd module in apache 2.4

From: Jacob Keller <jacob.kel...@gmail.com> Since 2.4, apache will fail to load unless mod_unixd is loaded in order to drop privileges. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- I am not sure why this wasn't there already, but I am unable to run httpd 2.4.18 without i

[PATCH v3 2/2] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

Re: [PATCH v2] git: submodule honor -c credential.* from command line

On Wed, Feb 24, 2016 at 11:11 PM, Jeff King wrote: > static int clone_submodule(const char *path, const char *gitdir, const char > *url, >const char *depth, const char *reference, int > quiet) > { > @@ -145,7 +166,7 @@ static int

Re: [PATCH v2] git: submodule honor -c credential.* from command line

On Wed, Feb 24, 2016 at 11:11 PM, Jeff King wrote: > On Thu, Feb 25, 2016 at 02:00:36AM -0500, Jeff King wrote: > >> I think something like this would work: >> [...] >> but it does not seem to pass with your patch (even after I fixed up the >> weird "local" thing). I think the

Re: [PATCH v2] git: submodule honor -c credential.* from command line

On Wed, Feb 24, 2016 at 10:23 PM, Jeff King <p...@peff.net> wrote: > On Wed, Feb 24, 2016 at 10:19:05PM -0800, Jacob Keller wrote: > >> >> + /* combined all the values before we quote them */ >> > >> > Comment repeats what the c

Re: [PATCH v2] git: submodule honor -c credential.* from command line

On Wed, Feb 24, 2016 at 5:41 PM, Jeff King <p...@peff.net> wrote: > On Wed, Feb 24, 2016 at 03:59:12PM -0800, Jacob Keller wrote: > >> +int sanitize_submodule_config(const char *var, const char *value, void >> *data) >> +{ >> + struct strbuf quoted = STRB

Re: [PATCH v2] git: submodule honor -c credential.* from command line

On Wed, Feb 24, 2016 at 4:27 PM, Eric Sunshine wrote: >> --- >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c >> @@ -255,6 +255,61 @@ static int module_clone(int argc, const char **argv, >> const char *prefix) >> +/* Rules to sanitize

Re: using git-diff as a diff replacement?

On Wed, Feb 24, 2016 at 6:38 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Feb 25, 2016 at 5:21 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Hey, >> >> I know that running "git diff " when outside a git >> project will result in a norm

Re: Rebase performance

On Wed, Feb 24, 2016 at 2:09 PM, Christian Couder wrote: > Hi, > Another possibility would be to libify the "git apply" functionality > and then to use the libified "git apply" in run_apply() instead of > launching a separate "git apply" process. One benefit from this

[PATCH v2] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

Re: [PATCH] git: submodule honor -c credential.* from command line

On Wed, Feb 24, 2016 at 3:36 PM, Junio C Hamano <gits...@pobox.com> wrote: > Stefan Beller <sbel...@google.com> writes: > >> On Wed, Feb 24, 2016 at 12:09 PM, Jacob Keller <jacob.e.kel...@intel.com> >> wrote: >>> From: Jacob Keller <jacob.kel..

Re: [PATCH] git: submodule honor -c credential.* from command line

Hi, On Wed, Feb 24, 2016 at 3:27 PM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Feb 24, 2016 at 12:09 PM, Jacob Keller <jacob.e.kel...@intel.com> > wrote: >> From: Jacob Keller <jacob.kel...@gmail.com> >> Add a git submodule--helper fu

[PATCH] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

using git-diff as a diff replacement?

Hey, I know that running "git diff " when outside a git project will result in a normal diff being run. I happen to prefer the diff algorithm and diff output of "git diff" but there does not seem to be a way to have this behavior from within a git tree. Is there a way to pass an option to

[PATCH] git: submodule honor -c credential.* from command line

From: Jacob Keller <jacob.kel...@gmail.com> Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

On Sun, Feb 21, 2016 at 8:19 PM, Junio C Hamano wrote: > If you are OK with accepting a patch application to a tree with the > same blobs the diff was taken from, then the format-patch output > already has all the necessary information. For each "diff --git" > part, there is

Re: [PATCH] submodule: Fetch the direct sha1 first

On Fri, Feb 19, 2016 at 1:13 PM, Junio C Hamano wrote: >> Regarding performance, the first fetch should fail quite fast iff the fetch >> fails and then continue with the normal fetch. In case the first fetch works >> fine getting the exact sha1, the fetch should be faster than

Re: git submodule should honor "-c credential.helper" command line argument

On Fri, Feb 19, 2016 at 9:33 AM, Junio C Hamano wrote: > Jeff King writes: > >> That being said, I am not sure this is the right solution. In the thread >> I linked earlier[1], Jens indicated he would prefer not to blindly share >> config with the submodules,

Re: git submodule should honor "-c credential.helper" command line argument

On Thu, Feb 18, 2016 at 11:46 PM, Jeff King wrote: > To trigger a credential fetch in actual use, you have to clone over > http. See the credential tests in t5550, for example. > I'll look at these. >> As for how to whitelist config to share with the submodule I am really >> not

Re: git submodule should honor "-c credential.helper" command line argument

On Thu, Feb 18, 2016 at 8:30 PM, Jeff King <p...@peff.net> wrote: > On Thu, Feb 18, 2016 at 05:15:54PM -0800, Jacob Keller wrote: > >> I am looking at this more and I am stuck as to how best to provide a >> test case. >> >> I think the problem as stated above is

Re: git submodule should honor "-c credential.helper" command line argument

On Sun, Feb 7, 2016 at 7:44 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Sun, Feb 7, 2016 at 5:48 AM, Marc Strapetz <marc.strap...@syntevo.com> > wrote: >> On 07.02.2016 05:41, Jacob Keller wrote: >>> >>> On Wed, Feb 3, 2016 at 3:44 PM, Jacob

Re: failed submodule update re-run results in no checked out files?

On Wed, Feb 17, 2016 at 4:15 PM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Feb 17, 2016 at 3:54 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Hi, >> >> I am having an issue currently when using Git with a remote server >> which has a limited n

failed submodule update re-run results in no checked out files?

Hi, I am having an issue currently when using Git with a remote server which has a limited number of ssh connections. The ssh server sometimes closes connections due to too many concurrent connections. I will get the following output from git in this case when performing a submodule update of a

Re: [PATCHv9 4/6] git submodule update: have a dedicated helper for cloning

On Wed, Feb 10, 2016 at 9:49 AM, Stefan Beller wrote: > Do you mean the separate bug fix patch as proposed by Jonathan or > this patch in general helps your idea of passing settings? > > Thanks, > Stefan This patch in general, I think. I didn't mean to reply to the whole

Re: [PATCHv9 4/6] git submodule update: have a dedicated helper for cloning

On Tue, Feb 9, 2016 at 12:54 PM, Stefan Beller wrote: > This introduces a new helper function in git submodule--helper > which takes care of cloning all submodules, which we want to > parallelize eventually. > > Some tests (such as empty URL, update_mode=none) are required in

Re: git submodule should honor "-c credential.helper" command line argument

On Sun, Feb 7, 2016 at 5:48 AM, Marc Strapetz <marc.strap...@syntevo.com> wrote: > On 07.02.2016 05:41, Jacob Keller wrote: >> >> On Wed, Feb 3, 2016 at 3:44 PM, Jacob Keller <jacob.kel...@gmail.com> >> wrote: >>> >>> Ok so I am not sure we e

Re: git submodule should honor "-c credential.helper" command line argument

On Wed, Feb 3, 2016 at 3:44 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > Ok so I am not sure we even really need to use "-c" option in > git-clone considering that we can just use the same flow we do for > setting core.worktree values. I'll propose a patch with you t

Re: git submodule should honor "-c credential.helper" command line argument

On Tue, Feb 2, 2016 at 8:25 PM, Jeff King wrote: > On Tue, Feb 02, 2016 at 06:13:14PM +0100, Marc Strapetz wrote: > >> git -c credential.helper=helper submodule update --init submodule >> >> does not invoke "helper", but falls back to the default strategies. >> When configuring in

Re: git submodule should honor "-c credential.helper" command line argument

On Tue, Feb 2, 2016 at 8:25 PM, Jeff King wrote: > I think the problem is that when git "switches" to working in the > submodule repository, it clears the environment, which includes any "-c" > command switches. This makes sense for some situations, but not for > others. This

[PATCH v2] notes: allow merging from arbitrary references

From: Jacob Keller <jacob.kel...@gmail.com> Create a new expansion function, expand_loose_notes_ref which will first check whether the ref can be found using get_sha1. If it can't be found then it will fallback to using expand_notes_ref. The content of the strbuf will not be changed if the

[PATCH] notes: allow merging from arbitrary references

From: Jacob Keller <jacob.kel...@gmail.com> Create a new expansion function, expand_loose_notes_ref which will first check whether the ref can be found using get_sha1. If it can't be found then it will fallback to using expand_notes_ref. The content of the strbuf will not be changed if the

Re: [PATCH] notes: allow merging from arbitrary references

On Mon, Dec 28, 2015 at 3:42 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Create a new expansion function, expand_loose_notes_ref which will first &

Re: [PATCH] completion: fix completing unstuck email alias arguments

On Fri, Dec 11, 2015 at 4:18 PM, SZEDER Gábor wrote: > Completing unstuck form of email aliases doesn't quite work: > > $ git send-email --to > alice bob cecil > $ git send-email --to a > alice bob cecil > Woops. Is it possible to add a test for this case?

Re: [PATCH] notes: allow merging from arbitrary references

On Fri, Dec 11, 2015 at 11:47 AM, Junio C Hamano wrote: > I'll discard the topic for now, expecting the resurrection sometime > later. > Hi, Yes I fully intend to work this against master once I have some time again. It may be a few weeks as I am extra busy for the holidays,

Re: [PATCH] notes: allow merging from arbitrary references

On Tue, Nov 24, 2015 at 3:42 PM, Jeff King <p...@peff.net> wrote: > On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote: > >> On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: >> >> > --- >> > I do not remember what version this was sin

[PATCH v2] notes: allow merging from arbitrary references

From: Jacob Keller <jacob.kel...@gmail.com> Create a new expansion function, expand_loose_notes_ref which will first check whether the ref can be found using get_sha1. If it can't be found then it will fallback to using expand_notes_ref. The content of the strbuf will not be changed if the

[PATCH v4 2/2] completion: add support for completing email aliases

From: Jacob Keller <jacob.kel...@gmail.com> Using the new --dump-aliases option from git-send-email, add completion for --to, --cc, --bcc, and --from with the available configured aliases. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- Notes: - v2 * Use gi

[PATCH v4 1/2] sendemail: teach git-send-email to dump alias names

From: Jacob Keller <jacob.kel...@gmail.com> Add an option "--dump-aliases" which changes the default behavior of git-send-email. This mode will simply read the alias files configured by sendemail.aliasesfile and sendemail.aliasfiletype and dump a list of all configured alias

Re: Local git repository url

On Thu, Nov 19, 2015 at 3:06 AM, Konstantin Khomoutov wrote: > On Thu, 19 Nov 2015 10:48:51 + > "Vambara, JayaPrakash (Infosys)" > wrote: > >> I am trying to setup a local git repository and manage it from local >> Jenkins set-up. So,

Re: [BUG] --bare is ignored before command word

On Wed, Nov 18, 2015 at 9:20 AM, Ronny Borchert wrote: > I was trying to clone a bare repository. Not sure why I did, maybe > description on website was wrong. > My try: > > git --bare clone https://github. > > This was leading in creating a none bare repository! No error or

Re: [PATCH] notes: allow merging from arbitrary references

On Wed, Nov 18, 2015 at 2:29 PM, Johan Herland <jo...@herland.net> wrote: > On Mon, Nov 16, 2015 at 8:41 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> The main other issue is how to get notes DWIM things to work for all >> cases where we want to use notes ref

[PATCH v4 2/2] completion: add support for completing email aliases

From: Jacob Keller <jacob.kel...@gmail.com> Using the new --dump-aliases option from git-send-email, add completion for --to, --cc, --bcc, and --from with the available configured aliases. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- Notes: - v2 * Use gi

[PATCH v4 1/2] sendemail: teach git-send-email to dump alias names

From: Jacob Keller <jacob.kel...@gmail.com> Add an option "--dump-aliases" which changes the default behavior of git-send-email. This mode will simply read the alias files configured by sendemail.aliasesfile and sendemail.aliasfiletype and dump a list of all configured alias

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Tue, Nov 17, 2015 at 4:26 AM, SZEDER Gábor wrote: > > Quoting Eric Sunshine : > >> On Tue, Nov 17, 2015 at 12:10:35AM +, Keller, Jacob E wrote: >>> >>> On Mon, 2015-11-16 at 18:50 -0500, Eric Sunshine wrote: >>> > It should be possible to extract

Re: [PATCH v2 1/2] sendemail: teach git-send-email to list aliases

On Mon, Nov 16, 2015 at 11:20 PM, Eric Sunshine wrote: > Since git-send-email.perl already configures GetOpt::Long with the > 'pass_through' option, one possibility would be to invoke > GetOptions() once for --list-aliases (or --dump-aliases), and then > again for the

Re: [PATCH v3 1/2] sendemail: teach git-send-email to dump alias names

On Tue, Nov 17, 2015 at 12:07 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Nov 16, 2015 at 7:29 PM, Jacob Keller <jacob.e.kel...@intel.com> > wrote: >> Add an option "dump-aliases" which changes the default behavior of > > It would be

Re: [PATCH] notes: allow merging from arbitrary references

On Sun, Nov 15, 2015 at 11:55 PM, Johan Herland wrote: > Additionally, if we suspect that passing non-notes trees to read-only > operations will be a common error, we could add a simple heuristic to > the notes code, to warn (or even abort) if we strongly suspect that we > are

[PATCH v3 1/2] sendemail: teach git-send-email to dump alias names

From: Jacob Keller <jacob.kel...@gmail.com> Add an option "dump-aliases" which changes the default behavior of git-send-email. This mode will simply read the alias files configured by sendemail.aliasesfile and sendemail.aliasfiletype and dump a list of all configured alias

[PATCH v3 2/2] completion: add support for completing email aliases

From: Jacob Keller <jacob.kel...@gmail.com> Using the new --dump-alias-names option from git-send-email, add completion for --to, --cc, and --bcc with the available configured aliases. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- Notes: - v2 * Use git-send-email

[PATCH v2 1/2] sendemail: teach git-send-email to list aliases

From: Jacob Keller <jacob.kel...@gmail.com> Add an option "list-aliases" which changes the default behavior of git-send-email. This mode will simply read the alias files configured by sendemail.aliasesfile and sendemail.aliasfiletype and print a list of all known aliases. The

[PATCH v2 2/2] completion: add support for completing email aliases

From: Jacob Keller <jacob.kel...@gmail.com> Using the new --list-aliases option from git-send-email, add completion for --to, --cc, and --bcc with the available configured aliases. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- Notes: - v2 * reuse parsing from gi

Re: [PATCH] notes: allow merging from arbitrary references

On Sun, Nov 15, 2015 at 2:14 PM, Johan Herland wrote: >> --- >> I do not remember what version this was since it has been an age ago >> that I sent the previous code. This is mostly just a rebase onto current >> next. I believe I have covered everything previous reviewers

Re: [PATCH RFC] completion: add support for completing email aliases

On Fri, Nov 13, 2015 at 4:55 PM, SZEDER Gábor <sze...@ira.uka.de> wrote: > > Hi, > > Quoting Jacob Keller <jacob.e.kel...@intel.com>: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Extract email aliases from the sendemail.aliasesfile a

[PATCH] notes: allow merging from arbitrary references

From: Jacob Keller <jacob.kel...@gmail.com> Create a new expansion function, expand_loose_notes_ref which will expand any ref using get_sha1, but falls back to expand_notes_ref if this fails. The contents of the strbuf will be either the hex string of the sha1, or the expanded not

[PATCH RFC] completion: add support for completing email aliases

From: Jacob Keller <jacob.kel...@gmail.com> Extract email aliases from the sendemail.aliasesfile according to the known types. Implementation only extracts the alias name and does not attempt to complete email addresses. Add a few tests for simple layouts of the currently supported

Re: Replicating the default "git log" format with a format string.

On Thu, Nov 12, 2015 at 9:38 PM, Jeff King wrote: >> Is it possible to exactly replicate the default "git log" format with a >> format string? > > Sadly, no, I don't think it is possible with the current format > specifiers. It would be nice if it was, though. > > -Peff > -- Isn't

Re: [off topic] xkcd

On Fri, Oct 30, 2015 at 12:33 PM, Duy Nguyen wrote: > We are on xkcd! We're famous now! /me goes hide > > https://xkcd.com/1597/ > -- > Duy > -- I wonder how many of us are the phone number in git.txt ;) -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: How to rebase when some commit hashes are in some commit messages

On Tue, Oct 13, 2015 at 6:29 AM, Philip Oakley wrote: > My tuppence is that the only sha1's that could/would be rewritten would be > those for the commits within the rebase. During rebasing it is expected that > the user is re-adjusting things for later upstream consumption,

Re: How to rebase when some commit hashes are in some commit messages

On Tue, Oct 13, 2015 at 12:24 PM, Philip Oakley wrote: > IIUC (as an alternate example), in G4W one can submit a (long) pull request > with internal back references that would be merged directly, so the sha1's > could be updated as Francois-Xavier originally asked. I have a

Re: Exclude a file from a pull request‏

On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab wrote: > Rudy YAYON writes: > >> My concern is that one important file (Puppetfile) needs to be pushed to >> my remote repository so I can check the changes I commited. >> To do that, I need

Re: [PATCH] notes: allow merging from arbitrary references

On Thu, Oct 1, 2015 at 3:39 PM, Jacob Keller <jacob.e.kel...@intel.com> wrote: > From: Jacob Keller <jacob.kel...@gmail.com> > > Create a new expansion function, expand_loose_notes_ref which will > expand any ref using get_sha1, but falls back to expand_notes_ref if &g

Re: Clarification on Submodule/Subproject naming

On Tue, Oct 6, 2015 at 3:00 PM, Stefan Beller wrote: > So a discussing started in a Gerrit change [1] if we want to name it > submodule or subproject. > We decided to stick with the git core convention of naming it > subproject for now. > > But that lead me to the question:

Re: git interactive rebase bug?

On Mon, Oct 5, 2015 at 11:53 PM, Matthieu Moy <matthieu@grenoble-inp.fr> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> I've been experiencing a very annoying bug when performing interactive >> rebases. The rebase process will stall after I close the

Re: git interactive rebase bug?

On Mon, Oct 5, 2015 at 4:03 PM, Junio C Hamano wrote: > Platform, editor, terminal emulator, specifics? > I run ssh to a tmux terminal emulator and run vim, I normally see this when my local client is a windows machine running putty. After I close the editor it just hangs. and

git interactive rebase bug?

Hey, I've been experiencing a very annoying bug when performing interactive rebases. The rebase process will stall after I close the editor, and I have to kill the process and then restart the rebase using "git rebase --continue" I am not sure how to debug this further. Suggestions are welcome.

Re: git interactive rebase bug?

On Mon, Oct 5, 2015 at 3:39 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > Hey, > > I've been experiencing a very annoying bug when performing interactive > rebases. The rebase process will stall after I close the editor, and I > have to kill the process and then restart

Re: Git feature request: mark a commit as minor

On Fri, Oct 2, 2015 at 11:44 PM, Felipe Micaroni Lalli wrote: > Actually we already use the keyword MINOR for that, exactly as you said. > > The suggestion was made because I think it is a common behavior and it > would be nice to be a meta info to standardize this (today

Re: Git feature request: mark a commit as minor

On Fri, Oct 2, 2015 at 2:38 PM, Felipe Micaroni Lalli wrote: > A minor change (also called "cosmetic") usually is a typo fix, doc > improvement, a little code refactoring that don't change the behavior etc. > > In Wikipedia we can mark an edition as "minor". > > It would

<    4   5   6   7   8   9   10   11   >