| --- Log opened Tue Jul 30 00:00:51 2019 |
| 00:55 | | Kindamoody is now known as Kindamoody[zZz] |
| 01:14 | | himi [sjjf@Nightstar-1drtbs.anu.edu.au] has joined #code |
| 01:14 | | mode/#code [+o himi] by ChanServ |
| 01:16 | | celticminstrel [celticminst@Nightstar-6an2qt.dsl.bell.ca] has joined #code |
| 01:16 | | mode/#code [+o celticminstrel] by ChanServ |
| 02:07 | | Vorntastic [uid293981@Nightstar-6br85t.irccloud.com] has quit [[NS] Quit: Connection closed for inactivity] |
| 02:12 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has quit [Connection closed] |
| 03:52 | | Lamb3 [Dawg@Nightstar-52ic2g.wechall.net] has quit [Ping timeout: 121 seconds] |
| 04:48 | | celticminstrel [celticminst@Nightstar-6an2qt.dsl.bell.ca] has quit [Connection closed] |
| 07:45 | | himi [sjjf@Nightstar-1drtbs.anu.edu.au] has quit [Ping timeout: 121 seconds] |
| 08:32 | | Kindamoody[zZz] is now known as Kindamoody |
| 09:22 | | Kindamoody is now known as Kindamoody|afk |
| 09:33 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| 09:33 | | mode/#code [+qo Vornicus Vornicus] by ChanServ |
| 12:05 | | macdjord|slep [macdjord@Nightstar-rslo4b.mc.videotron.ca] has joined #code |
| 12:06 | | mode/#code [+o macdjord|slep] by ChanServ |
| 12:08 | | mac [macdjord@Nightstar-rslo4b.mc.videotron.ca] has quit [Ping timeout: 121 seconds] |
| 12:24 | | himi [sjjf@Nightstar-v37cpe.internode.on.net] has joined #code |
| 12:24 | | mode/#code [+o himi] by ChanServ |
| 16:26 | <&[R]> | <nola> No, regular 3.0+ armour bonus. Gotta balance the glorious nippon steel somehow. |
| 16:26 | <&[R]> | <MilkmanDan> But...that sword parries almost every attack. :( |
| 16:26 | <&[R]> | <LuserInServRoom> Why are you using decimals? |
| 16:26 | <&[R]> | <nola> Because I can? |
| 16:26 | <&[R]> | <benrob0329> >when a programmer complains about unneeded use of floating point variables |
| 16:26 | <&[R]> | <nola> here you go then: (int)3.0 |
| 16:30 | < Pink> | Trust Unity to take a trivially simple process and and make hours of torture from it because they can't be bothered to document -_- |
| 16:49 | | Emmy [Emmy@Nightstar-9p7hb1.direct-adsl.nl] has joined #code |
| 17:16 | | Lamb3 [Dawg@Nightstar-52ic2g.wechall.net] has joined #code |
| 17:48 | | himi [sjjf@Nightstar-v37cpe.internode.on.net] has quit [Ping timeout: 121 seconds] |
| 17:51 | | himi [sjjf@Nightstar-v37cpe.internode.on.net] has joined #code |
| 17:51 | | mode/#code [+o himi] by ChanServ |
| 18:56 | <&McMartin> | If that's D&D version "3.0" is fixed point, not floating.\ |
| 20:32 | | Derakon [Derakon@Nightstar-fr5qel.ca.comcast.net] has joined #code |
| 20:32 | | mode/#code [+ao Derakon Derakon] by ChanServ |
| 20:32 | | * Derakon grmbles at Git. |
| 20:33 | <&Derakon> | I accidentally added my "Library" directory to Git, which is a bunch of autogenerated Unity files that should not be tracked. |
| 20:33 | <&Derakon> | I don't want to delete them, but I don't want git to track them any more. |
| 20:33 | <&Derakon> | But no matter how many times I do `git rm -r --cached Library` it will notice whenever files in the directory change. |
| 20:34 | <&Derakon> | (As a "this tracked file was changed!" kind of thing, not a "there's this untracked file in the repository directory!" kind of thing) |
| 20:36 | <&ToxicFrog> | Derakon: you did commit after the rm, right? |
| 20:36 | <&Derakon> | Yes. |
| 20:37 | <&ToxicFrog> | But the same files that show up as deleted in the diff for that commit are still showing up as modified? |
| 20:37 | <&Derakon> | Yes. |
| 20:38 | <&Derakon> | In particular, Library/ScriptAssemblies/Assembly-CSharp.dll |
| 20:38 | <&Derakon> | But a bunch of others as well. |
| 20:38 | <&ToxicFrog> | What does `git ls-tree HEAD -- Library/` show you? |
| 20:38 | <&ToxicFrog> | That's what it thinks is actually present in the most recent commit. |
| 20:38 | <&ToxicFrog> | If it lists something, it might be instructive to rm --cached that, commit again, and see what ls-tree says then. |
| 20:39 | <&ToxicFrog> | (it would also be a good idea to .gitignore Library to keep this from reocurring, if you haven't already) |
| 20:39 | <&Derakon> | https://pastebin.com/1p78GPMn |
| 20:40 | <&Derakon> | And yeah, I set up .gitignore to ignore Library. |
| 20:40 | <&ToxicFrog> | git rm -rf --cached Library; git commit -m "delete library again"; and then see what ls-tree says now? |
| 20:41 | <&ToxicFrog> | Assuming the rm actually produces changes. |
| 20:41 | <&Derakon> | Did that, ls-tree still shows files being tracked. |
| 20:41 | <&ToxicFrog> | What does the diff show? |
| 20:41 | <&Derakon> | Between the ls-tree outputs? |
| 20:41 | <&ToxicFrog> | The diff created by the `git rm` command |
| 20:42 | <&ToxicFrog> | It produces a staged "delete" change which should appear in `git status` before commit and `git diff` after. |
| 20:42 | <&ToxicFrog> | If that says that, e.g., Library/metadata was deleted in HEAD but `git ls-tree HEAD` still displays a `Library/metadata` file, there's something super weird going on. |
| 20:42 | <&ToxicFrog> | Note also that without the `-f`, `git rm` will not delete files that are changed-but-not-yet-committed. |
| 20:43 | <&Derakon> | Well, right now `git rm -r --cached Library` says there's nothing to delete: "pathspec 'Library' did not match any files". But here's what the most recent rm did: https://pastebin.com/APe4Ury1 |
| 20:43 | <&Derakon> | -rf is the same |
| 20:43 | <&ToxicFrog> | Did you `git status` after that? Does it list all those files as deleted? |
| 20:44 | <&ToxicFrog> | And once you committed that change, does `git show HEAD` list them as deleted? |
| 20:44 | <&Derakon> | I didn't do `git status`, but IME it says "here's a list of like 500 files you're deleting". |
| 20:44 | <&Derakon> | ...oh, wait, I haven't committed the latest rm. >.< |
| 20:44 | <&Derakon> | Sorry, I'm a bit scattered today. |
| 20:45 | <&Derakon> | Here's a git status: https://pastebin.com/RnZKPDep |
| 20:45 | <&Derakon> | Huh, tried to commit that, `git status` still shows them as pending deletions. |
| 20:45 | <&ToxicFrog> | What was the output of `git commit`? |
| 20:46 | <&ToxicFrog> | And how did you invoke it? |
| 20:46 | <&Derakon> | $ git commit -m "Stop tracking library you twit" . |
| 20:46 | <&Derakon> | warning: LF will be replaced by CRLF in Library/CurrentLayout.dwlt. |
| 20:46 | <&Derakon> | The file will have its original line endings in your working directory |
| 20:46 | <&Derakon> | warning: LF will be replaced by CRLF in Library/LibraryFormatVersion.txt. |
| 20:46 | <&Derakon> | The file will have its original line endings in your working directory |
| 20:46 | <&Derakon> | On branch master |
| 20:46 | <&Derakon> | nothing to commit, working tree clean |
| 20:47 | <&ToxicFrog> | You have a trailing . |
| 20:47 | <&ToxicFrog> | That means "ignore the index and commit the current state of the working directory" |
| 20:47 | <&ToxicFrog> | I'm guessing you usually work without the index and just commit the working directory directly, and habitually add the `.`? |
| 20:47 | <&Derakon> | Oh, right, sorry. I usually do that to get it to commit files I haven't explicitly added. |
| 20:48 | <&Derakon> | Removing the `.` allows commit to actually clear up the deleted files... |
| 20:48 | <&ToxicFrog> | So, yeah, that means it'll ignore all of those staged rms, because they're staged in the index only (because --cached, which is a very stupid option name) |
| 20:48 | <&Derakon> | And ls-tree now says there's nothing in Library. |
| 20:48 | <&Derakon> | OK, here's hoping that solved that problem. Thanks. |
| 20:51 | | Kindamoody|afk is now known as Kindamoody |
| 21:09 | | Pinkhair [user1@Nightstar-g7hdo5.dyn.optonline.net] has joined #code |
| 21:12 | | Pink [user1@Nightstar-g7hdo5.dyn.optonline.net] has quit [Ping timeout: 121 seconds] |
| 21:44 | | himi [sjjf@Nightstar-v37cpe.internode.on.net] has quit [Ping timeout: 121 seconds] |
| 21:48 | | himi [sjjf@Nightstar-v37cpe.internode.on.net] has joined #code |
| 21:48 | | mode/#code [+o himi] by ChanServ |
| --- Log closed Tue Jul 30 22:02:52 2019 |
| --- Log opened Tue Jul 30 22:03:31 2019 |
| 22:03 | | TheWatcher [chris@GlobalOperator.Nightstar.Net] has joined #code |
| 22:03 | | Irssi: #code: Total of 35 nicks [26 ops, 0 halfops, 0 voices, 9 normal] |
| 22:03 | | mode/#code [+o TheWatcher] by ChanServ |
| 22:03 | | Irssi: Join to #code was synced in 15 secs |
| 22:22 | | ErikMesoy [Bruker@Nightstar-r88323.bb.online.no] has quit [Connection closed] |
| 22:22 | | ErikMesoy [Bruker@Nightstar-r88323.bb.online.no] has joined #code |
| 22:50 | | himi [sjjf@Nightstar-v37cpe.internode.on.net] has quit [Ping timeout: 121 seconds] |
| 22:59 | | Emmy [Emmy@Nightstar-9p7hb1.direct-adsl.nl] has quit [Ping timeout: 121 seconds] |
| 23:30 | | Kindamoody is now known as Kindamoody[zZz] |
| --- Log closed Wed Jul 31 00:00:25 2019 |