diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-05-28 08:03:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-05-28 08:03:43 -0400 |
| commit | 2af341b2eaf8f9d25fc2ba35a1e6b02e5dcac112 (patch) | |
| tree | 7f7509727cce434066df2d8a9ca36f146b64bc5b | |
| parent | a3c2dea3f66d503249b092932d96db6781b9ec4d (diff) | |
| parent | e1f0b9fb1eb6cf8e57655bb9db4224b5ce080d0f (diff) | |
| download | tor-2af341b2eaf8f9d25fc2ba35a1e6b02e5dcac112.tar.gz tor-2af341b2eaf8f9d25fc2ba35a1e6b02e5dcac112.zip | |
Merge branch 'maint-0.4.6' into release-0.4.6
| -rwxr-xr-x | scripts/git/git-resquash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh index e0f26ecdc4..f37950c9b0 100755 --- 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 |