Re: [PATCH v4 06/16] merge_recursive: abort properly upon errors

Hi Junio, On Mon, 25 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > There are a couple of places where return values indicating errors > > are ignored. Let's teach them manners. > > That is because the return value never indicated errors before

Re: [PATCH v4 02/16] Report bugs consistently

Hi Junio & Peff, On Mon, 25 Jul 2016, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, Jul 25, 2016 at 02:44:25PM -0700, Junio C Hamano wrote: > > > >> > diff --git a/imap-send.c b/imap-send.c > >> > index db0fafe..67d67f8 100644 > >> > --- a/imap-send.c > >> > +++

Re: [PATCH v1 3/3] convert: add filter..useProtocol option

W dniu 2016-07-25 o 22:16, Lars Schneider pisze: > > On 24 Jul 2016, at 23:30, Jakub Narębski wrote: > >> W dniu 2016-07-24 o 22:14, Jakub Narębski pisze: >>> W dniu 2016-07-24 o 20:36, Lars Schneider pisze: >> I agree that the name is not ideal. "UseProtocol" as it is

Re: [PATCH v4 01/16] Verify that `git pull --rebase` shows the helpful advice when failing

Hi Junio, On Mon, 25 Jul 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > +test_expect_success '--rebase with conflicts shows advice' ' > > + test_when_finished "git rebase --abort; git checkout -f to-rebase" && > > + git checkout -b seq && > > +

[PATCH v3] i18n: notes: mark comment for translation

Mark comment displayed when editing a note for translation. Signed-off-by: Vasco Almeida --- builtin/notes.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 0572051..aec427b 100644 --- a/builtin/notes.c

Re: [PATCH v2] i18n: notes: mark comment for translation

A Seg, 25-07-2016 às 10:49 -0700, Junio C Hamano escreveu: > Vasco Almeida writes: > > > > >  static const char note_template[] = > > - "\nWrite/edit the notes for the following object:\n"; > > + N_("Write/edit the notes for the following object:"); > >   > >  struct

Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation

On Tue, Jul 26, 2016 at 12:30:05PM +0200, Jakub Narębski wrote: > W dniu 2016-07-25 o 23:59, John Keeping pisze: > > > +test_expect_success 'new branch covered by force-with-lease (explicit)' ' > > + setup_srcdst_basic && > > + ( > > + cd dst && > > + git branch branch

Re: [PATCH v1 3/3] convert: add filter..useProtocol option

W dniu 2016-07-25 o 22:32, Lars Schneider pisze: > On 25 Jul 2016, at 01:22, Jakub Narębski wrote: >> W dniu 2016-07-25 o 00:36, Ramsay Jones pisze: >>> On 24/07/16 18:16, Lars Schneider wrote: It was a conscious decision to have the `filter` talk first. My reasoning

Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation

W dniu 2016-07-25 o 23:59, John Keeping pisze: > +test_expect_success 'new branch covered by force-with-lease (explicit)' ' > + setup_srcdst_basic && > + ( > + cd dst && > + git branch branch master && > + git push --force-with-lease=branch: origin

[PATCH 1/2] fix passing a name for config from submodules

In commit 959b5455 we implemented the initial version of the submodule config cache. During development of that initial version we extracted the function gitmodule_sha1_from_commit(). During that process we missed that the strbuf rev was still used in config_from() and now is left empty. Lets fix

[PATCH 2/2] submodule-config: combine error checking if clauses

So we have less return handling code. Signed-off-by: Heiko Voigt --- submodule-config.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/submodule-config.c b/submodule-config.c index 853989e..cb9bf8f 100644 --- a/submodule-config.c +++

Re: [RFC] git subcommand to check if branch is up-to-date with upstream

On Monday 25 July 2016 11:03 PM, Jakub Narębski wrote: > W dniu 2016-07-25 o 18:58, Junio C Hamano pisze: >> Sidhant Sharma writes: >> >>> I was wondering if it would be a good idea to have a command to check if a >>> push or pull is required. Perhaps it can also suggest if

Re: [ANN] Pro Git Reedited 2nd Edition

On Sun, Jul 24, 2016 at 6:07 AM, Jon Forrest wrote: > This an announcement of Pro Git Reedited 2nd Edition, which is > a substantial edit of Chacon and Straub's Pro Git 2nd Edition. > I spent a lot of time tightening it up and maybe clearing > up some explanations. > > The pdf

Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation

On Mon, Jul 25, 2016 at 03:22:48PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > Allow the empty string to stand in for the null SHA-1 when pushing a new > > branch, like we do when deleting branches. > > > > This means that the following command ensures that

[PATCH] commit: Fix description of no-verify

From: Orgad Shaneh include also commit-msg hook. Signed-off-by: Orgad Shaneh --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 163dbca..2725712 100644 --- a/builtin/commit.c

[PATCH] merge: Run commit-msg hook

From: Orgad Shaneh commit-msg is needed to either validate the commit message or edit it. Gerrit for instance uses this hook to append its Change-Id footer. This is relevant to merge commit just like any other commit. Signed-off-by: Orgad Shaneh ---

Re: What's cooking in git.git (Jul 2016, #07; Mon, 25)

Lars Schneider wrote: > On 26 Jul 2016, at 00:50, Junio C Hamano wrote: > > > > * ew/git-svn-http-tests (2016-07-25) 2 commits > > - git svn: migrate tests to use lib-httpd > > - t/t91*: do not say how to avoid the tests > > > > Reuse the lib-httpd

Re: What's cooking in git.git (Jul 2016, #07; Mon, 25)

On 26 Jul 2016, at 00:50, Junio C Hamano wrote: > [...] > > > * ew/git-svn-http-tests (2016-07-25) 2 commits > - git svn: migrate tests to use lib-httpd > - t/t91*: do not say how to avoid the tests > > Reuse the lib-httpd test infrastructure when testing the subversion >

Re: [PATCH] config.mak.uname: correct perl path on FreeBSD

Eric Wong writes: > I dug around the freebsd history (git://github.com/freebsd/freebsd.git) > (~1.5G) and the 3.x and 4.x releases with perl in base still contained > many references to /usr/local/bin/perl > > It also seems FreeBSD 2.x releases were also perl-less in base; > so

Re: [PATCH 1/3] t7900-subtree.sh: fix quoting and broken && chains

Eric Sunshine writes: >> @@ -73,10 +73,10 @@ join_commits() >> test_create_commit() ( >> repo=$1 >> commit=$2 > > Perhaps &&-chain the above two lines also to future-proof against > someone inserting important code somewhere above the following 'cd'.

Re: [PATCH] config.mak.uname: correct perl path on FreeBSD

Junio C Hamano wrote: > Eric Wong writes: > > Junio C Hamano wrote: > >> Duy Nguyen writes: > >> > On Mon, Jul 25, 2016 at 6:56 PM, Junio C Hamano > >> > wrote: > >> >> On Mon, Jul 25, 2016 at 9:21

Re: [PATCH 3/3] subtree: adjust style to match CodingGuidelines

These caught my eye browsing through my inbox. I'm not a subtree user. Am 26.07.2016 um 06:14 schrieb David Aguilar: @@ -50,87 +51,145 @@ prefix= debug() { - if [ -n "$debug" ]; then - printf "%s\n" "$*" >&2 + if test -n "$debug" + then + printf

Re: [PATCH 1/3] t7900-subtree.sh: fix quoting and broken && chains

On Tue, Jul 26, 2016 at 12:14 AM, David Aguilar wrote: > Allow whitespace in arguments to subtree_test_create_repo. > Add missing && chains. > > Signed-off-by: David Aguilar > --- > diff --git a/contrib/subtree/t/t7900-subtree.sh >

<    1   2