[source] scripts/getver.sh: fix older git versions from printing stuff to stdout

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 16 11:51:11 PDT 2016


jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=efdd3bf5fbab94b3f84e8a285e83ef36e39b3e8b

commit efdd3bf5fbab94b3f84e8a285e83ef36e39b3e8b
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Sat Jul 16 16:57:05 2016 +0200

    scripts/getver.sh: fix older git versions from printing stuff to stdout
    
    Older git versions seem output the original argument to stdout if there
    is no upstream, presumably because they try to do things with it
    internally. This can be prevented by passing --verify to it, which
    should be safe on newer git versions.
    
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
 scripts/getver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/getver.sh b/scripts/getver.sh
index a65a6af..e718485 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -25,8 +25,8 @@ try_git() {
 		;;
 	*)
 		BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-		ORIGIN="$(git rev-parse --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
-		[ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --symbolic-full-name master@{u} 2>/dev/null)"
+		ORIGIN="$(git rev-parse --verify --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
+		[ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name master@{u} 2>/dev/null)"
 		REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')"
 
 		if [ -n "$ORIGIN" ]; then



More information about the lede-commits mailing list