diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-23 13:10:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-23 13:10:50 +0000 |
| commit | a8a0826ea618266bb2cb0235c3efb354abb02c2e (patch) | |
| tree | c6d7334c7f9b5a44b7d4cc75ae921a82b7a1f0bc | |
| parent | 2b96477ac22a33dcf2cdbc1d89684a791107042a (diff) | |
| parent | af5936f4aa55f751cee7648eaf4f156baa5868ea (diff) | |
| download | nova-a8a0826ea618266bb2cb0235c3efb354abb02c2e.tar.gz nova-a8a0826ea618266bb2cb0235c3efb354abb02c2e.tar.xz nova-a8a0826ea618266bb2cb0235c3efb354abb02c2e.zip | |
Merge "Go back to the original branch after pylint check"
| -rwxr-xr-x | tools/lintstack.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/lintstack.sh b/tools/lintstack.sh index 42c6a60b3..d8591d03d 100755 --- a/tools/lintstack.sh +++ b/tools/lintstack.sh @@ -20,7 +20,16 @@ # commit for review. set -e TOOLS_DIR=$(cd $(dirname "$0") && pwd) -GITHEAD=`git rev-parse HEAD` +# Get the current branch name. +GITHEAD=`git rev-parse --abbrev-ref HEAD` +if [[ "$GITHEAD" == "HEAD" ]]; then + # In detached head mode, get revision number instead + GITHEAD=`git rev-parse HEAD` + echo "Currently we are at commit $GITHEAD" +else + echo "Currently we are at branch $GITHEAD" +fi + cp -f $TOOLS_DIR/lintstack.py $TOOLS_DIR/lintstack.head.py if git rev-parse HEAD^2 2>/dev/null; then @@ -47,8 +56,4 @@ git checkout $GITHEAD $TOOLS_DIR/lintstack.head.py echo "Check passed. FYI: the pylint exceptions are:" cat $TOOLS_DIR/pylint_exceptions -echo -echo "You are in detached HEAD mode. If you are a developer" -echo "and not very familiar with git, you might want to do" -echo "'git checkout branch-name' to go back to your branch." |