mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'maint-0.4.6'
This commit is contained in:
commit
2ddd45bdb8
@ -7,7 +7,7 @@ set -e
|
||||
|
||||
PARENT="$1"
|
||||
|
||||
if test "x$PARENT" = "x"; then
|
||||
if test "$PARENT" = ""; then
|
||||
echo "You must specify the parent branch."
|
||||
exit 1
|
||||
fi
|
||||
@ -32,12 +32,12 @@ else
|
||||
USE_KEEP_BASE=1
|
||||
fi
|
||||
|
||||
if test "x$USE_KEEP_BASE" = "x1" ; then
|
||||
if test "$USE_KEEP_BASE" = "1" ; then
|
||||
exec git rebase -i --autosquash --keep-base "${PARENT}"
|
||||
else
|
||||
REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1)
|
||||
|
||||
if test "x${REV}" = "x"; then
|
||||
if test "${REV}" = ""; then
|
||||
echo "No changes here since ${PARENT}"
|
||||
exit 1
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user