CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Petr Baudis: Re: Re: more git updates..</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Petr Baudis" href="/groupie.php?aid=3517" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/4"> [Apr]</a> 聽 <a class="nb" href="/lkml/2005/4/9"> [9]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/4/9/155" onclick="this.href='/lkml/headers'+'/2005/4/9/155';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/9/155">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/4/9/103">First message in thread</a></li><li><a href="/lkml/2005/4/9/110">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/9/136">Linus Torvalds</a><ul><li class="origin"><a href="/lkml/2005/4/10/72">Petr Baudis</a><ul><li><a href="/lkml/2005/4/10/72">Petr Baudis</a><ul><li><a href="/lkml/2005/4/10/74">Linus Torvalds</a></li><li><a href="/lkml/2005/4/10/84">Ingo Molnar</a></li><li><a href="/lkml/2005/4/10/202">Petr Baudis</a></li></ul></li></ul></li><li><a href="/lkml/2005/4/10/25">Christopher Li</a><ul><li><a href="/lkml/2005/4/10/41">Ralph Corderoy</a></li><li><a href="/lkml/2005/4/10/125">Paul Jackson</a><ul><li><a href="/lkml/2005/4/10/151">Christopher Li</a></li></ul></li><li><a href="/lkml/2005/4/11/103">(H. Peter Anvin)</a><ul><li><a href="/lkml/2005/4/20/135">(Kai Henningsen)</a></li></ul></li></ul></li><li><a href="/lkml/2005/4/11/74">Ingo Molnar</a><ul><li><a href="/lkml/2005/4/11/110">Paul Jackson</a><ul><li><a href="/lkml/2005/4/11/113">Ingo Molnar</a></li><li><a href="/lkml/2005/4/11/117">Ingo Molnar</a></li></ul></li></ul></li><li><a href="/lkml/2005/4/12/32">David Eger</a><ul><li><a href="/lkml/2005/4/12/67">Petr Baudis</a><ul><li><a href="/lkml/2005/4/12/390">David Eger</a></li></ul></li></ul></li></ul></li></ul></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Sun, 10 Apr 2005 04:41:57 +0200</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Petr Baudis <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">Re: Re: more git updates..</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Dear diary, on Sun, Apr 10, 2005 at 01:31:10AM CEST, I got a letter<br />where Linus Torvalds <torvalds@osdl.org> told me that...<br />> On Sat, 9 Apr 2005, Linus Torvalds wrote:<br />> > <br />> > Actually, I guess I wouldn't have to change the format. I could just <br />> > extend the existing "tree" object to be able to point to other trees, and <br />> > that's it.<br />> <br />> Done, and pushed out. The current git.git repository seems to do all of <br />> this correctly.<br />..snip..<br /><br />Ok, so now I can dare announce it, I hope. I hacked my branch of git<br />somewhat, kept in sync with Linus, and now I have something to show.<br />Please see it at<br /><br /> <a href="http://pasky.or.cz/~pasky/dev/git/">http://pasky.or.cz/~pasky/dev/git/</a><br /><br />It is basically a set of (still rather crude) shell scripts upon Linus'<br />git, which make it sanely usable by mere humans for actual version<br />tracking. Its usage _is_ going to change, so don't get too used to it<br />(that'd be hard anyway, I suspect), but it should be working nicely.<br /><br />I have described most of the interesting parts and some basic usage in<br />the README at that page. It wraps commits, supports log retrieval and<br />comfortable diffing between any two trees. And on top of that, it can do<br />some basic remote repositories - it will pull (rsync) from them and it<br />can make the local copy track them - on pull, it will be updated<br />accordingly (and your local commits on the tracked branch will get<br />orphaned).<br /><br />I didn't attach a patch against Linus since I think it's pretty much<br />useless now. It's available as against-linus.patch on the web, and<br />you can apply it to the latest git tree (NOT 0.03). But it's probably<br />better idea to wget my tree. You can then watch us making progress by<br /><br /> gitpull.sh linus<br /> gitpull.sh pasky<br /><br />and see where we differ by:<br /><br /> gitdiff.sh linus pasky<br /><br />(This is how the against-linus.patch was generated. I'd easily generate<br />even 0.03 patch this way, but I forgot to merge the fsck at that time,<br />so it would suck.)<br /><br />(Note that the tree you wget is set up to track my branch. If you want<br />to stop tracking it (basically necessary now if you want to do local<br />commits), do:<br /><br /> cp .dircache/HEAD .dircache/HEAD.local<br /> gittrack.sh<br /><br />The cp says that something like "I want to pick up where the tracked<br />branch left off". Otherwise, untracking would return you to your "local"<br />branch, which is just some ancient predecessor of the pasky branch here<br />anyway.)<br /><br />Note that I didn't really test it on anything but git itself yet, so I'm<br />not sure how will it cope especially with directories - I tried to make<br />it aware of them though. I will do some more practical testing tomorrow.<br /><br />Otherwise, I will probably try to consolidate the usage and<br />documentation now, and beautify the scripts. I might start pondering<br />some merging too. Oh, and gitpatch.sh. :-)<br /><br />Have fun and please share your opinions,<br /><br />-- <br /> Petr "Pasky" Baudis<br />Stuff: <a href="http://pasky.or.cz/">http://pasky.or.cz/</a><br />98% of the time I am right. Why worry about the other 3%.<br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-04-10 04:45 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>