From 1803a8b1aadbad775b8dde3765b71de00b26ac1e Mon Sep 17 00:00:00 2001
From: Davide Guerri <davide.guerri@hp.com>
Date: Thu, 6 Feb 2014 22:22:11 +0000
Subject: [PATCH] Fix simple_rebase functional test

Change-Id: I5ba5cdaa8b088ba42d53cdb3c58b1632d31c5139
---
 functional-tests/040-test_simple_rebase.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functional-tests/040-test_simple_rebase.sh b/functional-tests/040-test_simple_rebase.sh
index ae54169..98eecb4 100755
--- a/functional-tests/040-test_simple_rebase.sh
+++ b/functional-tests/040-test_simple_rebase.sh
@@ -13,7 +13,7 @@ CHERRY_PICKS="19b89746d08fa224bb8aba12106dbc330cb5d019 \
               5d4fbe79037c3b2516216258a907d3a02f0b205c"
 TEST_REBASE_REF="fd3524e1b7353cda228b6fb73c3a2d34a4fee4de"
 
-SUCCESS_SHA1="b8aee554fd9e22c05cfd8c20f6c19d26320fc293 ?-"
+SUCCESS_SHA1="e1dfee279aa5b6b05296a97b4eba8dde0b6eea4b ?-"
 
 function test_simple_rebase() {
   log DEBUG "Starting $TEST_NAME::$FUNCNAME"
@@ -58,7 +58,7 @@ EOP
 
   git-hp import-upstream import/$TEST_NAME-new >/dev/null || return 1
 
-  local test_sha1="$(git log --pretty=format:"%s"|sort | shasum -p -)"
+  local test_sha1="$(git show --numstat | tail -9 | shasum -p -)"
   if [ "$test_sha1" != "$SUCCESS_SHA1" ]
   then
     popd >/dev/null