Skip to content

Commit

Permalink
contest: cli: log branch description
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
kuba-moo committed Aug 29, 2024
1 parent a384915 commit 541dec1
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions contest/cidiff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 541dec1

Please sign in to comment.