Re: [PATCH 2/2] refs_resolve_ref_unsafe: handle d/f conflicts for writes

On 10/07/2017 06:36 AM, Michael Haggerty wrote: > On 10/06/2017 07:16 PM, Jeff King wrote: >> On Fri, Oct 06, 2017 at 07:09:10PM +0200, Michael Haggerty wrote: >> >>> I do have one twinge of uneasiness at a deeper level, that I haven't had >>> time to check... >>> >>> Does this patch make it

Re: [PATCH 1/3] notes: move hex_to_bytes() to hex.c and export it

On Tue, Oct 31, 2017 at 02:46:49PM +0100, René Scharfe wrote: > Make the function for converting pairs of hexadecimal digits to binary > available to other call sites. > > Signed-off-by: Rene Scharfe > --- > cache.h | 7 +++ > hex.c | 12 > notes.c | 17

Re: git grep -P fatal: pcre_exec failed with error code -8

On Sun, Nov 05, 2017 at 01:06:21AM +0100, Дилян Палаузов wrote: > with git 2.14.3 linked with libpcre.so.1.2.9 when I do: > git clone https://github.com/django/django > cd django > git grep -P "if.*([^\s])+\s+and\s+\1" >

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Sat, Nov 04, 2017 at 07:36:43PM +0100, Simon Ruderich wrote: > On Fri, Nov 03, 2017 at 03:13:10PM -0400, Jeff King wrote: > > I think we've been gravitating towards error strbufs, which would make > > it something like: > > I like this approach to store the error in a separate variable > and

Re: [PATCH 5/6] t0021/rot13-filter: add capability functions

Christian Couder writes: >>> + my ( $res, $buf ) = packet_bin_read(); >>> + return ( $res, @cap ) if ( $res != 0 ); >> >> The original had the same "'list eq list' does not do what you may >> think it does" issue. This one corrects it, which

Re: [PATCH v1 2/2] log: add option to choose which refs to decorate

Rafael Ascensão writes: >>> The pattern follows similar rules as `--glob` except it doesn't assume a >>> trailing '/*' if glob characters are missing. >> >> Why should this be a special case that burdens users to remember one >> more rule? Wouldn't users find

Re: [PATCH] l10n: es.po: fix typos

On Sat, Nov 04, 2017 at 08:20:44PM -0300, Gaston Gonzalez wrote: Thank you, applied to my personal 2.15-next branch, I'll work on other fixes and send a bigger chunk to main repo. Regards

git grep -P fatal: pcre_exec failed with error code -8

Hello, with git 2.14.3 linked with libpcre.so.1.2.9 when I do: git clone https://github.com/django/django cd django git grep -P "if.*([^\s])+\s+and\s+\1" django/contrib/admin/static/admin/js/vendor/select2/select2.full.min.js the output is: fatal: pcre_exec failed with error code -8

[PATCH] l10n: es.po: fix typos

Fix some typos in the spanish translation. Signed-off-by: Gaston Gonzalez --- po/es.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/es.po b/po/es.po index 89a2dc014..43251cbc9 100644 --- a/po/es.po +++ b/po/es.po @@ -4746,7 +4746,7 @@ msgstr

Re: [PATCH v1 1/2] refs: extract function to normalize partial refs

On Sat, Nov 04, 2017 at 11:27:39AM +0900, Junio C Hamano wrote: > I however notice that addition of /* to the tail is trying to be > careful by using strbuf_complete('/'), but prefixing with "refs/" > does not and we would end up with a double-slash if pattern begins > with a slash. The contract

Re: [PATCH 6/7] builtin/describe.c: describe a blob

From: "Junio C Hamano" Sent: Thursday, November 02, 2017 4:23 AM Junio C Hamano writes: The reason why we say "-ish" is "Yes we know v2.15.0 is *NOT* a commit object, we very well know it is a tag object, but because we allow it to be used in a context

Re: How to resolve mixture of modified and deleted conflicts easily in git?

From: "Robert Dailey" When doing a rebase, sometimes I will get `DU` and `UU` conflicts (locally deleted and locally modified, respectively). Furthermore, in some of these cases, I want to take "ours" for all conflicts, including ones where the local file is deleted.

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Fri, Nov 03, 2017 at 03:13:10PM -0400, Jeff King wrote: > I think we've been gravitating towards error strbufs, which would make > it something like: I like this approach to store the error in a separate variable and let the caller handle it. This provides proper error messages and is cleaner

[PATCH] Git-cvsimport Improvement

Greetings, I am attempting to improve CVS -> CVSps -> Git-cvsimport process. The part involving Git-cvsimport has to do with parsing of CVSps PatchSet file. Consider what happens if a CVS log/commit message includes lines which start with "Members:", say from copy-and-paste [2]. To avoid this

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

On Fri, Nov 3, 2017 at 6:20 PM, Johannes Schindelin wrote: > Hi Orgad, > > On Fri, 3 Nov 2017, Johannes Schindelin wrote: > >> On Thu, 2 Nov 2017, Orgad Shaneh wrote: >> >> > I can't reproduce this with a minimal example, but it happens in my >> > project. > > Whoa, I

Re: Git Open Source Weekend London 11th/12th November

From: "Jeff King" On Wed, Nov 01, 2017 at 04:36:24PM +, Thomas Gummerer wrote: Normally attendees work in small groups on a specific task to prevent anyone from getting stuck. Per usual, Bloomberg will provide the venue, mentors, snacks and drinks. Bring your enthusiasm

[PATCH] fix typos in 2.15.0 release notes

Signed-off-by: Jean Carlo Machado --- Documentation/RelNotes/2.15.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt index 248ba70c3..cdd761bcc 100644 ---

[no subject]

I hope it's right this time. :)

Re: [PATCH 3/4] remote-mediawiki: show known namespace choices on failure

On Sun, Oct 29, 2017 at 12:08:56PM -0400, Antoine Beaupré wrote: > if we fail to find a requested namespace, we should tell the user > which ones we know about, since we already do. this allows users to > feetch all namespaces by specifying a dummy namespace, failing, then > copying the list of

Re: [PATCH v3 7/7] remote-mediawiki: show progress while fetching namespaces

On Thu, Nov 02, 2017 at 07:10:17PM -0400, Antoine Beaupré wrote: > Actually, is there a standard way to do this in git with Perl > extensions? I know about "option verbosity N" but how should I translate > this into Perl? Carp? Warn? Log::Any? Log4perl? No, not really. From a quick glance at

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Sat, Nov 04, 2017 at 10:05:43AM +0100, René Scharfe wrote: > >> How about *not* printing the error at the place where you notice the > >> error, and instead return an error code to the caller to be noticed > >> which dies with an error message? > > > > That ends up giving less-specific

Re: Git Open Source Weekend London 11th/12th November

On Wed, Nov 01, 2017 at 04:36:24PM +, Thomas Gummerer wrote: > Normally attendees work in small groups on a specific task to > prevent anyone from getting stuck. Per usual, Bloomberg will > provide the venue, mentors, snacks and drinks. Bring your > enthusiasm (and your laptop!) and come

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

Am 03.11.2017 um 20:13 schrieb Jeff King: > On Fri, Nov 03, 2017 at 10:44:08PM +0900, Junio C Hamano wrote: > >> Simon Ruderich writes: >> >>> I tried looking into this by adding a new write_file_buf_gently() >>> (or maybe renaming write_file_buf to write_file_buf_or_die) and

Re: [PATCH 2/3] http-push: use hex_to_bytes()

Am 01.11.2017 um 23:15 schrieb Jeff King: > On Wed, Nov 01, 2017 at 10:59:49PM +0100, René Scharfe wrote: > >>> The hex_to_bytes() function requires that the caller make sure they have >>> the right number of bytes. But for many callers, I think they'd want to >>> say "parse this oid, which might

Re: [PATCH 5/6] t0021/rot13-filter: add capability functions

On Sun, Oct 22, 2017 at 3:46 AM, Junio C Hamano wrote: > Christian Couder writes: > >> Add functions to help read and write capabilities. >> These functions will be reused in following patches. > > One more thing that is more noteworthy (read: do

Re: [PATCH v1 2/2] log: add option to choose which refs to decorate

On 04/11/17 03:49, Junio C Hamano wrote: Rafael Ascensão writes: Using `--exclude=` can help mitigate that verboseness by removing unnecessary 'branches' from the output. However, if the tip of an excluded ref points to an ancestor of a non-excluded ref, git will

Re: [PATCH v1 1/2] refs: extract function to normalize partial refs

On 04/11/17 02:27, Junio C Hamano wrote: Rafael Ascensão writes: Signed-off-by: Kevin Daudt Signed-off-by: Rafael Ascensão Could you explain Kevin's sign-off we see above? It is a bit unusual (I am not yet saying it is wrong---I