From bfb70f26ce5178572b0e6245b3dce9a6de7e7be5 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Fri, 9 Dec 2016 16:02:37 +0800 Subject: linuxize: cut commit ID now has conflicts breaking linuxize process Following error can be seen in linuxize process: error: short SHA1 07630ad9 is ambiguous. error: short SHA1 07630ad9 is ambiguous. fatal: ambiguous argument '07630ad9': unknown revision or path not in the working tree. Use '--' to separate paths from revisions Fixing this by stop cutting commit IDs into 8-digits. Signed-off-by: Lv Zheng --- generate/linux/gen-patch.sh | 4 ++-- generate/linux/gen-repo.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generate/linux/gen-patch.sh b/generate/linux/gen-patch.sh index 694c0ec45..a588bed89 100755 --- a/generate/linux/gen-patch.sh +++ b/generate/linux/gen-patch.sh @@ -53,8 +53,8 @@ if [ "x${COMMIT}" = "x" ]; then COMMIT=HEAD fi -after=`git log -1 ${COMMIT} --format=%H | cut -c1-8` -before=`git log -1 ${COMMIT}^1 --format=%H | cut -c1-8` +after=`git log -1 ${COMMIT} --format=%H` +before=`git log -1 ${COMMIT}^1 --format=%H` SCRIPT=`(cd \`dirname $0\`; pwd)` . $SCRIPT/libacpica.sh diff --git a/generate/linux/gen-repo.sh b/generate/linux/gen-repo.sh index b268eb43b..c092f6255 100755 --- a/generate/linux/gen-repo.sh +++ b/generate/linux/gen-repo.sh @@ -34,7 +34,7 @@ do done shift $(($OPTIND - 1)) -version=`git log -1 $1 --format=%H | cut -c1-8` +version=`git log -1 $1 --format=%H` SCRIPT=`(cd \`dirname $0\`; pwd)` . $SCRIPT/libacpica.sh -- cgit v1.2.1