[PATCH 05/10] srt_create: Use old_tag.base, not old_tag, to create patch for rc

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>

Doing the diff between old_tag and new_tag just produces another
incremental diff instead of the expected rt patch plus including the
rc patches e.g.

  srt create v3.18.138-rt115 v3.18.138-rt116-rc1

should create the diff between the base v3.18.138 and
v3.18.138-rt116-rc1 and not between v3.18.138-rt115 and
v3.18.138-rt116-rc1.

Signed-off-by: Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx>
---
 srt_create.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srt_create.py b/srt_create.py
index 90d1e1b..04833fe 100644
--- a/srt_create.py
+++ b/srt_create.py
@@ -64,7 +64,7 @@ def create(config, ctx):
             os.makedirs(d)
 
     if ctx.new_tag.is_rc:
-        create_patch_file(ctx.old_tag, str(ctx.new_tag), ctx.new_fln_patch)
+        create_patch_file(ctx.old_tag.base, str(ctx.new_tag), ctx.new_fln_patch)
         create_series(ctx.old_tag, ctx.new_tag, ctx.new_dir_series)
     else:
         create_patch_file(ctx.new_tag.base, str(ctx.new_tag), ctx.new_fln_patch)
-- 
2.14.1




[Index of Archives]     [RT Stable]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]

  Powered by Linux