From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 28 Apr 2020 08:13:49 +0000 (+1000)
Subject: update to cope with new git rebase output
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=f1dbc5d5ee2b65e0ecce3cfa68f7d48688ab39dd;p=next-scripts

update to cope with new git rebase output

also, we don't need to push out the gitk.cache from any dir
---

diff --git a/make_summ b/make_summ
index 9570e9d..73e5ee4 100755
--- a/make_summ
+++ b/make_summ
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log |
+tr '\r' '\n' <merge.log |
+	egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
 	egrep -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
 
 exit 0
diff --git a/to_build_host b/to_build_host
index d0176db..c05be14 100755
--- a/to_build_host
+++ b/to_build_host
@@ -7,4 +7,4 @@
 
 . "$(dirname $0)/common.sh"
 
-rsync -avHSXx --noatime --exclude next-history.git --exclude stats --exclude next/.git/gitk.cache --delete ~/kernels/next/. ${build_host}:kernels/next/.
+rsync -avHSXx --noatime --exclude next-history.git --exclude stats --exclude gitk.cache --delete ~/kernels/next/. ${build_host}:kernels/next/.