Matthieu Moy <matthieu....@grenoble-inp.fr> writes:
> Junio C Hamano <gits...@pobox.com> writes:
>
>> Matthieu Moy <matthieu....@grenoble-inp.fr> writes:
>>
>>> Junio C Hamano <gits...@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?
>
> Yes. Isn't that what the text above says?
Well, the patch does not update git_multimail.py at all. Requoting
the part you omitted from my response
$ git rev-list -1 master contrib/hooks/multimail/
b513f71f6043c05c3918e670b332dfa7ec6b2661
which is b513f71f (git-multimail: update to version 1.0.0,
2014-04-07)
it matches what "was obtained from the upstream project on
2014-04-07".
Or did you forget to include the update to the software in the
patch?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
