Skip to content

Commit

Permalink
tools/tsflower: Detach while running git am
Browse files Browse the repository at this point in the history
This makes the reflog for the tsflower branch more useful, by
avoiding spamming it up on unpack with an entry for each patch.
  • Loading branch information
gnprice committed Jul 14, 2022
1 parent 4e6834d commit 6aaf9c5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tools/tsflower
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 6aaf9c5

Please sign in to comment.