From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: git@vger.kernel.org
Subject: BUG?: git-filter-branch removes mergetags
Date: Tue, 23 Sep 2014 21:13:17 +0200 [thread overview]
Message-ID: <20140923191317.GA3755@pengutronix.de> (raw)
Hello,
I just noticed that git-filter-branch doesn't preserve mergetag
annotations in situations where it could. Here is an example (with
linux.git):
$ git checkout -b test 6cd2f85413eef8fe7bcd7c25bf55e7b055fa257c
$ git cat-file commit HEAD | grep mergetag
mergetag object 954263938706bf62d36e81b6b49f313390f2ed35
$ git filter-branch -f --msg-filter 'sed s/foo/bar/' HEAD^!
Rewrite 6cd2f85413eef8fe7bcd7c25bf55e7b055fa257c (1/1)
Ref 'refs/heads/test' was rewritten
$ diff -u <(git cat-file commit refs/original/refs/heads/test) <(git cat-file commit HEAD)
--- /dev/fd/63 2014-09-23 21:07:49.987065017 +0200
+++ /dev/fd/62 2014-09-23 21:07:49.991064988 +0200
@@ -3,32 +3,6 @@
parent 954263938706bf62d36e81b6b49f313390f2ed35
author Linus Torvalds <torvalds@linux-foundation.org> 1411488823 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1411488823 -0700
-mergetag object 954263938706bf62d36e81b6b49f313390f2ed35
- type commit
- tag for-linus
- tagger Paolo Bonzini <pbonzini@redhat.com> 1411478481 +0200
-
- Another fix for 3.17 arrived at just the wrong time, after I had sent
- yesterday's pull request. Normally I would have waited for
- some other patches to pile up, but since 3.17 might be short
- here it is.
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v2.0.22 (GNU/Linux)
-
- iQIcBAABAgAGBQJUIXPRAAoJEBvWZb6bTYbyySEP/AkPjfNGYqwBbM8GUJ4tt4gR
- C+xbiO+xPr2qCwfi36DQtL0UPwJHWSq7SXaDMvSqMo22FjnFcVaGuQcGAPno/8ZA
- tLBe1km9HIPlEIV3vpoe8PPpj9cuZ86+YOCuPIqK5fC7l6Ops0dhCOjf88tmPVQ4
- yhodpJ1Lt/sPBUWb6pNfk0iWD+qSbfUWtwzv89oudEvLcLiAcPSBdbvnxVS3bmGm
- qbL8pvCOozK5GJbl0+cYWCoEPBP5ekqGvwvGdEBTx+4qv2S2htzUX30UA2VYy5IR
- jMXVrJbvSW9FXQdBgr0Q4ql6evOVjL+5LpwgRUC6tuC6r1rMP+nXyHKS35HC1i8W
- FYr62B/LZTm4vyDHsmsiEl43VLAcF7kmXufQT62vJg+ifeA1MAMIJra7ZDx8WbsD
- HDqM+CeaZrF3p4okRrktbecQdeFFyg4wOasHRTO7SETkbP7i1cS0Mp8rRbX3CnJq
- 0UM8STe+hViXR7uYZEbjlbGKkszDS49fstJIaNm9JPJm+S/V5/MZFelNWgPp/+kF
- xpQUxtoSaFnqgBXpRZ7t2Y2zGeZkMWn/P84S23/7K1TfRPCsUpgFbiY26rGW9l4v
- r8gz7v+V1gCzWYVRuEzolFrea6A1ik2sspzeDuZOrf+QYwMyyUdEQ/NfCm032wba
- CYL0V2M/dJNmZnZRPP9/
- =ZkSE
- -----END PGP SIGNATURE-----
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
I expected the signature to not disappear such that in the example above
no change is introduced.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next reply other threads:[~2014-09-23 19:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 19:13 Uwe Kleine-König [this message]
2014-09-23 20:26 ` BUG?: git-filter-branch removes mergetags Junio C Hamano
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=20140923191317.GA3755@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=git@vger.kernel.org \
/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.