From 541dec151e9b8a6b797c3e3e3dd17c5f23fecb97 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 29 Aug 2024 11:58:01 -0700 Subject: [PATCH] contest: cli: log branch description Show branch description, this will reveal most recent tag, making it more obvious if we pulled from Linus between the branches. Signed-off-by: Jakub Kicinski --- contest/cidiff | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/contest/cidiff b/contest/cidiff index 88353a5..1f18103 100755 --- a/contest/cidiff +++ b/contest/cidiff @@ -14,21 +14,17 @@ if [ x$BRANCH1$BRANCH2 == x ]; then branches=( $(git branch -a | tail -2) ) BRANCH1=${branches[0]} BRANCH2=${branches[1]} - - echo " " $BRANCH1 - echo " " $BRANCH2 - echo elif [ x$BRANCH2 == x ]; then echo "Single branch specified, using that and the previous one:" branches=( $(git branch -a | grep -B1 "$1") ) BRANCH1=${branches[0]} BRANCH2=${branches[1]} - - echo " " $BRANCH1 - echo " " $BRANCH2 - echo fi +echo " " $BRANCH1 "("$(git describe $BRANCH1)")" +echo " " $BRANCH2 "("$(git describe $BRANCH2)")" +echo + get_base() { git log -1 --oneline \ --grep="Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net" $1 | cut -d' ' -f1