Unexpected behaviour after removing submodule

Hi, At work, we use a lot of submodules (several levels of submodules actually). As we also work with development branches, we use scripts to resync the whole checked-out tree (mainly in automated integration) We recently run across an issue where a branch (dev) contained a submodule while it

Re: Unexpected behaviour after removing submodule

On 26/10/12 00:47, Jens Lehmann wrote: Am 25.10.2012 17:06, schrieb Nicolas Morey-Chaisemartin: At work, we use a lot of submodules (several levels of submodules actually). As we also work with development branches, we use scripts to resync the whole checked-out tree (mainly in automated

[BUG] Wrong worktree path when using multiple worktree

Hi, There seem to be an issue with the path computed for a worktree when multiple worktree were created (using git worktree) In my Setup, I have 3 repos: A/repo (main One) A/repo-patches (worktree, using branch dev) B/repo (worktree, using branch next) I'm working in A/repo-patches an run: $

Re: [RFC 0/3] imap-send curl tunnelling support

Ping. I'd like to get feedback from Windows developer on patch #2 Patch#3 will probably need some updates as I expected Jeff old curl drop patches to make it in. As it seems to be going another way a few more ifdefs will be required Nicolas Le 09/08/2017 à 16:43, Nicolas Morey-Chaisemartin

[PATCH] stash: clean untracked files before reset

and the call git clean, leaving the file untouched. This causes git stash pop to fail due to the file existing. This patch simply switches the order between cleaning and resetting and adds a test for this usecase. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> Re

Re: git-describe --contains

Le 11/08/2017 à 08:50, Davide Cavallari a écrit : > Please help me understand how this command works. There is one case in the > linux kernel repository that puzzles me. Let's consider patch "drm/i915/ > execlists: Reset RING registers upon resume" [1]. This patch was committed 641 > commits

Re: [RFC] imap-send: escape backslash in password

Le 04/08/2017 à 21:09, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> writes: > >> Password containing backslashes need to have them doubled to have them >> properly interpreted by the imap server. > Please wrap this into li

[RFC] imap-send: escape backslash in password

Password containing backslashes need to have them doubled to have them properly interpreted by the imap server. A password terminating with a blackslash used to trigger this error: IMAP command 'LOGIN ' returned response (BAD) - Missing '"' Signed-off-by: Nicolas Morey-Chaisemartin

[PATCHv2 2/4] imap-send: add wrapper to get server credentials if needed

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/imap-send.c b/imap-send.c index 09f29ea95..448a4a0b3 100644 --- a/imap-send.c +++ b/imap-

[PATCHv2 4/4] imap-send: use curl by default

Now that curl is enable by default, use the curl implementation for imap too. The goal is to validate feature parity between the legacy and the curl implementation, deprecate thee legacy implementation later on and in the long term, hopefully drop it altogether. Signed-off-by: Nicolas Morey

[PATCHv2 0/4] imap-send: Fix and enable curl by default

available Nicolas Morey-Chaisemartin (4): imap-send: return with error if curl failed imap-send: add wrapper to get server credentials if needed imap_send: setup_curl: retreive credentials if not set in config file imap-send: use curl by default imap-send.c | 52

[PATCHv2 1/4] imap-send: return with error if curl failed

curl_append_msgs_to_imap always returned 0, whether curl failed or not. Return a proper status so git imap-send will exit with an error code if womething wrong happened. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 2 +- 1 file changed, 1 ins

[PATCHv2 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Up to this point, the curl mode only supported getting the username and password from the gitconfig file while the legacy mode could also fetch them using the credential API. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 10 --

Re: [PATCHv2 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Le 08/08/2017 à 12:09, Martin Ågren a écrit : > On 8 August 2017 at 09:48, Nicolas Morey-Chaisemartin > <nico...@morey-chaisemartin.com> wrote: >> Up to this point, the curl mode only supported getting the username >> and password from the gitconfig file while the legacy

Re: [PATCH 2/4] http: drop support for curl < 7.16.0

Le 09/08/2017 à 23:17, Jeff King a écrit : > On Wed, Aug 09, 2017 at 08:03:05PM +0200, Nicolas Morey-Chaisemartin wrote: > >>>> -#if LIBCURL_VERSION_NUM >= 0x071700 >>>> -/* Use CURLOPT_KEYPASSWD as is */ >>>> -#elif LIBCURL_VERSION_NU

Re: [PATCH 2/4] http: drop support for curl < 7.16.0

Le 09/08/2017 à 19:40, Junio C Hamano a écrit : > Jeff King writes: > >> -#if LIBCURL_VERSION_NUM >= 0x071700 >> -/* Use CURLOPT_KEYPASSWD as is */ >> -#elif LIBCURL_VERSION_NUM >= 0x070903 >> -#define CURLOPT_KEYPASSWD CURLOPT_SSLKEYPASSWD >> -#else >> -#define CURLOPT_KEYPASSWD

Re: [PATCH 1/4] imap-send: add wrapper to get server credentials if needed

Le 07/08/2017 à 21:42, Jeff King a écrit : > On Mon, Aug 07, 2017 at 07:18:32PM +0200, Martin Ågren wrote: > "cred.username" is checked further down, but now it will always be NULL, no? >>> You're right I missed this. >>> Not sure if this is needed though. >>> From what I understand

[RFC 3/3] imap_send: add support for curl over tunnel

Starting from libcurl 7.21.5, libcurl can be tricked into using an already open socket. This allows to use tunneling with libcurl instead of the legacy imap code. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- Documentation/git-imap-send.txt | 4 ++-- imap-

[RFC 2/3] imap-send: use a socketpair instead of pipe to communicate with the tunnel

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/imap-send.c b/imap-send.c index 10f668eb7..e5ff70096 100644 --- a/imap-send.c +++ b/imap-send.c @@ -929,18 +

[RFC 1/3] imap-send: move tunnel setup to its own function

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 37 ++--- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/imap-send.c b/imap-send.c index b2d0b849b..10f668eb7 100644 --- a/imap-send.c +++ b/imap-

[RFC 0/3] imap-send curl tunnelling support

sy_perform() failed: FTP: weird server reply It appears curl do not support the PREAUTH tag. However a test with "nc imap.server.ext 143" is working fine. Nicolas Morey-Chaisemartin (3): imap-send: move tunnel setup to its own function imap-send: use a socketpair instead of pipe to co

[PATCH 4/4] imap-send: use curl by default

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/imap-send.c b/imap-send.c index 90b8683ed..4ebc16437 100644 --- a/imap-send.c +++ b/imap-send.c @@ -35,13 +35,7 @@ typedef void *SSL; #i

[PATCH 2/4] imap_send: setup_curl: prompt user for username/password if not set in config file

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 1 + 1 file changed, 1 insertion(+) diff --git a/imap-send.c b/imap-send.c index 38b3c817e..682a06551 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1415,6 +1415,7 @@ static CURL *setup_curl(

[PATCH 3/4] imap_send: setup_curl: use server_conf parameter instead of the global variable

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/imap-send.c b/imap-send.c index 682a06551..90b8683ed 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1

Re: [RFC] imap-send: escape backslash in password

Le 04/08/2017 à 23:22, Jeff King a écrit : > On Fri, Aug 04, 2017 at 02:18:13PM -0700, Junio C Hamano wrote: > >>> I also think it might be reasonable to scrap all of this ad-hoc imap >>> code in favor of curl, which already gets these cases right. We already >>> have a curl-backed

[PATCH 1/4] imap-send: add wrapper to get server credentials if needed

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 38 -- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/imap-send.c b/imap-send.c index b2d0b849b..38b3c817e 100644 --- a/imap-send.c +++ b/imap-

Re: [PATCH 3/4] imap_send: setup_curl: use server_conf parameter instead of the global variable

Le 07/08/2017 à 18:34, Martin Ågren a écrit : > On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin > <nico...@morey-chaisemartin.com> wrote: >> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> >> --- >> imap-send.c | 24 +++

Re: [PATCH 1/4] imap-send: add wrapper to get server credentials if needed

Le 07/08/2017 à 18:30, Martin Ågren a écrit : > On 7 August 2017 at 16:03, Nicolas Morey-Chaisemartin > <nico...@morey-chaisemartin.com> wrote: >> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> >> --- >> imap-send.c | 38

Re: [PATCH 4/4] imap-send: use curl by default

Le 07/08/2017 à 18:37, Martin Ågren a écrit : > On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin > <nico...@morey-chaisemartin.com> wrote: >> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> >> --- >> imap-send.c | 6 --

[PATCH v3 0/4] imap-send: Fix and enable curl by default

Changes since v2: Patch 3 reject credit when curl failed: - when a login error is returned (curl >= 7.13.1) - for any curl error in older versions Nicolas Morey-Chaisemartin (4): imap-send: return with error if curl failed imap-send: add wrapper to get server credentials if nee

[PATCH v3 4/4] imap-send: use curl by default

Now that curl is enable by default, use the curl implementation for imap too. The goal is to validate feature parity between the legacy and the curl implementation, deprecate thee legacy implementation later on and in the long term, hopefully drop it altogether. Signed-off-by: Nicolas Morey

[PATCH v3 2/4] imap-send: add wrapper to get server credentials if needed

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/imap-send.c b/imap-send.c index 09f29ea95..448a4a0b3 100644 --- a/imap-send.c +++ b/imap-

[PATCH v3 1/4] imap-send: return with error if curl failed

curl_append_msgs_to_imap always returned 0, whether curl failed or not. Return a proper status so git imap-send will exit with an error code if womething wrong happened. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 2 +- 1 file changed, 1 ins

[PATCH v3 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Up to this point, the curl mode only supported getting the username and password from the gitconfig file while the legacy mode could also fetch them using the credential API. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 18 +++

Re: [RFC 0/3] imap-send curl tunnelling support

This was sadly kind of expected... I need to look for another way to handle this on Windows. Thanks for the test Nicolas Le 22/08/2017 à 19:10, Johannes Sixt a écrit : > Am 21.08.2017 um 09:27 schrieb Nicolas Morey-Chaisemartin: >> (Sent a reply from my phone while out of town but coul

sequencer status

Hi, I've created a small tool to display the current sequencer status. It mimics what Magit does to display what was done and what is left to do. As someone who often rebase large series of patches (also works with am, revert, cherry-pick), I really needed the feature and use this daily. It's

[PATCH v4 1/4] imap-send: return with error if curl failed

curl_append_msgs_to_imap always returned 0, whether curl failed or not. Return a proper status so git imap-send will exit with an error code if something wrong happened. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 2 +- 1 file changed, 1 ins

[PATCH v4 3/4] imap_send: setup_curl: retreive credentials if not set in config file

Up to this point, the curl mode only supported getting the username and password from the gitconfig file while the legacy mode could also fetch them using the credential API. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 18 +++

[PATCH v4 4/4] imap-send: use curl by default when possible

ter on and in the long term, hopefully drop it altogether. Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imap-send.c b/imap-send.c index 7e39993d95..af1e1576bd 100644 --- a/imap-sen

[PATCH v4 2/4] imap-send: add wrapper to get server credentials if needed

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- imap-send.c | 34 -- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/imap-send.c b/imap-send.c index b5e332420a..1b8fbbd545 100644 --- a/imap-send.c +++ b/imap-

[PATCH v4 0/4] imap-send: Fix and enable curl by default

Changes since v3: - Fix return code in patch #1 - Reword patch#4 Nicolas Morey-Chaisemartin (4): imap-send: return with error if curl failed imap-send: add wrapper to get server credentials if needed imap_send: setup_curl: retreive credentials if not set in config file imap-send: use curl

Re: Rebase & submodules

Le 14/09/2017 à 17:39, Robert Dailey a écrit : > So I often will have a submodule that points to one of my own forks, > because I will have work done on a feature branch that hasn't been > merged upstream yet. Assuming this merge takes a long time to get > approved, I will occasionally rebase my

Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)

Le 19/09/2017 à 17:43, Johannes Schindelin a écrit : > > C'mon, don't *try* to misunderstand me. > > Of course there need to be updates as to the state of patch series. > > It's just that mails only go *so* far when you need to connect and > aggregate information. You need the connection between

Re: [PATCHv2] pull: honor submodule.recurse config option

Le 06/09/2017 à 03:17, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> writes: > >> "git pull" supports a --recurse-submodules option but does not parse the >> submodule.recurse configuration item to set the default for th

[PATCHv3 0/2] fix recurse.submodule config for git pull

Changes since v2: - Add a patch that fixes the option parsing order (parse config before cli, not the other way around) - Enhance the tests to check --recurse-submodule and submodule.recurse combinations Nicolas Morey-Chaisemartin (2): pull: fix cli and config option parsing order pull

[PATCHv3 2/2] pull: honor submodule.recurse config option

pull" recursively fetches submodules but does not update them after fetch. Handle submodule.recurse in "git pull" to fix this. Reported-by: Magnus Homann <mag...@homann.se> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- builtin/pull.c

Re: [PATCH 4/4] imap-send: use curl by default

v3 needs just a few bits fixed: - Fix the bads return code in patch #1. - Reword patch #4 was you found confusing. I sent a proposal fix that you probably missed: Is something like this clearer ? Author: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> Date:   Sun Aug 6

Re: [RFC 0/3] imap-send curl tunnelling support

Le 24/08/2017 à 15:53, Jeff King a écrit : > On Thu, Aug 24, 2017 at 10:00:47AM +0200, Nicolas Morey-Chaisemartin wrote: > >>> Yes, I agree. I was hoping when we started this discussion that we were >>> more ready to switch to curl-by-default. But sadly, that isn't clo

Re: [RFC 0/3] imap-send curl tunnelling support

versions. Nicolas Le 16/08/2017 à 14:30, Johannes Schindelin a écrit : > Hi, > > On Tue, 15 Aug 2017, Stefan Beller wrote: > >> On Tue, Aug 15, 2017 at 10:49 AM, Nicolas Morey-Chaisemartin >> <nico...@morey-chaisemartin.com> wrote: >>> Ping. >>> >

Re: [RFC 0/3] imap-send curl tunnelling support

Le 16/08/2017 à 10:34, Jeff King a écrit : > On Wed, Aug 09, 2017 at 04:43:26PM +0200, Nicolas Morey-Chaisemartin wrote: > >> I have a few doubt on patch #2: >> - is socketpair working on all git supported system (windows ?) > I'm pretty sure the answer is no, after sear

Re: Automatically delete branches containing accepted patches?

You could rebase your branches onto the upstream branch. Once all the patches are in, the SHA1 of the rebased branch is somewhere in the history of the upstream master. I use a set of scripts I've written to handle multiple branches: https://github.com/nmorey/git-topic-branches Using namesapce

Re: [PATCH v3 2/4] imap-send: add wrapper to get server credentials if needed

Le 23/08/2017 à 22:13, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> writes: > >> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> >> --- >> imap-send.c | 34

Re: [PATCH v3 4/4] imap-send: use curl by default

Le 23/08/2017 à 22:28, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> writes: > >> Now that curl is enable by default, > s/enable//; > > But it is unclear what the above really means. You certainly do not > mean that [PATC

[RFC 0/3] imap-send curl tunnelling support

Le 23/08/2017 à 23:43, Jeff King a écrit : > On Mon, Aug 21, 2017 at 09:34:19AM +0200, Nicolas Morey-Chaisemartin wrote: > >>>> It appears curl do not support the PREAUTH tag. >>> Too bad. IMHO preauth is the main reason to use a tunnel in the first >>> place

Re: [PATCH v3 1/4] imap-send: return with error if curl failed

Le 23/08/2017 à 22:12, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> writes: > >> curl_append_msgs_to_imap always returned 0, whether curl failed or not. >> Return a proper status so git imap-send will exit with an error code >&g

Re: sequencer status

Le 23/08/2017 à 18:40, Christian Couder a écrit : > Hi, > > On Wed, Aug 23, 2017 at 10:10 AM, Nicolas Morey-Chaisemartin > <nico...@morey-chaisemartin.com> wrote: >> Hi, >> >> I've created a small tool to display the current sequencer status. >> It mimic

Re: sequencer status

Le 23/08/2017 à 19:57, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> writes: > >> Two questions: >> - Could this be a candidate for contrib/ ? >> - Would it be interesting to add the relevant code to sequencer.c >>

Re: sequencer status

Le 24/08/2017 à 11:43, Matthieu Moy a écrit : > Christian Couder writes: > >> It is displaying the steps that have already been performed, right? >> I wonder if people might want more about the current step (but maybe >> that belongs to `git status`) or perhaps the

[PATCHv2] pull: honor submodule.recurse config option

pull" recursively fetches submodules but does not update them after fetch. Handle submodule.recurse in "git pull" to fix this. Reported-by: Magnus Homann <mag...@homann.se> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- Changes since v1:

[PATCH] pull: honor submodule.recurse config option

mag...@homann.se> Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- builtin/pull.c | 5 + 1 file changed, 5 insertions(+) diff --git a/builtin/pull.c b/builtin/pull.c index 7fe281414..e4edf23c5 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -326,6 +326,11 @

Re: [RFC] cover-at-tip

Le 10/11/2017 à 19:22, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: > >> I would need to add "some" level of parsing to am.c to make sure >> the patch content is just garbage and that there are no actual >>

[RFC] cover-at-tip

Hi, I'm starting to look into the cover-at-tip topic that I found in the leftover bits (http://www.spinics.net/lists/git/msg259573.html) Here's a first draft of a patch that adds support for format-patch --cover-at-tip. It compiles and works in my nice and user firnedly test case. Just wanted

Re: [RFC] cover-at-tip

Le 13/11/2017 à 11:30, Junio C Hamano a écrit : > Junio C Hamano <gits...@pobox.com> writes: > >> Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: >> >>> I agree this is a "am" job. Was just wondering if reusing some of >>&g

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

Le 30/11/2017 à 03:04, Jonathan Nieder a écrit : > (+cc: Nicolas) > Hi, > > Doron Behar wrote: > >> I'm trying to send a patch with the command `git imap-send`, I used the >> examples in the manual page as the main reference for my configuration: >> >> ``` >> [imap] >> folder =

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

Le 30/11/2017 à 10:39, Nicolas Morey-Chaisemartin a écrit : > > Le 30/11/2017 à 03:04, Jonathan Nieder a écrit : >> (+cc: Nicolas) >> Hi, >> >> Doron Behar wrote: >> >>> I'm trying to send a patch with the command `git imap-send`, I used the >>

Re: imap-send with gmail: curl_easy_perform() failed: URL using bad/illegal format or missing URL

Le 30/11/2017 à 10:46, Daniel Stenberg a écrit : > On Thu, 30 Nov 2017, Nicolas Morey-Chaisemartin wrote: > >> This is due to the weird "[Gmail]" prefix in the folder. >> I tried manually replacing it with: >>     folder = %5BGmail%5D/Drafts >>

[PATCH] imap-send: URI encode server folder

URI encode the server folder string before passing it to libcurl. This fixes the access to the draft folder on Gmail accounts (named [Gmail]/Drafts) Reported-by: Doron Behar <doron.be...@gmail.com> Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> --- ima

Re: [RFC 2/3] am: semi working --cover-at-tip

Le 14/11/2017 à 10:17, Nicolas Morey-Chaisemartin a écrit : > > Le 14/11/2017 à 07:00, Junio C Hamano a écrit : >> Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: >> >> By the way, don't we want to sanity check state->last (which we >> learn

Re: [RFC] cover-at-tip

Le 10/11/2017 à 11:24, Nicolas Morey-Chaisemartin a écrit : > Hi, > > I'm starting to look into the cover-at-tip topic that I found in the leftover > bits (http://www.spinics.net/lists/git/msg259573.html) > > Here's a first draft of a patch that adds support for format-patch

Re: [RFC 3/3] log: add an option to generate cover letter from a branch tip

Le 14/11/2017 à 14:05, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: > >> The triple dash is so that the diffstat/shortlog as not seen as >> part of the cover letter. As said in the cover letter for this >> series, it

Re: [RFC 1/3] mailinfo: extract patch series id

Le 14/11/2017 à 06:47, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: > >> Extract the patch ID and series length from the [PATCH N/M] >> prefix in the mail header >> >> Signed-off-by: Nicolas Morey-Chaisema

Re: [RFC 3/3] log: add an option to generate cover letter from a branch tip

Le 14/11/2017 à 07:14, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: > >> -const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; >> -const char *msg; >> +const char *body = "*

Re: [RFC 2/3] am: semi working --cover-at-tip

Le 14/11/2017 à 07:00, Junio C Hamano a écrit : > Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> writes: > >> if (!git_config_get_bool("commit.gpgsign", )) >> state->sign_commit = gpgsign ? "" : NULL; >> + >&g

Re: [RFC 0/3] Add support for --cover-at-tip

Le 13/11/2017 à 20:40, Jonathan Tan a écrit : > On Mon, 13 Nov 2017 18:13:27 +0100 > Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.de> wrote: > >> v2: >> - Enhance mailinfo to parse patch series id from subject >> - Detect cover using mailinfo

[RFC 1/3] mailinfo: extract patch series id

Extract the patch ID and series length from the [PATCH N/M] prefix in the mail header Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- mailinfo.c | 35 +++ mailinfo.h | 2 ++ 2 files changed, 37 insertions(+) diff

[RFC 2/3] am: semi working --cover-at-tip

Issue with empty patch detection Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- builtin/am.c | 143 --- 1 file changed, 126 insertions(+), 17 deletions(-) diff --git a/builtin/am.c b/builtin/am.c

[RFC 0/3] Add support for --cover-at-tip

hat. Note: Cover letter automatically generated with --cover-at-tip ;) Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- Nicolas Morey-Chaisemartin (3): mailinfo: extract patch series id am: semi working --cover-at-tip log: add an option to generate c

[RFC 3/3] log: add an option to generate cover letter from a branch tip

TODO: figure out defaults, add a config option, move tip detection to specific function Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com> --- Documentation/git-format-patch.txt | 4 builtin/log.c | 44 +--

Re: [PATCH] tag: add --edit option

Le 01/02/2018 à 11:56, Eric Sunshine a écrit : > On Thu, Feb 1, 2018 at 5:43 AM, Nicolas Morey-Chaisemartin > <nmoreychaisemar...@suse.de> wrote: >> Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit : >>> Le 01/02/2018 à 11:16, Eric Sunshine a écrit : >

Re: [PATCH] tag: add --edit option

Le 01/02/2018 à 11:34, Nicolas Morey-Chaisemartin a écrit : > > Le 01/02/2018 à 11:16, Eric Sunshine a écrit : >> On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin >> <nmoreychaisemar...@suse.com> wrote: >>> Add a --edit option whichs allows modi

Re: [PATCH] tag: add --edit option

Le 01/02/2018 à 11:16, Eric Sunshine a écrit : > On Thu, Feb 1, 2018 at 4:49 AM, Nicolas Morey-Chaisemartin > <nmoreychaisemar...@suse.com> wrote: >> Add a --edit option whichs allows modifying the messages provided by -m or >> -F, >> the same way git commit

Re: [PATCHv2] tag: add --edit option

Le 02/02/2018 à 10:57, Eric Sunshine a écrit : > On Fri, Feb 2, 2018 at 2:15 AM, Nicolas Morey-Chaisemartin > <nmoreychaisemar...@suse.com> wrote: >> Le 02/02/2018 à 02:29, Eric Sunshine a écrit : >>> On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin >&

[PATCHv2] tag: add --edit option

Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> --- Changes since v1: - Fix usage string - Use write_script to generate editor - Rename editor to fake

Re: [PATCHv2] tag: add --edit option

Le 02/02/2018 à 02:29, Eric Sunshine a écrit : > On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin > <nmoreychaisemar...@suse.com> wrote: >> Add a --edit option whichs allows modifying the messages provided by -m or >> -F, >> the same way git commit

Re: [PATCHv2] tag: add --edit option

Le 02/02/2018 à 20:16, Eric Sunshine a écrit : > On Fri, Feb 2, 2018 at 11:48 AM, Nicolas Morey-Chaisemartin > <nmoreychaisemar...@suse.com> wrote: >> What message do you suggest ? As I said in a previous mail, a >> simple "Editor failure, cancelling {c

[PATCH] tag: add --edit option

Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> --- Documentation/git-tag.txt | 6 ++ builtin/tag.c | 11 +-- t/t7004-

Re: [PATCHv4] tag: add --edit option

Please ignore ! v3 with the nits fixed was picked by Junio Le 07/02/2018 à 17:55, Nicolas Morey-Chaisemartin a écrit : > Add a --edit option whichs allows modifying the messages provided by -m or -F, > the same way git commit --edit does. > > Signed-off-by: Nicolas Morey-

Re: "git submodule" vs "git subtree" vs "repo" vs "git subdir" ... ?

Le 13/02/2018 à 14:06, Robert P. J. Day a écrit : > looking for general opinions ... i am (frighteningly :-) teaching a > git course later this week, and one of the topics on the list is git > submodules, which was specifically requested by the client as their > idea of how to start

[PATCHv3] tag: add --edit option

Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> --- Changes since v2 ( https://public-inbox.org/git/e99947cf-93ba-9376-f059-7f6a369d3...@suse.com ):

[PATCHv4] tag: add --edit option

Add a --edit option whichs allows modifying the messages provided by -m or -F, the same way git commit --edit does. Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> --- Fixes since v3 ( https://public-inbox.org/git/88e7c122-599f-4ab1-6d65-c75f7a3ae...@su