[PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-17 Thread David Aguilar
Meld 3.16.0 requires a "=" in the --output argument, as it uses a simple hand-rolled command-line parser. Newer versions of Meld (3.16.4, and possibly earlier) use optpaarse, which accepts either "--output " or "--output=". Use "--output=" for better compatibility. Signed-off-by: David Aguilar

Re: [PATCHv5 1/2] clone: respect additional configured fetch refspecs during initial fetch

2017-06-17 Thread Jeff King
On Fri, Jun 16, 2017 at 07:38:48PM +0200, SZEDER Gábor wrote: > +void add_and_parse_fetch_refspec(struct remote *remote, const char *refspec) > +{ > + struct refspec *rs; > + > + add_fetch_refspec(remote, refspec); > + rs = parse_fetch_refspec(1, &refspec); > + REALLOC_ARRAY(remote

Re: [RFC/PATCH 0/5] remote: eliminate remote->{fetch,push}_refspec and lazy parsing of refspecs

2017-06-17 Thread Jeff King
On Fri, Jun 16, 2017 at 09:28:32PM +0200, SZEDER Gábor wrote: > 'struct remote' stores refspecs twice: once in their original string > form in remote->{fetch,push}_refspecs and once in their parsed form in > remote->{fetch,push}. This is necessary, because we need the refspecs > for lazy parsing

Re: [PATCH v2 3/4] sha1_file: consolidate storage-agnostic object fns

2017-06-17 Thread Jeff King
On Thu, Jun 15, 2017 at 10:50:46AM -0700, Junio C Hamano wrote: > > if (!find_pack_entry(real, &e)) { > > /* Most likely it's a loose object. */ > > - if (!sha1_loose_object_info(real, oi, flags)) { > > + if (oi && !sha1_loose_object_info(real, oi, flags)) { > >

Re: [RFC/PATCH 0/5] remote: eliminate remote->{fetch,push}_refspec and lazy parsing of refspecs

2017-06-17 Thread SZEDER Gábor
On Fri, Jun 16, 2017 at 11:55 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> 'struct remote' stores refspecs twice: once in their original string >> form in remote->{fetch,push}_refspecs and once in their parsed form in >> remote->{fetch,push}. This is necessary, because we need the refsp

Re: [RFC/PATCH 0/5] remote: eliminate remote->{fetch,push}_refspec and lazy parsing of refspecs

2017-06-17 Thread Jeff King
On Sat, Jun 17, 2017 at 02:25:39PM +0200, SZEDER Gábor wrote: > >> - The same information is stored twice, wasting memory. > > > > True (but a few hundred bytes is nothing among friends ;-) > > Indeed. Even in my repos with close to 10k remotes the amount of > memory wasted by the duplicated r

Re: [PATCH] mergetools/meld: improve backwards-compatibiilty when using "--output"

2017-06-17 Thread Samuel Lijin
On Sat, Jun 17, 2017 at 6:24 AM, David Aguilar wrote: > Meld 3.16.0 requires a "=" in the --output argument, as it uses > a simple hand-rolled command-line parser. > > Newer versions of Meld (3.16.4, and possibly earlier) use > optpaarse, which accepts either "--output " or > "--output=". Do olde

git merge workflow save changes

2017-06-17 Thread Gernot Pokorny
https://stackoverflow.com/questions/44606858/git-merge-workflow-save-changes

Re: Subject: [PATCH] config: mark a file-local symbol as static

2017-06-17 Thread Sahil Dua
Hi Ramsay, Thanks for noticing. I will squash this into the relevant patch. Also, git_config_copy_section_in_file() and refs_copy_existing_ref() don't need to be available in public API. Regards Sahil Dua Graduate Software Developer Booking.com Connect on LinkedIn www.sahildua.com On Thu, Jun 1

Re: Subject: [PATCH] config: mark a file-local symbol as static

2017-06-17 Thread Sahil Dua
On Sat, Jun 17, 2017 at 11:40 PM, Sahil Dua wrote: > Hi Ramsay, > > Thanks for noticing. I will squash this into the relevant patch. > > Also, git_config_copy_section_in_file() and refs_copy_existing_ref() > don't need to be available in public API. I noticed that git_config_copy_section_in_file()

[PATCH v2 0/3] add stash count information to git-status command

2017-06-17 Thread Liam Beguin
As discussed here [*1*], this allows `git status` to show the number of entries currently stashed away. I also tried to update the related parts of the documentation to use 'stash entry' instead of 'stash' as we agreed that it was a bit better. *1* https://public-inbox.org/git/ca+b9myhrahtd+fdgz

[PATCH v2 2/3] status: add optional stash count information

2017-06-17 Thread Liam Beguin
Introduce '--show-stash' and its configuration option 'status.showStash' to allow git-status to show information about currently stashed entries. Signed-off-by: Liam Beguin --- Documentation/config.txt | 5 + Documentation/git-status.txt | 3 +++ builtin/commit.c | 6 +

[PATCH v2 3/3] glossary: define 'stash entry'

2017-06-17 Thread Liam Beguin
Signed-off-by: Liam Beguin --- Documentation/glossary-content.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 6e991c246915..b71b943b12ed 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/g

[PATCH v2 1/3] stash: update documentation to use 'stash entry'

2017-06-17 Thread Liam Beguin
Most of the time, a 'stash entry' is called a 'stash'. Lets try to make this more consistent and use 'stash entry' instead. Signed-off-by: Liam Beguin --- Documentation/config.txt | 6 ++--- Documentation/git-pull.txt | 2 +- Documentation/git-rebase.txt | 2 +- Documentation/git-stash.

Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper

2017-06-17 Thread Liam Beguin
Hi Johannes, On 16/06/17 09:56 AM, Johannes Schindelin wrote: > Hi Liam, > > On Thu, 15 Jun 2017, Liam Beguin wrote: > >> On 14/06/17 09:08 AM, Johannes Schindelin wrote: >>> diff --git a/sequencer.c b/sequencer.c >>> index a697906d463..a0e020dab09 100644 >>> --- a/sequencer.c >>> +++ b/sequenc