git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 00/12] Pulling signed/annotated tags

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 8, 2011, 21:45 UTC
Message-ID
<7v39dyxp8k.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7vobwnyy2m.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Here is what I had in mind....

And then I changed my mind again. Using a single SP indent for multi-line header fields make things easy to view.

| tree 20009beb1d5d0494347db5afbe80b364563dd511
| parent 8457d13895251ebf2f839ee6f74dd0087fb56334
| parent 6486ca6d77eaf4109b26b70da0b3a0158868e22f
| author Junio C Hamano <gitster@pobox.com> 1320781099 -0800
| committer Junio C Hamano <gitster@pobox.com> 1320781099 -0800
| mergetag object 6486ca6d77eaf4109b26b70da0b3a0158868e22f
|  type commit
|  tag test-tag
|  tagger Junio C Hamano <gitster@pobox.com> 1320471226 -0700
|  
|  test merge
|  -----BEGIN PGP SIGNATURE-----
|  Version: GnuPG v1.4.10 (GNU/Linux)
|  
|  iQIcBAABAgAGBQJOtMq7AAoJELC16IaWr+bLL30P/iEhPR+gkOpF09EshWZy7Vbu
|  ...
|  =eJX/
|  -----END PGP SIGNATURE-----
| 
| Merge tag 'test-tag' of ../git into HEAD
| 
| test merge
I am redoing the "signed-commit" series to also use this format.

The way I made the tag available to commit_tree() turned out to be a bit too clever, by the way, and it would cause problems down the road when these things need to be amended. Embedded "gpgsig" in a commit is about the commit itself, and should not be carried over, but "mergetag" is about the parent and should not be lost only because you wanted to fix a type in your merge log message. I'll be redoing that part in the series and hopefully the finished result would be ready for review after 1.7.8 final.

Previous: Junio C Hamano
Message 32 of 32 in “Pulling signed tag”
  1. 00/10 Pulling signed tagJunio C Hamano, Nov 5, 2011
  2. 01/10 Split GPG interface into its own helper libraryJunio C Hamano, Nov 5, 2011
  3. 02/10 fetch: do not store peeled tag object names in FETCH_HEADJunio C Hamano, Nov 5, 2011
  4. 03/10 merge: notice local merging of tags and keep it unwrappedJunio C Hamano, Nov 5, 2011
  5. 04/10 fetch: allow "git fetch $there v1.0" to fetch a tagJunio C Hamano, Nov 5, 2011
  6. 05/10 tests: distinguish merges of tags and commitsJunio C Hamano, Nov 5, 2011
  7. 06/10 refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano, Nov 5, 2011
  8. 07/10 fmt-merge-msg: avoid early returnsJunio C Hamano, Nov 5, 2011
  9. 08/10 fmt-merge-msg: package options into a structureJunio C Hamano, Nov 5, 2011
  10. 09/10 fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano, Nov 5, 2011
  11. Johannes SixtNov 5, 2011
  12. Junio C HamanoNov 6, 2011
  13. 10/10 merge: force edit mode when merging a tag objectJunio C Hamano, Nov 5, 2011
  14. Nguyen Thai Ngoc DuyNov 5, 2011
  15. 00/12 Pulling signed/annotated tagsJunio C Hamano, Nov 8, 2011
  16. 01/12 Split GPG interface into its own helper libraryJunio C Hamano, Nov 8, 2011
  17. 02/12 fetch: do not store peeled tag object names in FETCH_HEADJunio C Hamano, Nov 8, 2011
  18. 03/12 merge: notice local merging of tags and keep it unwrappedJunio C Hamano, Nov 8, 2011
  19. 04/12 fetch: allow "git fetch $there v1.0" to fetch a tagJunio C Hamano, Nov 8, 2011
  20. 05/12 refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano, Nov 8, 2011
  21. 06/12 fmt-merge-msg: avoid early returnsJunio C Hamano, Nov 8, 2011
  22. 07/12 fmt-merge-msg: package options into a structureJunio C Hamano, Nov 8, 2011
  23. 08/12 fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano, Nov 8, 2011
  24. 09/12 merge: make usage of commit->util more extensibleJunio C Hamano, Nov 8, 2011
  25. 10/12 merge: record tag objects without peeling in MERGE_HEADJunio C Hamano, Nov 8, 2011
  26. 11/12 commit: copy merged signed tags to headers of merge commitJunio C Hamano, Nov 8, 2011
  27. 12/12 merge: force edit mode when merging a tag objectJunio C Hamano, Nov 8, 2011
  28. Linus TorvaldsNov 8, 2011
  29. Junio C HamanoNov 8, 2011
  30. Linus TorvaldsNov 8, 2011
  31. Junio C HamanoNov 8, 2011
  32. Junio C HamanoNov 8, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.