[U-Boot] [URGENT] Fatal Bug of Patman

[Masahiro Yamada]

Hi Simon,

The problem seems more fatal than I expected at first.


Series-changes tag is not working either.




My git-log is as follows:


commit 9296e54147d8ee5917bbc1c7a2e9fa4b8ef106db
Author: Masahiro Yamada <yamada.m at jp.panasonic.com>
Date:   Fri Aug 22 18:37:29 2014 +0900

    bar: commit 2
    
    Series-changes: 2
      - This is change log for the second commit

commit 1e0b0893ddc80d12d7ec23346d4eb5a1c15b2593
Author: Masahiro Yamada <yamada.m at jp.panasonic.com>
Date:   Fri Aug 22 18:36:20 2014 +0900

    foo: commit1
    
    Blah Blah.
    Series-version: 2
    Series-changes: 2
      - This is change log for the first commit





"tools/patman/patman -t -c 2"
swaps the change log between 1/2 and 2/2.




From 1e0b0893ddc80d12d7ec23346d4eb5a1c15b2593 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m at jp.panasonic.com>
Date: Fri, 22 Aug 2014 18:36:20 +0900
Subject: [PATCH v2 1/2] foo: commit1

Blah Blah.
Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

Changes in v2:
  - This is change log for the second commit






From 9296e54147d8ee5917bbc1c7a2e9fa4b8ef106db Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m at jp.panasonic.com>
Date: Fri, 22 Aug 2014 18:37:29 +0900
Subject: [PATCH v2 2/2] bar: commit 2

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

Changes in v2:
  - This is change log for the first commit





Best Regards
Masahiro Yamada







On Thu, 21 Aug 2014 10:19:11 +0900
Masahiro Yamada <yamada.m at jp.panasonic.com> wrote:

> Hi Simon,
> 
> 
> 
> I found 'Commit-notes:' is not working correctly.
> It seems a bit fatal.  Could you fix it asap, please?
> 
> 
> 
> I bisected and the first bad commit is:
> 
> commit cda2a611520e679495e7d2cf8e436b0df9afc675
> patman: Move the 'git log' command into a function
> 
> 
> 
> 
> How to repeat the bug
> ---------------------
> 
> For example, assume we are trying to send a series
> which consists of two patches.
> 
> 
> git log looks like this:
> 
> 
> 
> commit 757799f581ca366f26af6d9bbd52dccf90a162c1
> Author: Masahiro Yamada <yamada.m at jp.panasonic.com>
> Date:   Thu Aug 21 09:58:21 2014 +0900
> 
>     bar: patch2
>     
>     Commit-notes:
>     
>     Blah Blah
>     
>     END
> 
> commit 9ec777cd2ceeff2861cc38cea211440e4c1dea6b
> Author: Masahiro Yamada <yamada.m at jp.panasonic.com>
> Date:   Thu Aug 21 09:57:59 2014 +0900
> 
>     foo: patch1
> 
> 
> 
> 
> 
> 
> 
> Commit-notes "Blah Blah" should belong to the second patch.
> 
> 
> But when I run "tools/patman/patman -t -c 2",
> I see the commit-notes moves to the first patch like follows:
> 
> 
> 
> 
> From 9ec777cd2ceeff2861cc38cea211440e4c1dea6b Mon Sep 17 00:00:00 2001
> From: Masahiro Yamada <yamada.m at jp.panasonic.com>
> Date: Thu, 21 Aug 2014 09:57:59 +0900
> Subject: [PATCH 1/2] foo: patch1
> 
> Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
> ---
> 
> Blah Blah
> 
> 
>  README | 2 ++
>  1 file changed, 2 insertions(+)
> 
> 
> 
> 
> 
> 
> 
> 
> Best Regards
> Masahiro Yamada
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot