diff --git a/contrib/source-control-tools/autopatch.sh b/contrib/source-control-tools/autopatch.sh
--- a/contrib/source-control-tools/autopatch.sh
+++ b/contrib/source-control-tools/autopatch.sh
@@ -9,7 +9,7 @@
 
 # --force is necessary to skip the "sanity check" step, which conflicts with
 # stacked revisions that contain already-landed dependencies.
-DEFAULT_PATCH_ARGS="--skip-dependencies --force"
+DEFAULT_PATCH_ARGS="--skip-dependencies --force --nobranch"
 DEFAULT_REMOTE="origin"
 DEFAULT_BRANCH="master"
 
diff --git a/contrib/source-control-tools/test/test-autopatch.sh b/contrib/source-control-tools/test/test-autopatch.sh
--- a/contrib/source-control-tools/test/test-autopatch.sh
+++ b/contrib/source-control-tools/test/test-autopatch.sh
@@ -81,11 +81,9 @@
 git pull testorigin "${REMOTE_AND_BRANCH}"
 
 test_cleanup() {
-  # Cleanup current branch so that arcanist doesn't run out of branch names
-  CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-  git checkout "${MASTER_BRANCH}"
   git reset --hard HEAD
-  git branch -D "${CURRENT_BRANCH}" || true
+  git clean -xffd || true
+  git checkout "${MASTER_BRANCH}"
 }
 
 (