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

[ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

From
Petr Baudis <pasky@ucw.cz>
Date
Apr 20, 2005, 20:56 UTC
Message-ID
<20050420205633.GC19112@pasky.ji.cz>
  Hello,
  so I've "released" git-pasky-0.6.2 (my SCMish layer on top of Linus
Torvalds' git tree history storage system), find it at the usual
	http://pasky.or.cz/~pasky/dev/git/
  git-pasky-0.6 has couple of big changes; mainly enhanced git diff,
git patch (to be renamed to cg mkpatch), enhanced git pull and
completely reworked git merge - it now uses the git-core facilities for
merging, and does the merges in-tree. Plenty of smaller stuff, some
bugfixes and some new bugs, and of course regular merging with Linus.
  The most important change for current users is the objects database
SHA1 keys change and (comparatively minor) directory cache format
change. This makes "pulling up" from older revisions rather difficult.
Linus' instructions _should_ work for you too, basically (you should
replace cat .git/HEAD with cat .git/heads/* or equivalent - note that
convert-tree does not accept multiple arguments so you need to invoke it
multiple times), but I didn't test it well (I did it the lowlevel way
completely since I needed to simultaneously merge with Linus).
  But if you can't be bothered by this or fear touching stuff like that,
and you do not have any local commits in your tree (it would be pretty
strange if you had and still fear), just fetch the tarball (which is
preferrable than git init for me since it eats up _significantly_
smaller portion of my bandwidth).
  I had to release git-pasky-0.6.1 since Linus changed the directory
cache format during me releasing git-pasky-0.6. And git-pasky-0.6.2
fixes gitmerge-file.sh script missing in the list of scripts for
install.
  So, now for the heads-up part. We will undergo at least two major
changes now. First, I'll probably make git-pasky to use the directory
cache for the add/rm queues now that we have diff-cache.
  Second, I've decided to straighten up the naming now that we still
have a chance. There will be no git-pasky-0.7, sorry. You'll get
cogito-0.7 instead. I've decided for it since after some consideration
having it named differently is the right thing (tm).
  The short command version will change from 'git' to 'cg', which should
be shorter to type and free the 'git' command for possible eventual
entry gate for the git commands (so that they are more
namespace-friendly, and it might make most sense anyway if we get fully
libgitized; but this is more of long-term ideas).
  The usage changes:
  cg patch -> cg mkpatch	('patch' is the program which _applies_ it)
  cg apply -> cg patch		(analogically to diff | patch)
  cg pull will now always only pull, never merge.
  cg update will do pull + merge.
  cg track will either just set the default for cg update if you pass it
no parameters, or disappear altogether; I think it could default to the
'origin' branch (or 'master' branch for non-master branches if no 'origin'
branch is around), and I'd rather set up some "cg admin" where you could
set all this stuff - from this to e.g. the committer details [*1*]. You
likely don't need to change the default every day.
  I must say that I'm pretty happy with the Cogito's command set
otherwise, though. I actually think it has now (almost?) all commands
it needs, and it is not too likely that (many) more will be added -
simple means easy to use, which is Cogito's goal. Compare with
the command set of GNU arch clones. ;-)
  [*1*] The committer details in .git would override the environemnt
variables to discourage people of trying to alter them based on
whatever, since that's not what they are supposed to do. They can always
just change the .git stuff if they _really_ need to.
  Comments welcomed, as well as new ideas. Persuading me to change what
I sketched here will need some good arguments, though. ;-)
  Thanks,
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Next: Petr Baudis
Message 1 of 33 in “[ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes”
  1. Petr BaudisApr 20, 2005
  2. Petr BaudisApr 20, 2005
  3. Greg KHApr 20, 2005
  4. Mike TahtApr 20, 2005
  5. Joshua T. CorbinApr 20, 2005
  6. Petr BaudisApr 20, 2005
  7. Randy.DunlapApr 20, 2005
  8. Steven ColeApr 20, 2005
  9. Linus TorvaldsApr 20, 2005
  10. Petr BaudisApr 20, 2005
  11. Greg KHApr 20, 2005
  12. Linus TorvaldsApr 21, 2005
  13. Linus TorvaldsApr 21, 2005
  14. Daniel JacobowitzApr 21, 2005
  15. SeanApr 21, 2005
  16. Linus TorvaldsApr 21, 2005
  17. Dave JonesApr 21, 2005
  18. Junio C HamanoApr 21, 2005
  19. Daniel JacobowitzApr 21, 2005
  20. Petr BaudisApr 21, 2005
  21. Edgar ToernigApr 21, 2005
  22. Petr BaudisApr 21, 2005
  23. Paul JacksonApr 24, 2005
  24. Randy.DunlapApr 21, 2005
  25. SeanApr 21, 2005
  26. Greg KHApr 21, 2005
  27. Paul JacksonApr 24, 2005
  28. Matthias UrlichsApr 21, 2005
  29. Removing command dispatcher (was Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes)David A. Wheeler, Apr 21, 2005
  30. Ingo MolnarApr 21, 2005
  31. Andrew MortonApr 25, 2005
  32. Bryan DonlanApr 21, 2005
  33. Petr BaudisApr 21, 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.