Hi Junio,
On Mon, 25 Jul 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Note: the code now calls merge_recursive_generic() again. Unlike
> > merge_trees() and merge_recursive(), this function returns 0 upon success,
> > as most of Git's functions. Therefore, the error value -1
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 this
> series, isn't it? A
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
> >> > +++ b/imap-send.c
> >> > @
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 would be a
bool
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 &&
> > + printf "1\\n2\\n3\\n4\\n5\\
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
+++ b/builtin/notes.c
@@ -
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 note_data {
> > int
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 mast
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 was:
(1
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 branc
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 t
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
+++ b/submodule-config.c
@@ -416,12 +41
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 changes are
>>> fast-fo
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 is downloadable at:
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 `new-branch` is
> > creat
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
+++ b/builtin/commit.c
@@ -1616,7 +1616
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
---
Documentation/git-merge.txt | 6 +-
bui
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 test infrastructure when testing the subversio
101 - 118 of 118 matches
Mail list logo
