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/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/23" onclick="this.href='/lkml/headers'+'/2005/4/10/23';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/10/23">[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/13">Christopher Li</a><ul><li><a href="/lkml/2005/4/10/18">Junio C Hamano</a><ul><li class="origin"><a href="">Petr Baudis</a></li><li><a href="/lkml/2005/4/10/27">Christopher Li</a><ul><li><a href="/lkml/2005/4/10/39"> tony.luck@intel ...</a></li></ul></li></ul></li><li><a href="/lkml/2005/4/10/21">Wichert Akkerman</a></li><li><a href="/lkml/2005/4/10/22">Petr Baudis</a><ul><li><a href="/lkml/2005/4/10/28">Christopher Li</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">Sun, 10 Apr 2005 11:48:13 +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 11:28:54AM CEST, I got a letter<br />where Junio C Hamano <junkio@cox.net> told me that...<br />> >>>>> "CL" == Christopher Li <lkml@chrisli.org> writes:<br />> <br />> CL> On Sun, Apr 10, 2005 at 12:51:59AM -0700, Junio C Hamano wrote:<br />> >> <br />> >> But I am wondering what your plans are to handle renames---or<br />> >> does git already represent them?<br />> >> <br />> <br />> CL> Rename should just work. It will create a new tree object and you<br />> CL> will notice that in the entry that changed, the hash for the blob<br />> CL> object is the same.<br />> <br />> Sorry, I was unclear. But doesn't that imply that a SCM built<br />> on top of git storage needs to read all the commit and tree<br />> records up to the common ancestor to show tree diffs between two<br />> forked tree?<br /><br />No. See diff-tree output and<br /><a href="http://pasky.or.cz/~pasky/dev/git/gitdiff-do">http://pasky.or.cz/~pasky/dev/git/gitdiff-do</a> for how it's done.<br />Basically, you just take the two trees and compare them linearily (do a<br />normal diff on them, essentialy). Then the differences you spot this way<br />are everything what needs to appear in the patch.<br /><br />> I suspect that another problem is that noticing the move of the<br />> same SHA1 hash from one pathname to another and recognizing that<br />> as a rename would not always work in the real world, because<br />> sometimes people move files *and* make small changes at the same<br />> time. If git is meant to be an intermediate format to suck<br />> existing kernel history out of BK so that the history can be<br />> converted for the next SCM chosen for the kernel work, I would<br />> imagine that there needs to be a way to represent such a case.<br />> Maybe convert a file rename as two git trees (one tree for pure<br />> move which immediately followed by another tree for edit) if it<br />> is not a pure move?<br /><br />Actually, this could be possible too I think. We will have to make<br />diff-tree two-pass, but it is already so blinding fast that I guess that<br />doesn't hurt too much. I might try to get my hands on that.<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 11:51 聽聽 [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>