public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
Cc: Michael Haggerty <mhagger@alum•mit.edu>, git@vger•kernel.org
Subject: Re: [PATCH] Update git-multimail to version 1.0.2
Date: Mon, 27 Apr 2015 11:25:03 -0700	[thread overview]
Message-ID: <xmqqoam9whs0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpq383ltoxi.fsf@anie.imag.fr> (Matthieu Moy's message of "Mon, 27 Apr 2015 20:18:49 +0200")

Matthieu Moy <Matthieu.Moy@grenoble-inp•fr> writes:

> Junio C Hamano <gitster@pobox•com> writes:
>
>>> --- a/contrib/hooks/multimail/README.Git
>>> +++ b/contrib/hooks/multimail/README.Git
>>> @@ -3,13 +3,13 @@ section of the Git project as a convenience to Git users.
>>>  git-multimail is developed as an independent project at the following
>>>  website:
>>>  
>>> -    https://github.com/mhagger/git-multimail
>>> +    https://github.com/git-multimail/git-multimail
>>>  
>>>  The version in this directory was obtained from the upstream project
>>> -on 2014-04-07 and consists of the "git-multimail" subdirectory from
>>> +on 2015-04-27 and consists of the "git-multimail" subdirectory from
>>>  revision
>>>  
>>> -    1b32653bafc4f902535b9fc1cd9cae911325b870
>>> +    8c3aaafa873bf10de8dddf1d202c449b3eff3b42 refs/tags/1.0.2
>>
>> Huh, really?
>
> What's the problem with this hunk? I just checked, and the tag is there,
> with the right sha1.

The patch is to apply to a file in my tree, so "The version in this
directory" is "contrib/hooks/multimail/git_multimail.py" in my tree.

Was that obtained from the upstream project (i.e. you) and match
your 1.0.2 tag?

$ git rev-list -1 master contrib/hooks/multimail/
b513f71f6043c05c3918e670b332dfa7ec6b2661

which is b513f71f (git-multimail: update to version 1.0.0,
2014-04-07)

  reply	other threads:[~2015-04-27 18:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-27 11:17 [PATCH] Update git-multimail to version 1.0.2 Michael Haggerty
2015-04-27 11:29 ` Matthieu Moy
2015-04-27 17:50 ` Junio C Hamano
2015-04-27 18:18   ` Matthieu Moy
2015-04-27 18:25     ` Junio C Hamano [this message]
2015-04-27 18:41       ` Matthieu Moy
2015-04-27 18:44         ` Junio C Hamano
2015-04-27 18:54           ` Matthieu Moy
2015-04-27 19:05             ` Junio C Hamano
2015-04-27 19:20               ` Matthieu Moy
2015-04-27 20:05               ` Michael Haggerty
2015-04-28  7:20                 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqoam9whs0.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
    --cc=git@vger$(echo .)kernel.org \
    --cc=mhagger@alum$(echo .)mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox