From 6aaf9c56de0c0f628cb153285078b6d62114f7a3 Mon Sep 17 00:00:00 2001
From: Greg Price <greg@zulip.com>
Date: Thu, 16 Jun 2022 21:01:44 -0700
Subject: [PATCH] tools/tsflower: Detach while running `git am`

This makes the reflog for the tsflower branch more useful, by
avoiding spamming it up on unpack with an entry for each patch.
---
 tools/tsflower | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/tsflower b/tools/tsflower
index 803459685fa..4cfdf0b9865 100755
--- a/tools/tsflower
+++ b/tools/tsflower
@@ -341,8 +341,10 @@ EOF
     unapply_patches
     git commit -am 'tsflower: Revert patches'
 
-    git checkout --quiet -B "${branchname}"
+    git checkout --quiet --detach
     git am --quiet --whitespace=nowarn -p0 --keep "${patch_dir}"/*.patch
+    git checkout --quiet -B "${branchname}"
+    git branch --set-upstream-to "${basebranch}"
 
     if [ -z "${shortcut}" ]; then
         git checkout --quiet "${basebranch}"