<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div style=""
data-md-original="%3Cdiv%20class%3D%22moz-cite-prefix%22%3E(I%20know%20we%20talked%20about%20this%20at%20lunch%2C%20but%20I%20wanted%20to%20post%20too%20for%20others'%20benefit.)%3Cbr%3E%3Cbr%3EOn%2004%2F17%2F2014%2011%3A12%20AM%2C%20peter%20wrote%3A%3Cbr%3E%3C%2Fdiv%3E%3Cblockquote%20cite%3D%22mid%3A1397747578.6546.27.camel%40peter%22%20type%3D%22cite%22%3E%3Cpre%20wrap%3D%22%22%3EOn%20Thu%2C%202014-04-17%20at%2010%3A24%20-0400%2C%20Brett%20Smith%20wrote%3A%0A%0A%3C%2Fpre%3E%3Cblockquote%20type%3D%22cite%22%3E%3Cpre%20wrap%3D%22%22%3EI%20was%20just%20reviewing%20a%20branch%20for%20Tom.%20Since%20this%20was%20my%20second%20pass%0Aon%20it%2C%20I%20went%20to%20the%20git%20log%20to%20see%20what%20changed%20since%20my%20last%20pass.%0AI%E2%80%99ve%20attached%20the%20log%20graph%20output%20magit%20showed%20me.%20The%20complicated%0Ahistory%20tree%20made%20it%20challenging%20to%20find%20all%20the%20relevant%20revisions.%0ATom%20described%20making%20several%20changes%20that%20I%20didn%E2%80%
99t%20see%20at%20first%2C%20until%0AI%20found%201881da32%20and%20friends%20near%20the%20bottom%20of%20the%20screen.%0A%3C%2Fpre%3E%3C%2Fblockquote%3E%3Cpre%20wrap%3D%22%22%3E%0AAs%20I%20look%20at%20it%2C%20the%20problem%20you%20actually%20have%20here%20is%20that%20it%20is%20hard%0Ato%20identify%20which%20commits%20go%20with%20the%20feature%20branch%20you're%20trying%20to%0Areview%2C%20and%20which%20commits%20are%20merges%20from%20other%20places.%20%20Is%20that%20fair%3F%3C%2Fpre%3E%3C%2Fblockquote%3EThat%20is%20the%20problem%20I%20had%20this%20morning.%C2%A0%20And%20as%20people%20have%20pointed%20out%20since%20then%2C%20%60git%20log%60%20can%20help%20solve%20this%20problem%20with%20specs%20like%20%60--first-parent%60%20and%20%60%5Emaster%60.%3Cbr%3E%3Cbr%3EI%20think%20a%20merge-heavy%20history%20can%20make%20other%20problems%20too%2C%20though.%C2%A0%20In%20particular%2C%20when%20you're%20reviewing%20history%20on%20master%20itself.%C2%A0%20Trying%20to%20understand%20where%20something%2
0came%20from%2C%20either%20manually%20or%20using%20a%20tool%20like%20git%20bisect%2C%20is%20more%20difficult%20with%20a%20complicated%20tree.%3Cbr%3E%3Cbr%3E%3Cbr%3E"
class="markdown-here-wrapper" data-md-url="null"
id="markdown-here-wrapper-446193">
<p style="margin: 1.2em 0px ! important;">(I know we talked about
this at lunch, but I wanted to post too for others’ benefit.)</p>
<p style="margin: 1.2em 0px ! important;">On 04/17/2014 11:12 AM,
peter wrote:</p>
<p style="margin: 1.2em 0px ! important;"></p>
<div class="markdown-here-exclude">
<p></p>
<blockquote cite="mid:1397747578.6546.27.camel@peter"
type="cite">
<pre wrap="">On Thu, 2014-04-17 at 10:24 -0400, Brett Smith wrote:
</pre>
<blockquote type="cite">
<pre wrap="">I was just reviewing a branch for Tom. Since this was my second pass
on it, I went to the git log to see what changed since my last pass.
I’ve attached the log graph output magit showed me. The complicated
history tree made it challenging to find all the relevant revisions.
Tom described making several changes that I didn’t see at first, until
I found 1881da32 and friends near the bottom of the screen.
</pre>
</blockquote>
<pre wrap="">As I look at it, the problem you actually have here is that it is hard
to identify which commits go with the feature branch you're trying to
review, and which commits are merges from other places. Is that fair?</pre>
</blockquote>
<p></p>
</div>
<p style="margin: 1.2em 0px ! important;"></p>
<p style="margin: 1.2em 0px ! important;">That is the problem I
had this morning. And as people have pointed out since then, <code
style="font-size: 0.85em; font-family:
Consolas,Inconsolata,Courier,monospace;margin: 0px 0.15em;
padding: 0px 0.3em; white-space: pre-wrap; border: 1px solid
rgb(234, 234, 234); background-color: rgb(248, 248, 248);
border-radius: 3px 3px 3px 3px; display: inline;">git log</code>
can help solve this problem with specs like <code
style="font-size: 0.85em; font-family:
Consolas,Inconsolata,Courier,monospace;margin: 0px 0.15em;
padding: 0px 0.3em; white-space: pre-wrap; border: 1px solid
rgb(234, 234, 234); background-color: rgb(248, 248, 248);
border-radius: 3px 3px 3px 3px; display: inline;">--first-parent</code>
and <code style="font-size: 0.85em; font-family:
Consolas,Inconsolata,Courier,monospace;margin: 0px 0.15em;
padding: 0px 0.3em; white-space: pre-wrap; border: 1px solid
rgb(234, 234, 234); background-color: rgb(248, 248, 248);
border-radius: 3px 3px 3px 3px; display: inline;">^master</code>.</p>
<p style="margin: 1.2em 0px ! important;">I think a merge-heavy
history can make other problems too, though. In particular, when
you’re reviewing history on master itself. Trying to understand
where something came from, either manually or using a tool like
git bisect, is more difficult with a complicated tree.</p>
</div>
<div class="moz-signature markdown-here-signature">-- <br>
Brett Smith</div>
</body>
</html>