From 91dac800861e709ac6aa6d8eb0f6a992d0e391a7 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Tue, 28 Feb 2017 18:36:07 +0100
Subject: [PATCH] compare_size.sh: fix when last commit is a merge
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
---
compare_size.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/compare_size.sh b/compare_size.sh
index 7d510d5e7..a43a29028 100755
--- a/compare_size.sh
+++ b/compare_size.sh
@@ -119,7 +119,9 @@ echo $git_current_commit
# print info abous previous commits
# pick ! as the separator
# tformat to get the newline after the last entry
-git log --format=tformat:"!%H!%s" origin/master~1...HEAD~1 --graph | while IFS="!" read -r git_graph git_hash git_title
+git log --format=tformat:"!%H!%s" origin/master~1...HEAD --graph \
+| tail -n +2 \
+| while IFS="!" read -r git_graph git_hash git_title
do
for i in "${!curr_size_array[@]}"
do
--
GitLab