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

Re: Shipping gitk as part of core git.

From
Paul Mackerras <paulus@samba.org>
Date
Jul 31, 2005, 12:00 UTC
Message-ID
<17132.48473.276198.835869@cargo.ozlabs.ibm.com>
In-Reply-To
<7vk6j8yo0g.fsf_-_@assigned-by-dhcp.cox.net>
Junio C Hamano writes:
> It appears that gitk gets wider test coverage only after it is
> pulled into git.git repository.  I think it would be a good idea
> for me to pull from you often.

Yes, I agree. I'm happy to send you an email when I have committed changes to gitk if that will help.

Show 13 quoted lines
> Recently there was a discussion with binary packaging folks.
> While I do not mind, and actually I would prefer, shipping gitk
> as part of the core GIT, I have never heard about your
> preference.  As long as gitk is just a single file (or even a
> handful files in the future) project that does not have a
> filename that overlaps with core GIT, I can continue pulling
> from you and I think the binary packaging folks can produce
> separate git-core and gitk package out of git.git tree without
> problems.  However, once you start wanting to have your own
> Makefile and maybe debian/rules file for packaging, for example,
> I suspect the way currently things are set up would break
> miserably.  It's all Linus' fault to have merged with your tree
> in the first place ;-).

He did ask me first, and I said he could :). It makes things easier for me, having gitk in the core git, because it means that I don't have to worry about making a proper package out of it. I don't see any reason why gitk would grow to be more than just the script.

I am also thinking of doing a "gitool", somewhat like bk citool, to make it easier to create commits. I guess we can decide later whether to make it part of the core git, although it seems more like porcelain than gitk.

> Anyhow, I have one bug to report.  I selected one rev, and then
> said "diff this -> selected" from right-click menu on an
> adjacent one, and I got this:

Thanks for the patch. I have committed that fix plus fixes for some other bugs that people have reported, and pushed it to master.kernel.org. Could you do another pull please?

Regards, Paul.

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 25 in “Display of merges in gitk”
  1. Paul MackerrasJul 30, 2005
  2. Junio C HamanoJul 30, 2005
  3. Shipping gitk as part of core git.Junio C Hamano, Jul 30, 2005
  4. Paul MackerrasJul 31, 2005
  5. Junio C HamanoJul 31, 2005
  6. gitk merge display bugs (was: Re: Display of merges in gitk)Sergey Vlasov, Jul 30, 2005
  7. Linus TorvaldsAug 5, 2005
  8. gitk "hyperlinks" (was Re: Display of merges in gitk)Linus Torvalds, Aug 5, 2005
  9. jepler@unpythonic.netAug 5, 2005
  10. Kay SieversAug 6, 2005
  11. Linus TorvaldsAug 6, 2005
  12. Kay SieversAug 7, 2005
  13. gitweb "tag" displayJunio C Hamano, Aug 6, 2005
  14. Junio C HamanoAug 6, 2005
  15. Paul MackerrasAug 19, 2005
  16. Johannes SchindelinAug 19, 2005
  17. Junio C HamanoAug 20, 2005
  18. Kay SieversAug 7, 2005
  19. Paul MackerrasAug 6, 2005
  20. Linus TorvaldsAug 6, 2005
  21. jepler@unpythonic.netAug 6, 2005
  22. gitk SHA link hoversLinus Torvalds, Aug 6, 2005
  23. Paul MackerrasAug 7, 2005
  24. Junio C HamanoAug 6, 2005
  25. Paul MackerrasAug 7, 2005

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.