[lkml]   [2011]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    SubjectRe: [git patches] libata updates, GPG signed (but see admin notes)
    On Wed, Nov 2, 2011 at 6:45 PM, Linus Torvalds
    <> wrote:
    >   [torvalds@i5 linux]$ git fetch git:// refs/tags/

    So this trivial patch removes one line of code, and makes this actually work.

    However, it also makes us fail many tests that *test* that we peeled
    what we fetched. However, I think the tests are wrong.

    If the tag doesn't resolve into a commit, we happily output the SHA1
    of the tag itself - and we say that it shouldn't be merged.

    And it the tag *does* resolve into a commit, why would we output the
    SHA1 of the commit? The tag should be peeled properly later when it
    gets used, so peeling it here seems to be just a misfeature that makes
    signed tags not work well.

    So I suspect we should just apply this patch, but I didn't check
    exacty what the failed tests are - except for the first one, that just
    compares against a canned response (and the canned response should
    just be changed). Maybe there was some reason for the peeling,
    although I suspect it was just a fairly mindless case of "make it a
    commit, because the merge needs the commit" - never mind that the
    merge would peel it anyway.

    builtin/fetch.c | 3 +--
    1 files changed, 1 insertions(+), 2 deletions(-)

    diff --git a/builtin/fetch.c b/builtin/fetch.c
    index 91731b909aeb..494a7f9976f8 100644
    --- a/builtin/fetch.c
    +++ b/builtin/fetch.c
    @@ -436,8 +436,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
    note[note_len] = '\0';
    fprintf(fp, "%s\t%s\t%s",
    - sha1_to_hex(commit ? commit->object.sha1 :
    - rm->old_sha1),
    + sha1_to_hex(rm->old_sha1),
    rm->merge ? "" : "not-for-merge",
    for (i = 0; i < url_len; ++i)
     \ /
      Last update: 2011-11-03 03:23    [W:0.020 / U:10.936 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site