Re: [RFC/PATCHv8 00/10] git notes

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 20, 2009, 09:44 UTC
Message-ID: <7vk4xl5y3z.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1258681154-2167-1-git-send-email-johan@herland.net>

Johan Herland <johan@herland.net> writes:

Show 17 quoted lines

> Here is the 8th iteration of the git-notes series. Changes in this
> iteration are as follows:
>
> Changes to existing patches:
> - Rebased onto current 'next', dropping the early part of this series
>   which has now been merged to 'next'.
> - Patch 8 (was patch 22): Major rewrite of fast-import's notes handling
>   code based on comments from Shawn.
>
> New patches:
> - Patch 9: Rename t9301 to t9350, to make room for more fast-import tests
> - Patch 10: More fast-import tests
>
> TODO:
> - Builtin-ify git-notes shell script to take advantage of notes API
> - Garbage collect notes whose referenced object is unreachable (gc_notes())
> - Handle note objects that are not blobs, but trees

Thanks.

While I try my best not to break other people's patches while applying, I prefer to see a re-rolled series based on the same commit while replacing an existing series, unless the re-roll truly depends on the newer base, so that people can more easily see what got updated.

So here is what I did tonight.

Step 0.  Apply as you specified on top of 'next'

    $ git checkout next^0
    $ git am -s your-10-patches
    $ M=$(git describe)

Step 1.  Rebase back to the bottom of the old series

    $ git checkout next...jh/notes
    $ git rebase --onto HEAD next $M
    $ N=$(git describe)

Step 2.  Compare old and new series

    $ git show-branch jh/notes HEAD
    $ for i in 7 6 5 4 3 2 1 0
      do
        git diff jh/notes~$i HEAD~$(( $i + 2 ))
      done
    $ make -j test

Step 3.  Make sure the result is what you intended to feed me.

    $ git merge next
    $ git diff $M

Step 4.  Replace the tip of jh/notes

    $ git branch -f jh/notes $N