Permalink
Browse files

layerman, oebb: another tweak to the git --no-abbrev test

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
1 parent 3b6d7d8 commit d5a22682fe8c20287541cdf7e9932717bd25ffa6 @koenkooi koenkooi committed Apr 26, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 oebb.sh
  2. +3 −3 scripts/layerman
View
@@ -37,8 +37,8 @@ OE_BASE=${PWD}
BASE_VERSION=5
OE_ENV_FILE=~/.oe/environment-angstromv2012.05
-if ! git help log | grep -q no-abbrev-commit ; then
- echo "Your installed version of git is too old, it lacks --no-abbrev-commit. Please install 1.7.6 or newer"
+if ! git help log | grep -q no-abbrev ; then
+ echo "Your installed version of git is too old, it lacks --no-abbrev. Please install 1.7.6 or newer"
exit 1
fi
View
@@ -26,7 +26,7 @@ function check_layer() {
fi
cd ${LAYERDIR}
- CURRENTCOMMIT="$(git log --oneline --no-abbrev-commit -1 | awk '{print $1}')"
+ CURRENTCOMMIT="$(git log --oneline --no-abbrev -1 | awk '{print $1}')"
CURRENTBRANCH="$(git branch | grep '*' | awk '{print $2}')"
if [ "${CURRENTBRANCH}" != "${BRANCH}" ] ; then
@@ -41,7 +41,7 @@ function get_info() {
check_layer
cd ${LAYERDIR}
- CURRENTCOMMIT="$(git log --oneline --no-abbrev-commit -1 | awk '{print $1}')"
+ CURRENTCOMMIT="$(git log --oneline --no-abbrev -1 | awk '{print $1}')"
CURRENTBRANCH="$(git branch | grep '*' | awk '{print $2}')"
echo "${LAYERNAME},${LAYERURI},${CURRENTBRANCH},${CURRENTCOMMIT}" >> ${OE_SOURCE_DIR}/info.txt
@@ -54,7 +54,7 @@ function update_layers() {
cd ${LAYERDIR} && echo "Updating layer at layers/${LAYERNAME}" && git stash >&/dev/null && git pull --rebase && git stash pop >& /dev/null
else
cd ${LAYERDIR}
- CURRENTCOMMIT="$(git log --oneline --no-abbrev-commit -1 | awk '{print $1}')"
+ CURRENTCOMMIT="$(git log --oneline --no-abbrev -1 | awk '{print $1}')"
CURRENTBRANCH="$(git branch | grep '*' | awk '{print $2}')"
if [ "${BRANCH}" != "${CURRENTBRANCH}" ] ; then

0 comments on commit d5a2268

Please sign in to comment.