| 2021-08-21 |
| ← jetchisel left | 00:00 |
| → jetchisel joined | 00:00 |
| → ash_worksi joined | 00:04 |
| ← ash_worksi left | 00:04 |
| ← jetchisel left | 00:05 |
| ← AbleBacon left | 00:05 |
| ← molt left | 00:05 |
| → molt joined | 00:06 |
| → jetchisel joined | 00:07 |
| ← jetchisel left | 00:09 |
| → jetchisel joined | 00:10 |
| ← EvilDMP left | 00:10 |
| ← jetchisel left | 00:12 |
| → jetchisel joined | 00:13 |
| ← JanC left | 00:13 |
| → JanC joined | 00:13 |
| ← JanC left | 00:15 |
| ← jetchisel left | 00:15 |
| → jetchisel joined | 00:16 |
| ← christall left | 00:18 |
| → JanC joined | 00:21 |
| ← jetchisel left | 00:23 |
| → jetchisel joined | 00:24 |
| → Nalt joined | 00:24 |
| ← jetchisel left | 00:26 |
| → jetchisel joined | 00:26 |
| ← tirnanog left | 00:27 |
| ← jetchisel left | 00:28 |
| → jetchisel joined | 00:29 |
| ← Gurkenglas left | 00:30 |
| ← jwillikers left | 00:35 |
| ← jetchisel left | 00:36 |
| → YuGiOhJCJ joined | 00:37 |
| → jetchisel joined | 00:38 |
| → sudoforge joined | 00:38 |
| → Samian joined | 00:44 |
| ← Samian left | 00:44 |
| ← subopt left | 00:44 |
| ← jetchisel left | 00:45 |
| → christall joined | 00:46 |
| → jetchisel joined | 00:46 |
| ← Gustavo6046 left | 00:49 |
| ← m0viefreak left | 00:52 |
| ← molt left | 00:52 |
| → molt joined | 00:52 |
| ← jetchisel left | 00:53 |
| → jetchisel joined | 00:54 |
| ← jetchisel left | 00:56 |
| → jetchisel joined | 00:56 |
| ← arcatech left | 00:58 |
| ← jetchisel left | 01:03 |
| → jetchisel joined | 01:05 |
| → igemnace joined | 01:08 |
| ← christall left | 01:09 |
| ← jetchisel left | 01:12 |
| → Gustavo6046 joined | 01:13 |
| ← Tetractys left | 01:15 |
| → Tetractys joined | 01:19 |
| → jwillikers joined | 01:21 |
| → jazzy joined | 01:24 |
| ← Drek45 left | 01:30 |
| ← molt left | 01:33 |
| → molt joined | 01:34 |
| ← howdoi left | 01:36 |
| → sgn joined | 01:37 |
| → Samian joined | 01:41 |
| ← FFY00 left | 01:45 |
| → Drek45 joined | 01:51 |
| ← jwillikers left | 01:51 |
| ← skapata left | 01:54 |
| ← Shashin left | 01:55 |
| ← pretty_dumm_guy left | 01:56 |
| → ackyshake joined | 01:57 |
| ← Murr left | 02:02 |
| → Murr joined | 02:02 |
| ← rkta left | 02:02 |
| → rkta joined | 02:03 |
| ← joo left | 02:04 |
| ← chemsmith left | 02:05 |
| → chemsmith joined | 02:05 |
| ← dmlloyd left | 02:05 |
| ← fdv left | 02:05 |
| ← ecs left | 02:05 |
| ← ephemer0l left | 02:06 |
| ← andreas3- left | 02:06 |
| ← soifou left | 02:06 |
| → ephemer0l joined | 02:06 |
| → soifou joined | 02:06 |
| ← zulutango left | 02:06 |
| → andreas303 joined | 02:06 |
| → dmlloyd joined | 02:07 |
| → zulutango joined | 02:07 |
| ← lucerne left | 02:07 |
| → ecs joined | 02:07 |
| → fdv joined | 02:07 |
| → lucerne joined | 02:07 |
| → darkbit joined | 02:16 |
| → joo joined | 02:19 |
| ← joo left | 02:19 |
| → joo joined | 02:19 |
| ← FinnElija left | 02:22 |
| → FinnElija joined | 02:24 |
| ← rahl left | 02:25 |
| ← xx left | 02:25 |
| → rahl joined | 02:27 |
| → christall joined | 02:27 |
| → zebrag joined | 02:32 |
| ← vysn left | 02:45 |
| ← AnAverageHuman left | 02:48 |
| → thebombzen joined | 02:52 |
| ← christall left | 02:55 |
| → shlomif joined | 02:57 |
| ← Samian left | 03:01 |
| → AnAverageHuman joined | 03:09 |
| ← TJ- left | 03:09 |
| → TJ- joined | 03:10 |
| ← goodugly left | 03:15 |
| ← Tetractys left | 03:29 |
| ← dsrt^ left | 03:37 |
| ← Shentino left | 03:46 |
| → Shentino joined | 03:46 |
| → Vonter joined | 03:51 |
| ← zebrag left | 03:56 |
| ← Murr left | 04:02 |
| → Murr joined | 04:02 |
| ← venue left | 04:04 |
| → tristan__ joined | 04:08 |
| ← average left | 04:18 |
| ← Drek45 left | 04:21 |
| ← vishal left | 04:36 |
| → vishal joined | 04:38 |
| → auri joined | 04:46 |
| ← auri left | 04:46 |
| → auri joined | 04:46 |
| → gnoo joined | 04:49 |
| → Samian joined | 04:50 |
| → christall joined | 04:52 |
| ← ferdna left | 05:05 |
| ← FH_thecat left | 05:08 |
| ← pulse left | 05:08 |
| ← sudoforge left | 05:11 |
| ← vdamewood left | 05:14 |
| → manin joined | 05:14 |
| ← thiago left | 05:17 |
| ← christall left | 05:22 |
| → mikkel joined | 05:29 |
| ← manin left | 05:32 |
| → manin joined | 05:33 |
| ← AnAverageHuman left | 05:33 |
| ← gast0n left | 05:34 |
| → roadie joined | 05:35 |
| → randomuser joined | 05:44 |
| ← txtsd left | 05:49 |
| → vdamewood joined | 05:53 |
| ← hbautista left | 05:54 |
| → steam joined | 05:54 |
| ← lgc left | 05:54 |
| ← roadie left | 05:58 |
| → roadie joined | 05:58 |
| ← roadie left | 05:59 |
| → roadie joined | 06:00 |
| ← roadie left | 06:02 |
| → roadie joined | 06:03 |
|
ross
| hi all, made a stupid mistake. in a merge conflict, resolved the conflict, but didn't add the file to mark it as resolved. then I forgot I was in a conflict and kept editing. I haven't committed anything - how can I add just the changes that were relevant to the merge and mark it as resolved, but keep other changes for the next commit? | 06:09 |
| ← austin987 left | 06:09 |
|
ross
| git add --patch would be my go-to, but git wants to ignore the unmerged file, and I'm unconfident re forcing it - maybe git knows better than I do | 06:10 |
| → furrymcgee joined | 06:13 |
| → natrys joined | 06:16 |
| → Drek45 joined | 06:20 |
| → beshr joined | 06:20 |
| → FH_thecat joined | 06:22 |
| → austin987 joined | 06:22 |
| → node1 joined | 06:28 |
| ← Xaldafax left | 06:28 |
| ← Drek45 left | 06:28 |
|
node1
| Hello how to view the content of .pack file? | 06:29 |
| → Drek45 joined | 06:29 |
| → jstein joined | 06:40 |
| → vysn joined | 06:48 |
| → node1_ joined | 06:51 |
| ← node1 left | 06:51 |
| ← node1_ left | 06:53 |
| → node1_ joined | 06:53 |
| ← node1_ left | 06:58 |
| → Guest86 joined | 07:00 |
| ← Guest86 left | 07:01 |
| ← przemoc left | 07:04 |
| ← manin left | 07:04 |
| ← unluckyshrubbery left | 07:04 |
| → dsrt^ joined | 07:08 |
|
ross
| turns out `git restore --staged .` does exactly what I needed! | 07:09 |
| → aminvakil joined | 07:10 |
|
aminvakil
| hello, i have a repository with multiple branches which different configurations for building an application with custom configurations are in it | 07:12 |
|
| i mean some files differ from each other on different branch based on that branch needs and configurations | 07:13 |
|
| but i've read and heard before that you should always reach a single "main" or "devel" branch and having multiple branches which all goes their ways are wrong | 07:13 |
|
ikke
| aminvakil: it's not wrong persee, but the issue is that you probably also want to get common updates to these branches | 07:14 |
|
aminvakil
| handling them in a single branch are hard now, as it's working correctly and each branch is getting built using jenkins just fine | 07:14 |
|
| ikke: exactly, there are some tweaks which apply to all branches, right now i'm cherry-picking the commit across all branches and that is getting hard too :) | 07:15 |
| ← darkbit left | 07:15 |
|
ikke
| git has no easy way to handle that workflow | 07:15 |
|
| You could rebase each branch onto a common branch, but that means that the different branches are constantly changing | 07:16 |
|
aminvakil
| my question is what other problems i will face handling this in multiple branches and not merging them to a single main branch? | 07:16 |
| → mexen joined | 07:17 |
|
ikke
| git does not care that you do not ever merge a branch bacl | 07:17 |
|
aminvakil
| so this is just a "best-practice" in software development and stuff? | 07:17 |
| ← randomuser left | 07:18 |
| → randomuser joined | 07:18 |
|
ikke
| It's about workflow and what people expect | 07:18 |
| → christall joined | 07:19 |
|
ikke
| In these scenarios, they want to be able to merge branches and somehow expect git to keep specific differences | 07:19 |
|
| and that is not something git supports | 07:19 |
|
| You could technically do something with merge drivers, but that's kinda iffy, and everyone needs to have this diff driver setup | 07:20 |
| → el314Guest20 joined | 07:22 |
|
aminvakil
| right, i will try rebasing branches to main and adding different configurations on top of it at least then | 07:23 |
| ← el314Guest20 left | 07:23 |
|
ikke
| note that people should avoid git pull (--merge) for these branches once you rebased them | 07:25 |
|
| that includes jenkins as well | 07:25 |
|
aminvakil
| ah, i will see jenkins configuration on how it handles this, thanks | 07:26 |
|
| (although i'm still not convinced if i should do this or not) | 07:26 |
|
| i understand what is going on in these branches pretty well, who cares if the git tree is messy | 07:26 |
| → daoudr joined | 07:30 |
| → nobody_ joined | 07:33 |
| → palasso joined | 07:33 |
| ← Lunatrius left | 07:36 |
| → Lunatrius joined | 07:39 |
| ← af left | 07:39 |
| → EvilDMP joined | 07:42 |
| ← christall left | 07:48 |
| ← reset left | 07:51 |
| → darkbit joined | 07:51 |
| ← tristan__ left | 07:55 |
| → Adoi joined | 07:55 |
| → wender joined | 07:56 |
| ← computeiro left | 07:59 |
| → Gurkenglas joined | 08:00 |
| ← nobody_ left | 08:05 |
| → nobody_ joined | 08:06 |
| → b0nn joined | 08:12 |
| ← EvilDMP left | 08:15 |
| → af joined | 08:22 |
| ← nobody_ left | 08:24 |
| → nobody_ joined | 08:27 |
| → EvilDMP joined | 08:29 |
| ← Drek45 left | 08:31 |
| → xx joined | 08:32 |
| ← Betal left | 08:35 |
| → TASM joined | 08:35 |
| ← TASM left | 08:36 |
| → enoq joined | 08:37 |
| → rtjure joined | 08:43 |
| ← roadie left | 08:50 |
| ← dsrt^ left | 08:51 |
| ← EvilDMP left | 08:55 |
| → dsrt^ joined | 08:58 |
| → unluckyshrubbery joined | 09:04 |
| → absc joined | 09:12 |
| ← hnOsmium0001 left | 09:15 |
| → roadie joined | 09:17 |
| ← enoq left | 09:18 |
| → enoq joined | 09:20 |
| ← enoq left | 09:23 |
| → pretty_dumm_guy joined | 09:33 |
| ← shokohsc left | 09:33 |
| → shokohsc joined | 09:34 |
| → christall joined | 09:46 |
| ← cdown left | 09:48 |
| ← Misotauros left | 09:51 |
| ← rtjure left | 09:55 |
| ← Murr left | 10:02 |
| → Murr joined | 10:02 |
| → codebam joined | 10:03 |
| ← joo left | 10:11 |
| ← christall left | 10:13 |
|
mort
| yo | 10:13 |
| → goldfish joined | 10:15 |
| ← Adoi left | 10:15 |
| ← Gurkenglas left | 10:18 |
| → skapata joined | 10:20 |
| ← skapata left | 10:20 |
| → skapata joined | 10:20 |
| → joo joined | 10:24 |
| ← gnoo left | 10:35 |
| → gnoo joined | 10:36 |
| → goodugly joined | 10:38 |
| → manin joined | 10:43 |
| ← igemnace left | 10:44 |
| → m0viefreak joined | 10:50 |
| ← YuGiOhJCJ left | 10:52 |
| → YuGiOhJCJ joined | 10:52 |
| ← vysn left | 10:52 |
| → vysn joined | 10:54 |
| ← nobody_ left | 11:05 |
| ← gnoo left | 11:09 |
| ← drogas left | 11:10 |
| ← codebam left | 11:11 |
| → codebam joined | 11:13 |
| → Misotauros joined | 11:14 |
| ← randomuser left | 11:16 |
| ← Samian left | 11:19 |
| ← bookworm left | 11:19 |
| → unbuggedware joined | 11:21 |
| → randomuser joined | 11:22 |
| → bookworm joined | 11:25 |
| ← FH_thecat left | 11:25 |
| → FH_thecat joined | 11:26 |
| → dtminus joined | 11:35 |
| ← mexen left | 11:36 |
| → trace1918 joined | 11:39 |
| → eqw joined | 11:39 |
| → Guest61 joined | 11:41 |
| ← Guest61 left | 11:42 |
| ← dtminus left | 11:51 |
| → dtminus joined | 11:52 |
| → adlternative joined | 12:05 |
| → goodugly_ joined | 12:09 |
| → christall joined | 12:11 |
| ← trace1918 left | 12:11 |
| ← goodugly left | 12:12 |
| → theoceaniscool joined | 12:12 |
| → jwillikers joined | 12:16 |
| ← magic_ninja left | 12:20 |
| → average joined | 12:21 |
| → mexen joined | 12:22 |
| ← Vonter left | 12:22 |
| ← codebam left | 12:22 |
| ← jaggz left | 12:23 |
| → pulse joined | 12:28 |
| → fnurkla joined | 12:34 |
| → codebam joined | 12:35 |
| → jontyms joined | 12:36 |
| → sniperwolf joined | 12:37 |
| ← christall left | 12:40 |
| → Nomikos joined | 12:42 |
| ← Nomikos left | 12:42 |
| → Nomikos joined | 12:42 |
| → AnAverageHuman joined | 12:44 |
| ← CommunistWolf left | 12:45 |
| ← roadie left | 12:46 |
| → CommunistWolf joined | 12:46 |
| ← furrymcgee left | 12:49 |
| ← fling left | 12:49 |
| ElKowar549 → ElKowar | 12:50 |
| ← wender left | 12:50 |
| → computeiro joined | 12:56 |
| ← cbreak left | 12:59 |
| → roadie joined | 12:59 |
| → cbreak joined | 13:01 |
| ← computeiro left | 13:03 |
| ← jwillikers left | 13:07 |
| ← daoudr left | 13:10 |
| → FFY00 joined | 13:13 |
| → ferdna joined | 13:13 |
| → nate1 joined | 13:30 |
| ← roadie left | 13:32 |
| ← codebam left | 13:33 |
| ← nate1 left | 13:35 |
| ← manin left | 13:37 |
| → codebam joined | 13:39 |
| ← mw_ left | 13:42 |
| → mw_ joined | 13:43 |
| → EvilDMP joined | 13:45 |
| → jess joined | 13:53 |
| ← Gustavo6046 left | 13:58 |
| → roadie joined | 13:59 |
| ← keypusher left | 14:02 |
| ← EvilDMP left | 14:02 |
| → daoudr joined | 14:03 |
| ← adlternative left | 14:05 |
| → sudoforge joined | 14:06 |
| → Gustavo6046 joined | 14:06 |
| ← codebam left | 14:10 |
| ← Gustavo6046 left | 14:12 |
| → Gustavo6046_ joined | 14:13 |
| ← pretty_dumm_guy left | 14:14 |
| Gustavo6046_ → Gustavo6046 | 14:14 |
| → gnoo joined | 14:17 |
| → keypusher joined | 14:18 |
| ← keypusher left | 14:19 |
| → keypusher joined | 14:22 |
| → Xenguy joined | 14:25 |
| ← Gustavo6046 left | 14:32 |
| → hbautista joined | 14:35 |
| → christall joined | 14:37 |
| → hbautista_ joined | 14:43 |
| ← hbautista left | 14:45 |
| ← elastic_dog left | 14:46 |
| → elastic_dog joined | 14:48 |
| ← Lord_of_Life left | 14:50 |
| ← roadie left | 14:53 |
| → Gurkenglas joined | 14:57 |
| → lgc joined | 14:58 |
| → sept joined | 14:59 |
| ← christall left | 15:03 |
|
sept
| I want to use Javascript in the browser to save a string to either a file or a title in git. I'm trying to use github as a signaling system for WebRTC and the SDP text file needed to initiate peer-to-peer communication. | 15:07 |
|
| I'm a beginner in both Javascript and Git. | 15:07 |
| → Lord_of_Life joined | 15:10 |
| → dolor_avis joined | 15:10 |
| → EvilDMP joined | 15:11 |
|
sept
| the SDP is a string with less than 800 characters (including spaces). | 15:11 |
| ← AnAverageHuman left | 15:14 |
|
sept
| I'm thinking a commit message might do the trick? | 15:15 |
| ← YuGiOhJCJ left | 15:15 |
| → muhblockchain joined | 15:15 |
| → arcatech joined | 15:15 |
|
muhblockchain
| any git friendly database thing? how to store simple "database" of data, in text format, that is friendly to git and such? easy to edit in text editor but also with tools? .csv is one thing that works, but is very limited | 15:15 |
| → masoudd joined | 15:21 |
| ← m0viefreak left | 15:22 |
|
bremner
| it would have to be line oriented i guess | 15:22 |
|
mackerman
| muhblockchain: git doesn't care. Binary files are not friendly for humans to work with, however. | 15:22 |
|
TJ-
| muhblockchain: 'database' infers keys and multiple tables; CSV is single table. whatever DBMS you use would need to write tables and indexes as multiple text files | 15:23 |
|
mackerman
| Decide on what database meets your requirements first. Then figure out what goes in version control and what is backed up. | 15:23 |
|
| Database doesn't mean keys or tables or indexes. | 15:23 |
|
cbreak
| you could use a bunch of xml files | 15:24 |
|
| or json files, or csv files | 15:24 |
|
| it won't be efficient. | 15:24 |
| ← asd left | 15:24 |
|
muhblockchain
| any tool that allows to work on a database that exists as collection of local text files e.g. json, xml, etc? | 15:25 |
|
cbreak
| vim? :/ | 15:26 |
|
muhblockchain
| cbreak: uh, no, tool like libreoffice is for csv | 15:27 |
| ← masoudd left | 15:27 |
|
muhblockchain
| and like dbsometthingsomething is a viewer+editor for sqlite files | 15:27 |
|
| or perhaps, sqlite can be made to save in flat files that are easy to track in git? | 15:27 |
|
[twisti]
| sqlite and csv are established standards for data storage | 15:28 |
|
TJ-
| muhblockchain: why do you want version control? | 15:28 |
|
[twisti]
| xml and json are more generic things | 15:28 |
|
TJ-
| muhblockchain: wouldn't an append-only database be the solution? | 15:28 |
| → Cleverness joined | 15:28 |
|
[twisti]
| if you want your database in git (you typically dont want to), just export it to sql | 15:28 |
|
mackerman
| Why must the data be in text files? Manage your schema in version control, the data backed up outside of git. | 15:29 |
|
muhblockchain
| TJ-: to have checksums, and track all edits, and sign all edits | 15:29 |
| ← Lord_of_Life left | 15:30 |
|
muhblockchain
| no data corruption, nor accidental, nor unauthorised edit can be done undetectably; also while multiple edits can be conducted and synchronized - backups, parallel editing. also ability to restore any old version and inspect it | 15:30 |
|
mackerman
| How are you going to prevent git users from rewriting history? | 15:31 |
|
| How are you going to resolve the conflicts from "parallel edits" ? | 15:31 |
| ← EvilDMP left | 15:31 |
|
[twisti]
| there are reasons people usually dont store databases in git, and those reasons arent 'never thought of that brilliant idea ever before' ;) | 15:32 |
|
muhblockchain
| mackerman: Im aware of conflicting updates, that's ok for my usecase. As for rewritting history, well I sign the tip, and I have local copy | 15:33 |
| → christall joined | 15:36 |
| ← daoudr left | 15:36 |
| → daoudr joined | 15:38 |
| ← christall left | 15:40 |
| → dontyouloveshort joined | 15:42 |
|
dontyouloveshort
| hi | 15:42 |
| → kuhilas joined | 15:42 |
|
dontyouloveshort
| in a .gitignore file, should the line: *.log not exclude all .log files in any subdirectory? | 15:42 |
| ← R2robot left | 15:42 |
| ← sept left | 15:42 |
|
ikke
| Yes, unless the file is tracked | 15:43 |
|
| and only from that directory or deeper | 15:43 |
| → EvilDMP joined | 15:43 |
| ← dolor_avis left | 15:44 |
|
kuhilas
| Me and my friend hold this cataloque using git and we are noobs and use only a few commands. Now it was a long while since last update and friend did an update, she pulled first, then edited a text file and maybe few other files and then commited and pushed it. Now she saw many text files showing up red, or so she said. Said some errors or such came but she didnt' read etc. I don't even have the repo here so I'm gonna pull it soon, and what should I | 15:44 |
|
| do then? There is a revert feature right | 15:44 |
|
ikke
| kuhilas: start with running git status and read what it says | 15:45 |
| → dolor_avis joined | 15:45 |
|
ikke
| It might be that she got a merge conflict | 15:46 |
|
kuhilas
| hmm I git cloned the repo and cd'd there, git status says nothing to commit, working tree clean | 15:49 |
| → thiago joined | 15:49 |
|
ikke
| Well, yes, that's expected if you just clone the repo | 15:49 |
|
kuhilas
| There are zero .txt files when I use `find` now. There was at least 3 earlier | 15:50 |
| → Luyin joined | 15:50 |
| → AnAverageHuman joined | 15:50 |
|
ikke
| git show --name-status | 15:51 |
|
Luyin
| hi, is there an option to tell a branch to pull from a different remote than to push to? | 15:51 |
|
ikke
| Luyin: yes | 15:51 |
|
| git config branch.<name>.pushRemote <remote> | 15:51 |
|
kuhilas
| ikke: this command shows the changes she made it seems. She deleted 6 files and they are all important heh | 15:52 |
|
Luyin
| ikke: and the pulling is just set with --set-upstream-to? | 15:52 |
|
kuhilas
| M on about 15 files and D on 6 files | 15:52 |
|
ikke
| Right | 15:52 |
|
kuhilas
| so upon her updating it might have asked something and she answered yes as to delete? | 15:53 |
|
| but still strange. She has done those updates many times before | 15:53 |
|
ikke
| git would not randomly ask to delete files | 15:54 |
|
| You could get them back with: git restore --source=HEAD~ <filenames> | 15:55 |
|
kuhilas
| got them back. Should I then just try do git commit -m "restoring files" and git push -u origin master which we have used so far | 15:59 |
|
ikke
| kuhilas: That's the most straightforward way | 16:00 |
|
kuhilas
| ah git add first :) | 16:01 |
| ← Murr left | 16:01 |
| → Vonter joined | 16:02 |
| → Murr joined | 16:02 |
| → jazzy2 joined | 16:04 |
| jazzy → Guest6196 | 16:04 |
| jazzy2 → jazzy | 16:04 |
| ← Cleverness left | 16:06 |
| ← Guest6196 left | 16:07 |
| → txtsd joined | 16:07 |
|
kuhilas
| thanks for help all seems ok now | 16:07 |
|
j416
| kuhilas: also since you ask, making the message subject "Restore files" (imperative) would be common convention. | 16:07 |
| → plitter joined | 16:09 |
| ← plitter left | 16:09 |
| → plitter joined | 16:09 |
| → nate1 joined | 16:14 |
| → Xaldafax joined | 16:19 |
|
kuhilas
| oh ok. My friend also tries to ask if it can be seen what she did wrong but I guess that's not possible | 16:20 |
|
| the changes are missed in the text file too but I guess the edited text file that she ended deleting is nowhere | 16:21 |
| → speckz joined | 16:21 |
| ← thebombzen left | 16:21 |
|
ikke
| kuhilas: I suppose she does not have a log of the actions she did anymore? | 16:21 |
| ← sudoforge left | 16:24 |
|
kuhilas
| trying to ask if she has closed the terminal. Maybe we can check her .history or .bash_history too | 16:25 |
|
| now answering yet | 16:25 |
| ← dontyouloveshort left | 16:27 |
| → dontyouloveshort joined | 16:27 |
| → sudoforge joined | 16:29 |
| → node1 joined | 16:29 |
| ← jazzy left | 16:31 |
| → manin joined | 16:33 |
| → fling joined | 16:33 |
| → Lord_of_Life joined | 16:37 |
|
cbreak
| kuhilas: also, consider looking at git status in the repository that created this problem | 16:38 |
|
| it is possible that there are uncommitted remainders of it | 16:38 |
|
| those couldn't be fixed from a fresh clone | 16:38 |
|
node1
| Hi, is it possible to rollback or eliminate those objects which has been extracted from .pack file? | 16:39 |
|
cbreak
| git gc? | 16:40 |
|
node1
| ? | 16:41 |
| ← shored1 left | 16:46 |
| → shored joined | 16:46 |
| → christall joined | 16:47 |
|
muhblockchain
| seriously, no git-compatible DB format? | 16:47 |
|
| muhblockchain would had hoped it's a solved problem | 16:47 |
|
muhblockchain
| *git-friendly | 16:48 |
|
| normies on various channels recommend to save DB in default binary format and throw that into git :-/ | 16:49 |
|
cbreak
| only do that if you want bloated history, or never change the contents | 16:49 |
|
muhblockchain
| ikr? so what format to use | 16:49 |
|
cbreak
| you could use git lfs... | 16:50 |
|
| (I wouldn't recommend it) | 16:50 |
|
muhblockchain
| don't tell me nothing like that exists and I have to invent this | 16:50 |
|
cbreak
| muhblockchain: you could use csv or xml, or some other text format. | 16:50 |
|
| but no sane database uses a text format | 16:50 |
|
muhblockchain
| I use csv - and editor is libreoffice for example | 16:50 |
|
cbreak
| because those are shit to work with performantly. | 16:50 |
|
muhblockchain
| is there any editor for some kind of format based on xml or json? | 16:50 |
|
cbreak
| you'd basically have to keep the whole thing in memory to even know what's where. | 16:51 |
|
muhblockchain
| cbreak: text storage doesn't preclude you from keeping an .index/ dir there | 16:51 |
|
cbreak
| it does. | 16:51 |
|
| because nothing forces those to be in sync. | 16:51 |
|
muhblockchain
| the editor | 16:52 |
|
| check .index modtime | 16:52 |
|
| in case of manual edit | 16:52 |
|
cbreak
| git doesn't preserve mod time. | 16:52 |
|
muhblockchain
| well, re-sync data logically after merge | 16:52 |
|
| it's for medium-small datasets, obviously | 16:52 |
|
| keeping entire db in memory is fine, entire DB would be like 1-10 MB | 16:53 |
|
cbreak
| maybe sqlite can do that for you... | 16:53 |
|
| or some weirdo-database like those "key value databases" (glorified std::map) | 16:53 |
|
muhblockchain
| C++ users "I see your case. ok use this or this text format" #javascript "just save .sql binary file into git" xd | 16:57 |
|
cbreak
| .sql files are binary? | 16:58 |
|
muhblockchain
| what ever sqlite names it's files, they are binary, sadly for me | 16:59 |
|
| *Its | 16:59 |
|
cbreak
| yeah, those are | 16:59 |
|
| but you should be able to dump the data somehow | 16:59 |
|
| via some export / import function | 16:59 |
|
muhblockchain
| well it needs to be a proper editor probably, not just a dump, to keep the file deterministic. e.g. you can save openoffice flat files, but they change a lot | 17:00 |
|
| like it for some stupid reason randomly re-numbers all entries and changes large portions therefore | 17:00 |
|
| cbreak: one solution that I found now, are recfiles. tools exist for it. supports relations etc. | 17:04 |
|
cbreak
| never heard of those. | 17:05 |
| ← christall left | 17:08 |
| → christall joined | 17:08 |
|
joo
| i got a folder called tmp in my gitignore like this ./tmp/* - however it is still tracking stuff inside tmp, what am i doing wrong ? | 17:09 |
|
muhblockchain
| boost::recutils:: let's go | 17:10 |
|
ikke
| joo: git does not ignore tracked files | 17:10 |
|
| joo: you need to untrack them before git will ignore them | 17:10 |
| → hnOsmium0001 joined | 17:11 |
|
j416
| joo: git rm -r --cached tmp && git commit -m 'Remove temp files' | 17:11 |
| ← node1 left | 17:13 |
| → goldfish_ joined | 17:16 |
| ← goldfish left | 17:17 |
| → Betal joined | 17:22 |
| → Adoi joined | 17:27 |
| → codebam joined | 17:30 |
| ← Lunatrius left | 17:31 |
| → Lunatrius joined | 17:33 |
|
kuhilas
| ikke cbreak: http://sprunge.us/PRzrgh The git status in that terminal which is still open says your branch is up to date with origin/master. In that log there is this Sigal tool that we us. It regenerates a html website from files in a few directories. The .txt files and the kenyan fonts are not part of that, but they are used as links on the html page and I have manually created a "content" subdirectory and so far it has always worked and the sigal | 17:35 |
|
| hasn't touched those files. I was thinking that maybe she had updated that sigal tool on her pc and that the new version would delete files that don't belong there but that's unlikely cus she says she hasn't updated anything and donno | 17:35 |
| ← shlomif left | 17:36 |
|
ikke
| Something must have deleted those files, and that would not be git | 17:37 |
| ← Lunatrius left | 17:37 |
|
kuhilas
| that 4371 deletions(-) seems weird I don't remember if it normally shows that. Doesn't that mean that it deletes that many files? Why it though shows only deleting of 6 files there | 17:37 |
|
cbreak
| kuhilas: so the deletion of the files got added | 17:37 |
|
| and committed | 17:37 |
|
| kuhilas: that's lines | 17:38 |
|
| it's a short stat | 17:38 |
|
| insertions / deletions are statistics of the diff | 17:38 |
|
kuhilas
| ah phew ok | 17:38 |
|
cbreak
| delete mode 100644 docs/static/content/100_string.txt // this means that this specific file was deleted | 17:38 |
|
ikke
| You also see the actual files that were deleted | 17:39 |
|
cbreak
| kuhilas: you should check the output of git status | 17:39 |
|
| always a good thing to look at, before committing | 17:39 |
|
| and maybe git diff --cached | 17:39 |
|
kuhilas
| yeah true, I have mentioned the git status to her and this time it would have been useful | 17:40 |
|
| although after the commit you could also see suspicious things but oh well | 17:40 |
|
| so there is nothing left but sigal being the culprit. I guess it was updated and its behaviour has changed stricter to external files in paths it writes maybe | 17:41 |
|
| could try run that sigal in verbose mode too since I think it might have that too. Thanks again | 17:41 |
| ← mw_ left | 17:44 |
| ← speckz left | 17:48 |
| → roadie joined | 17:51 |
| → Lunatrius joined | 17:55 |
| ← randomuser left | 18:02 |
| ← Gaboradon left | 18:04 |
| ← nate1 left | 18:05 |
| → rsx joined | 18:06 |
| ← gnoo left | 18:10 |
| ← rsx left | 18:14 |
| ← codebam left | 18:15 |
| → codebam joined | 18:18 |
| → speckz joined | 18:28 |
| → reset joined | 18:41 |
| ← FH_thecat left | 18:43 |
| ← mexen left | 18:46 |
| ← speckz left | 18:50 |
| → Drek45 joined | 18:54 |
| → cdown joined | 19:01 |
| → subopt joined | 19:01 |
| ← theoceaniscool left | 19:03 |
| ← Lord_of_Life left | 19:04 |
| → Lord_of_Life joined | 19:07 |
| ← ferdna left | 19:08 |
| → mw_ joined | 19:20 |
| → magic_ninja joined | 19:22 |
| ← cdown left | 19:22 |
| ← rahl left | 19:34 |
| ← christall left | 19:36 |
| ← Lord_of_Life left | 19:36 |
| → Lord_of_Life joined | 19:38 |
| → Lord_of_Life_ joined | 19:41 |
| ← Lord_of_Life left | 19:43 |
| → Nalt| joined | 19:43 |
| → christall joined | 19:44 |
| → Nalt|| joined | 19:44 |
| Lord_of_Life_ → Lord_of_Life | 19:44 |
| ← Nalt left | 19:45 |
| → jetchisel joined | 19:47 |
| ← Nalt| left | 19:48 |
| → Nalt joined | 19:48 |
| → cation joined | 19:50 |
| ← Nalt|| left | 19:50 |
| ← Nalt left | 19:52 |
| ← hbautista_ left | 19:54 |
| → rahl joined | 20:01 |
| → Erisa joined | 20:02 |
| ← Adoi left | 20:03 |
| → CalimeroTeknik joined | 20:10 |
| → Hax0r joined | 20:15 |
| ← christall left | 20:19 |
| → christall joined | 20:20 |
| → LordCik joined | 20:20 |
| ← EvilDMP left | 20:22 |
| ← christall left | 20:24 |
| → EvilDMP joined | 20:25 |
|
LordCik
| hello everybody. I'm experimenting with git hooks. In my pre-commit hook I'm currently generating a file and then 'git add file' to stage it. The file is correctly staged and then committed. Thing is, the default message I get in my editor when writing the commit message does not reflect the 'git add' that took place in the pre-commit hook. Any | 20:26 |
|
| idea on how to force it to consider the updated index? | 20:26 |
| → Cik joined | 20:29 |
| ← Cik left | 20:29 |
| ← LordCik left | 20:32 |
| → cik54 joined | 20:33 |
| cik54 → cik | 20:34 |
| → xlei joined | 20:34 |
| → tuxifreund joined | 20:34 |
| cik → LordCik | 20:35 |
| → JackRuby joined | 20:37 |
| LordCik → cik | 20:37 |
| cik → Cik | 20:37 |
| ← Cik left | 20:39 |
| → cik joined | 20:39 |
| ← cik left | 20:41 |
| → cik joined | 20:41 |
| ← cik left | 20:42 |
| → cik joined | 20:42 |
|
cik
| (just messing with the nick, I'm @LordCik up here if somebody comes up with an idea about that :P) | 20:44 |
| ← darkbit left | 20:44 |
| → AbleBacon joined | 20:51 |
| ← JackRuby left | 20:51 |
|
s17
| we can follow to nick changes to deduce who you are | 20:57 |
|
| the* nick | 20:57 |
| → pretty_dumm_guy joined | 21:01 |
|
cik
| yeah my bad, I was not sure if I was still connected to the channel when I changed it | 21:01 |
| ← manin left | 21:04 |
| → Samian joined | 21:05 |
| ← Drek45 left | 21:08 |
| ← arcatech left | 21:09 |
| → arcatech joined | 21:10 |
| ← EvilDMP left | 21:10 |
| → EvilDMP joined | 21:11 |
| ← EvilDMP left | 21:11 |
| → Drek45 joined | 21:21 |
| ← absc left | 21:21 |
| ← goldfish_ left | 21:22 |
| ← natrys left | 21:24 |
| ← palasso left | 21:31 |
| ← beshr left | 21:32 |
| ← dtminus left | 21:33 |
| → christall joined | 21:39 |
| → roadie` joined | 21:45 |
| ← roadie left | 21:46 |
| ← shored left | 21:50 |
| ← Drek45 left | 21:52 |
| → shored joined | 21:53 |
| → cdown joined | 21:54 |
| → roadie`` joined | 21:58 |
| ← roadie` left | 22:00 |
| ← pulse left | 22:02 |
| ← Xenguy left | 22:10 |
| ← vdamewood left | 22:15 |
| ← cik left | 22:17 |
| ← thiago left | 22:17 |
| → enoq joined | 22:30 |
| → Xenguy joined | 22:30 |
| ← christall left | 22:41 |
| → christall joined | 22:43 |
| → BlessJah_ joined | 22:44 |
| ← BlessJah left | 22:47 |
| → JanC_ joined | 22:52 |
| ← christall left | 22:54 |
| ← JanC left | 22:54 |
| ← Samian left | 22:54 |
| JanC_ → JanC | 22:55 |
| ← jstein left | 23:04 |
| ← pretty_dumm_guy left | 23:11 |
| ← tchan left | 23:15 |
| → tchan joined | 23:15 |
| ← jetchisel left | 23:18 |
| → oriba joined | 23:18 |
| ← xlei left | 23:22 |
| → xlei joined | 23:26 |
|
cbreak
| there are commit message hooks too | 23:32 |
| → Guest94 joined | 23:34 |
| ← Guest94 left | 23:36 |
| ← vysn left | 23:46 |
| ← enoq left | 23:55 |
| → m0viefreak joined | 23:55 |