LKML: Petr Baudis: Re: Re: more git updates..

<?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/10"> [10]</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/10/189" onclick="this.href='/lkml/headers'+'/2005/4/10/189';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/10/189">[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/10/142">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/10/154">Christopher Li</a><ul><li><a href="/lkml/2005/4/10/159">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/10/164">Christopher Li</a><ul><li><a href="/lkml/2005/4/10/173">Linus Torvalds</a></li></ul></li><li><a href="/lkml/2005/4/11/19">bert hubert</a><ul><li><a href="/lkml/2005/4/11/25">Christer Weinigel</a></li></ul></li></ul></li></ul></li><li><a href="/lkml/2005/4/10/170">Paul Jackson</a><ul><li><a href="/lkml/2005/4/10/181">Linus Torvalds</a><ul><li><a href="/lkml/2005/4/10/192">Paul Jackson</a></li><li><a href="/lkml/2005/4/11/125">"Randy.Dunlap"</a><ul><li><a href="/lkml/2005/4/11/183">Petr Baudis</a></li></ul></li></ul></li><li class="origin"><a href="">Petr Baudis</a></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">Mon, 11 Apr 2005 02:10:46 +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 Mon, Apr 11, 2005 at 01:14:57AM CEST, I got a letter<br />where Paul Jackson <pj@engr.sgi.com> told me that...<br />> Useful explanation - thanks, Linus.<br />> <br />> Is this picture and description accurate:<br />> <br />> ==============================================================<br />> <br />> <br />> < working directory files (foo.c) ><br />> ^<br />> ^ |<br />> | upward ops | downward ops |<br />> | ---------- | ------------ |<br />> | checkout-cache | update-cache |<br />> | show-diff | v<br />> v<br />> < current directory cache (".dircache/index") ><br />> ^<br />> ^ |<br />> | upward ops | downward ops |<br />> | ---------- | ------------ |<br />> | read-tree | write-tree |<br />> | | commit-tree |<br />> | v<br />> v<br />> < git filesystem (blobs, trees, commits: .dircache/{HEAD,objects}) ><br /><br />Well, except that from purely technical standpoint commit-tree has<br />nothing to do in this picture - it creates new object in the git<br />filesystem based on its input data, but regardless to the directory<br />cache or current tree. It probably still belongs where it is from the<br />workflow standpoint, though.<br /><br />..snip..<br />> Minor question:<br />> <br />> I must have an old version - I got 'git-0.03', but<br />> it doesn't have 'checkout-cache', and its 'read-tree'<br />> directly writes my working files.<br />> <br />> How do I get a current version? Well, one way I see,<br />> and that's to pick up Pasky's:<br />> <br />> <a href="http://pasky.or.cz/~pasky/dev/git/git-pasky-base.tar.bz2">http://pasky.or.cz/~pasky/dev/git/git-pasky-base.tar.bz2</a><br />> <br />> Perhaps that's the best way?<br /><br />You can take mine, and do:<br /><br /> git pull pasky<br /> git pull linus<br /> cp .dircache/HEAD .dircache/HEAD.local<br /><br />Now, your tree and git filesystem is up to date.<br /><br /> git track local<br /><br />Now, when you do git pull pasky, your working tree will not be updated<br />automatically anymore.<br /><br /> git track linus<br /><br />Now, you start tracking Linus' tree instead. Note that the initial<br />update will blow away the scripts in your current tree, so before you do<br />the last two steps you will probably want to clone the tree and set PATH<br />to the one still tracking me, so you get all the comfort. ;-)<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-11 02:13 聽聽 [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>

CINXE.COM

LKML: Petr Baudis: Re: Re: more git updates..