From: Thomas Schwinge <thomas@schwinge.name>
To: ceder@lysator.liu.se, u.kleine-koenig@pengutronix.de,
git@vger.kernel.org
Cc: Thomas Schwinge <thomas@schwinge.name>
Subject: [PATCH, TopGit] tg-annihilate: Pass --no-verify when committing.
Date: Thu, 10 Feb 2011 14:39:03 +0100 [thread overview]
Message-ID: <1297345143-23788-1-git-send-email-thomas@schwinge.name> (raw)
This 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(-)
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
reply other threads:[~2011-02-10 13:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297345143-23788-1-git-send-email-thomas@schwinge.name \
--to=thomas@schwinge.name \
--cc=ceder@lysator.liu.se \
--cc=git@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.