tor

commit e1f0b9fb1eb6cf8e57655bb9db4224b5ce080d0f
parent fd3678fa60b3ba66fa414f86ce962f380ca6462e
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 28 May 2021 08:03:43 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

Diffstat:
M
scripts/git/git-resquash.sh
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh
@@ -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