<div dir="ltr">Here's what I've come up with (anyone with more extensive git knowledge please read on and chime in with more/better information):<div><br></div><div>I have a full fork of <a href="https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev" target="_blank">https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev</a> that I periodically sync via:</div><div><br></div><div>git fetch upstream; git checkout master; git merge upstream/master<br></div><div><br></div><div>I make sure I do this immediately before committing any of my own changes, which I only do when I know I'm going to submit a pull request. I then push my changes to my personal repo on github and submit a pull request via the github web UI.</div><div><br></div><div>I *think* what might have happened here is either that your shallow clone caused git to think that my merges were something new (they weren't, they were just your commits being folded back into my repo) or if it realized that, when you did a regular git pull, it was going back and grabbing the rest of the repo that your shallow clone didn't originally download.</div><div><br></div><div>The only things I've found so far related to duplicate commits revolves around branches and the variety of ways that they can be handled via squashing/cherry picking/rebasing. But we're not doing any of that here: we're just trying to add a few changed files to what should otherwise be identical repos. So what I'm wondering is, if there is an issue, was it doing the shallow clone? And if so what, if anything, should we do to clean it up?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Mar 4, 2020 at 3:44 PM Juan Vuletich <<a href="mailto:juan@jvuletich.org" target="_blank">juan@jvuletich.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><u></u>
<div bgcolor="#ffffff">
I just clicked on the [merge] button in the GitHub web UI.<br>
<br>
Maybe (not sure!) in all previous merge requests from you I added
the files 'by hand', not actually using the merge request, to avoid
the bogus commits.<br>
<br>
And maybe (again not sure) the 490MiB were because I originally
cloned the repo by doing `git clone --depth 1
<a href="https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev.git" target="_blank">https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev.git</a>' as
suggested in GettingStarted.md, to avoid fetching all the repo
history. If this was the case, these kind of merge request forces
other users to pull all the history on `git pull` even if not really
needed.<br>
<br>
In any case, there should be some way to avoid the bogus commits.<br>
<br>
Thanks,<br>
<pre cols="72">--
Juan Vuletich
<a href="http://www.cuis-smalltalk.org" target="_blank">www.cuis-smalltalk.org</a>
<a href="https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev" target="_blank">https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev</a>
<a href="https://github.com/jvuletich" target="_blank">https://github.com/jvuletich</a>
<a href="https://www.linkedin.com/in/juan-vuletich-75611b3" target="_blank">https://www.linkedin.com/in/juan-vuletich-75611b3</a>
@JuanVuletich</pre>
<br>
<br>
On 3/4/2020 2:29 PM, Phil B via Cuis-dev wrote:
<blockquote type="cite">
<div dir="ltr">That doesn't sound right... how did you do the
merge? (I don't doubt this is a problem since now when I look
at the commit history on the main repo I see all my merge
commits in there which I don't recall seeing after previous pull
request merges)<br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Wed, Mar 4, 2020 at 11:02
AM Juan Vuletich <<a href="mailto:juan@jvuletich.org" target="_blank">juan@jvuletich.org</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div bgcolor="#ffffff"> Hi Phil,<br>
<br>
On 2/26/2020 4:39 PM, Phil B via Cuis-dev wrote:
<blockquote type="cite">
<div dir="ltr">Pull request submitted (there are a couple
of impacted core packages) </div>
</blockquote>
<br>
Integrated. Thanks!<br>
<br>
<blockquote type="cite">
<div dir="ltr">As always, ignore all the commits (that's
just me keeping in sync with the main repo) and look at
the diffs.</div>
</blockquote>
<br>
Still, after merge, doing 'git pull' in my machine fetched
almost half a gigabyte of stuff! In the future, can you
please exclude all those commits from the pull request? (No,
I don't know how to do that. I don't know git in such
detail. But there must be a way. It doesn't make much sense
for everybody else to need to fetch 479MiB when all they
want is a few KiB)<br>
<br>
Thanks,<br>
<br>
<br>
Juans-MacBook-Pro:Cuis-Smalltalk juanvuletich$ cd
Cuis-Smalltalk-Dev/<br>
Juans-MacBook-Pro:Cuis-Smalltalk-Dev juanvuletich$ git pull<br>
remote: Enumerating objects: 10179, done.<br>
remote: Counting objects: 100% (9663/9663), done.<br>
remote: Compressing objects: 100% (4950/4950), done.<br>
remote: Total 9559 (delta 4626), reused 9486 (delta 4563),
pack-reused 0<br>
Receiving objects: 100% (9559/9559), 479.00 MiB | 10.33
MiB/s, done.<br>
Resolving deltas: 100% (4626/4626), completed with 57 local
objects.<br>
From <a href="https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev" target="_blank">https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev</a><br>
7e23a84..32e2f22 master -> origin/master<br>
Updating 7e23a84..32e2f22<br>
Fast-forward<br>
CoreUpdates/<a href="http://4048-fileReaderServices-use-FileEntry-PhilBellalouna-2020Feb26-12h37m-pb.001.cs.st" target="_blank">4048-fileReaderServices-use-FileEntry-PhilBellalouna-2020Feb26-12h37m-pb.001.cs.st</a>
| 325
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++<br>
Packages/Features/<a href="http://Compression.pck.st" target="_blank">Compression.pck.st</a>
| 80 ++++++++++-----------<br>
Packages/Features/<a href="http://Wallpaper.pck.st" target="_blank">Wallpaper.pck.st</a>
| 8 +--<br>
3 files changed, 369 insertions(+), 44 deletions(-)<br>
create mode 100644
CoreUpdates/<a href="http://4048-fileReaderServices-use-FileEntry-PhilBellalouna-2020Feb26-12h37m-pb.001.cs.st" target="_blank">4048-fileReaderServices-use-FileEntry-PhilBellalouna-2020Feb26-12h37m-pb.001.cs.st</a><br>
Juans-MacBook-Pro:Cuis-Smalltalk-Dev juanvuletich$ <br>
<br>
<blockquote type="cite">
<div dir="ltr">
<div>Thanks,</div>
<div>Phil</div>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Wed, Feb 26, 2020
at 9:43 AM Juan Vuletich via Cuis-dev <<a href="mailto:cuis-dev@lists.cuis.st" target="_blank">cuis-dev@lists.cuis.st</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Phil,<br>
<br>
Feel free to replace Strings with FileEntries
anywhere. It will be a <br>
great contribution. Those Strings are leftovers from
before FileEntry.<br>
<br>
I'm sure there are plenty of places in need of
cleanup. As we can't <br>
schedule anyone the task of cleaning up the system, we
do it in small <br>
unplanned steps, anytime we find an annoyance and feel
like cleaning it.<br>
<br>
On 2/25/2020 5:46 AM, Phil B via Cuis-dev wrote:<br>
> Here's something I've been meaning to fix for a
while now: we have <br>
> FileList and the related
#fileReaderServicesForFile:suffix: methods <br>
> (and in turn the methods they point to) which
almost all have 'File' <br>
> in their name but then proceed to take and expect
a string filename <br>
> rather than a FileEntry. Would there be any
objection to a changeset <br>
> that renames the vague *File* method names to
*FileEntry* and actually <br>
> passes around FileEntry rather than String
instances? If anyone has a <br>
> problem with that and wants to keep using
strings, then how about we <br>
> at least rename these methods from *File* to
*Filename*?<br>
<br>
Thanks,<br>
<br>
-- <br>
Juan Vuletich<br>
<a href="http://www.cuis-smalltalk.org" rel="noreferrer" target="_blank">www.cuis-smalltalk.org</a><br>
<a href="https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev" rel="noreferrer" target="_blank">https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev</a><br>
<a href="https://github.com/jvuletich" rel="noreferrer" target="_blank">https://github.com/jvuletich</a><br>
<a href="https://www.linkedin.com/in/juan-vuletich-75611b3" rel="noreferrer" target="_blank">https://www.linkedin.com/in/juan-vuletich-75611b3</a><br>
@JuanVuletich<br>
<br>
-- <br>
Cuis-dev mailing list<br>
<a href="mailto:Cuis-dev@lists.cuis.st" target="_blank">Cuis-dev@lists.cuis.st</a><br>
<a href="https://lists.cuis.st/mailman/listinfo/cuis-dev" rel="noreferrer" target="_blank">https://lists.cuis.st/mailman/listinfo/cuis-dev</a><br>
</blockquote>
</div>
</blockquote>
<br>
<br>
<pre cols="72">--
Juan Vuletich
<a href="http://www.cuis-smalltalk.org" target="_blank">www.cuis-smalltalk.org</a>
<a href="https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev" target="_blank">https://github.com/Cuis-Smalltalk/Cuis-Smalltalk-Dev</a>
<a href="https://github.com/jvuletich" target="_blank">https://github.com/jvuletich</a>
<a href="https://www.linkedin.com/in/juan-vuletich-75611b3" target="_blank">https://www.linkedin.com/in/juan-vuletich-75611b3</a>
@JuanVuletich</pre>
</div>
</blockquote>
</div>
</blockquote>
<br>
<br>
</div>
</blockquote></div></div>