diff options
author | Lv Zheng <lv.zheng@intel.com> | 2016-12-09 16:02:37 +0800 |
---|---|---|
committer | Lv Zheng <lv.zheng@intel.com> | 2016-12-09 16:02:37 +0800 |
commit | bfb70f26ce5178572b0e6245b3dce9a6de7e7be5 (patch) | |
tree | ba1870f446b56640ce787a6a05d63d22560216bd | |
parent | 07630ad9655916fb405a2277138ea7b5a8421c2f (diff) | |
download | acpica-bfb70f26ce5178572b0e6245b3dce9a6de7e7be5.tar.gz |
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 <lv.zheng@intel.com>
-rwxr-xr-x | generate/linux/gen-patch.sh | 4 | ||||
-rwxr-xr-x | 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 |