aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeongJae Park <sj@kernel.org>2023-07-10 18:26:41 +0000
committerSeongJae Park <sj@kernel.org>2023-07-10 18:26:41 +0000
commitafa6d27e38791b99aa622e051138de32bc4182d4 (patch)
tree32151446513a7b53175740a4fbf62ae2e7b29d44
parent0ea9f4cb9e6ad03ce6c0107f467091a27153e25c (diff)
downloaddamon-hack-afa6d27e38791b99aa622e051138de32bc4182d4.tar.gz
rebase_damon_next_on_mm_unstable: Rename damon/next before cherry-pick
Signed-off-by: SeongJae Park <sj@kernel.org>
-rwxr-xr-xrebase_damon_next_on_mm_unstable.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/rebase_damon_next_on_mm_unstable.sh b/rebase_damon_next_on_mm_unstable.sh
index b46b6b5..17db21f 100755
--- a/rebase_damon_next_on_mm_unstable.sh
+++ b/rebase_damon_next_on_mm_unstable.sh
@@ -46,17 +46,17 @@ cp "$bindir/unmerged_commits.sh" ./
merged_commits=$(./unmerged_commits.sh --merged --human_readable \
"$old_mm_unstable..damon/next" "$mainline_base..$new_mm_unstable")
+git branch -M damon/next damon/next.old
git checkout akpm.korg.mm/mm-unstable -b damon/next.new
commits_to_pick=$(./unmerged_commits.sh "$old_mm_unstable..damon/next" \
"$mainline_base..$new_mm_unstable")
if ! git cherry-pick --allow-empty $commits_to_pick
then
echo "Cherry-pick failed."
- echo "Rename damon/next.new to damon/next after resolving the issue"
+ echo "Resolve it and do 'git branch -M damon/next.new damon/next'"
exit 1
fi
-git branch -M damon/next damon/next.old
git branch -M damon/next.new damon/next
echo "Below commits have merged"