nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.6'

Browse Source
This commit is contained in:
Nick Mathewson 2021-05-28 08:03:43 -04:00
commit 2ddd45bdb8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/git/git-resquash.sh
View File

@ -7,7 +7,7 @@ set -e
PARENT="$1" PARENT="$1"
if test "x$PARENT" = "x"; then if test "$PARENT" = ""; then
echo "You must specify the parent branch." echo "You must specify the parent branch."
exit 1 exit 1
fi fi
@ -32,12 +32,12 @@ else
USE_KEEP_BASE=1 USE_KEEP_BASE=1
fi fi
if test "x$USE_KEEP_BASE" = "x1" ; then if test "$USE_KEEP_BASE" = "1" ; then
exec git rebase -i --autosquash --keep-base "${PARENT}" exec git rebase -i --autosquash --keep-base "${PARENT}"
else else
REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) 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}" echo "No changes here since ${PARENT}"
exit 1 exit 1
fi fi