diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-08 20:29:48 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-08 20:29:48 +0000 |
| commit | 9d82823197096aa8b68e51e2a79225e570496012 (patch) | |
| tree | 9c4c10039b211347856e84fef603350e24882d5f | |
| parent | 87f6bf5e447188d0292a5618c1a3b7fe4e458faa (diff) | |
Fix unneeded rewrites when tagging a merge commit
| -rwxr-xr-x | svn-git-repo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svn-git-repo.sh b/svn-git-repo.sh index a541511..57af66c 100755 --- a/svn-git-repo.sh +++ b/svn-git-repo.sh @@ -71,6 +71,6 @@ for tag_branch in $(git -C @git ls-remote . | cut -f 2 | grep "^refs/heads/tags/ while git -C @git diff --quiet $tag_commit $tag_commit^; do tag_commit=$(git -C @git rev-parse $tag_commit^) done - git -C @git filter-branch -f --msg-filter "tee $tag_msg; git tag -f -F $tag_msg $tag $tag_commit" $tag_branch ^$tag_branch^ + git -C @git filter-branch -f --msg-filter "tee $tag_msg; git tag -f -F $tag_msg $tag $tag_commit" $tag_branch ^$tag_branch^@ done rm -f $tag_msg |