<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 09/01/2020 03:16, Mehdi AMINI wrote:<br>
</div>
<blockquote type="cite" cite="mid:CANF-O=YZO1AqCoR8tV9PLbZATSCh-s6qsCw43Pg5=80KDr6_+Q@mail.gmail.com">
<div dir="ltr">
<div class="gmail_quote">What is the latest/current proposed merge commit showing what will be pushed to the monorepo?</div>
</div>
</blockquote>
<p>Please see [0] and [1].</p>
<p>If you want a one-liner to obtain the master branch as it would look after the merge, this will create a directory called llvm-project-post-merge:</p>
<p>git clone --single-branch -b rewritten-history-v4-llvm-project-merge <a class="moz-txt-link-freetext" href="https://github.com/peterwaller-arm/f18">
https://github.com/peterwaller-arm/f18</a> llvm-project-post-merge</p>
<p>(single-branch is necessary to avoid pulling down all the other branches I have in there).<br>
</p>
<blockquote type="cite" cite="mid:CANF-O=YZO1AqCoR8tV9PLbZATSCh-s6qsCw43Pg5=80KDr6_+Q@mail.gmail.com">
<div dir="ltr">
<div class="gmail_quote">
<div>Can you make sure to prune/repack the repo before pushing?</div>
</div>
</div>
</blockquote>
<p>My understanding is that when I say "git push", object negotiation happens between my git client and github, and the objects github needs are sent there. I will only be pushing one ref (master), so I don't expect prune will have an effect. I don't see any
way to control the repacking on the github side.</p>
<p>It's not github, but gitlab's docs say they repack after all pushes: <a class="moz-txt-link-freetext" href="https://docs.gitlab.com/ee/administration/housekeeping.html">
https://docs.gitlab.com/ee/administration/housekeeping.html</a></p>
<p>I imagine github do the same. I can't find anything in their docs to that effect that I can link to. I've written to github support to them to ask what to expect. As a quick experiment I compared the size of the packfiles after a clone of each:<br>
</p>
<p>840M llvm-project-single-branch/.git<br>
805M f18-post-merge-single-branch/.git<br>
</p>
<p>Hmm, the rewritten history branch, with both llvm and f18, is smaller than f18 alone. This suggests to me that the repositories aren't repacked at the same rate.</p>
<p>Please correct me if I'm wrong. I can repack for good measure, but I don't think it will affect anyone other than me.<br>
</p>
<blockquote type="cite" cite="mid:CANF-O=YZO1AqCoR8tV9PLbZATSCh-s6qsCw43Pg5=80KDr6_+Q@mail.gmail.com">
<div dir="ltr">
<div class="gmail_quote">
<div>Are the license header updated to be the LLVM license?</div>
<div>The test don't seem to be lit-based testing: is this part of the TODO list?</div>
</div>
</div>
</blockquote>
<p>Yes on both counts. Please see Richard Barton's email, points 3 and 5 in [2] where he collects a list of concerns like this.</p>
<p>[0] <a class="moz-txt-link-freetext" href="https://github.com/flang-compiler/f18/pull/854#issuecomment-572578180">
https://github.com/flang-compiler/f18/pull/854#issuecomment-572578180</a></p>
<p>[1] <a class="moz-txt-link-freetext" href="https://github.com/peterwaller-arm/f18/commits/rewritten-history-v4-llvm-project-merge">
https://github.com/peterwaller-arm/f18/commits/rewritten-history-v4-llvm-project-merge</a><br>
</p>
<p>[2] <a class="moz-txt-link-freetext" href="http://lists.llvm.org/pipermail/llvm-dev/2020-January/138103.html">
http://lists.llvm.org/pipermail/llvm-dev/2020-January/138103.html</a><br>
</p>
</body>
</html>