Thomas SchwingeThis is needed in order to inhibit TopGit's pre-commit hook to run, which would bark upon missing .top* files. ---
Hallo!
(Yeah, I'm still using TopGit for some things.) I needed the following patch to make tg annihilate work if the base is a non-TopGit branch. Is this the correct approach?
GrüÃe, Thomas
tg-annihilate.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
Show changes to tg-annihilate.sh +3 −1
diff --git a/tg-annihilate.sh b/tg-annihilate.sh index 219b8fe..89d192c 100644 --- a/tg-annihilate.sh +++ b/tg-annihilate.sh @@ -34,7 +34,9 @@ baserev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" || ## Annihilate mb="$(git merge-base "refs/top-bases/$name" "$name")" git read-tree "$mb^{tree}" -git commit -m"TopGit branch $name annihilated." +# Need to pass --no-verify in order to inhibit TopGit's pre-commit hook to run, +# which would bark upon missing .top* files. +git commit --no-verify -m"TopGit branch $name annihilated." info 'If you have shared your work, you might want to run `tg push` now.' info 'Then you probably want to switch to another branch.'
-- 1.7.1