| 2018-12-07 |
| ← finalbeta left | 00:04 |
| ← n3wborn left | 00:04 |
| → dfee joined | 00:04 |
| ← scrptktty left | 00:12 |
|
energizer
| Do you like to do feature branches off master when working on a one-person project? | 00:14 |
|
Peng
| Sometimes | 00:17 |
| → pkx3 joined | 00:18 |
| ← shicks2525 left | 00:18 |
| ← pkx3__ left | 00:19 |
| → shicks2525 joined | 00:20 |
| → riposte joined | 00:20 |
| ← ozcanesen left | 00:21 |
| ← m0viefreak left | 00:24 |
| ← graphene left | 00:24 |
| ← jottr left | 00:25 |
| → graphene joined | 00:25 |
|
mud
| energizer: Sure, they still make sense. The cost is low/nonexistant, and they're good for organization. And often i'll get distracted before finishing a feature and need to do something else | 00:28 |
| ← dege left | 00:31 |
| ← courrier left | 00:32 |
| ← riposte left | 00:38 |
| → riposte joined | 00:39 |
| → bavi joined | 00:40 |
|
energizer
| mud: What do you do in that case? | 00:41 |
| ← freeman42x left | 00:41 |
| ← mloskot left | 00:41 |
| → andyhuzhill joined | 00:41 |
|
kadoban
| energizer: Switch out of the feature branch and start a new one usually | 00:42 |
|
energizer
| kadoban: so on the feature branch i'd have a bunch of tiny commits, then before switching i'd commit -m'[WIP] fix typos', do work on another branch, merge that into master. come back to the original feature branch, do some more commits, and merge into master | 00:44 |
|
| yes? | 00:44 |
|
| er merge from master before merging into master, but otherwise ^ | 00:45 |
|
kadoban
| energizer: Sounds about right, ya | 00:47 |
| ← SlashLife^work left | 00:47 |
|
energizer
| At the bottom of this page, under "Rebase vs. Merge", it gives the impression that rebasing is *cleaner* but merging more complete/accurate/historical | 00:49 |
|
| But if I rebased, wouldn't I be plopping all those 'fix typo x', '[WIP] do something' commits right onto master? | 00:50 |
|
| whereas if i merge, I'd just get the single merge commit with a good commit message | 00:50 |
|
| or is that wrong? | 00:50 |
|
| i dont see what's cleaner about rebasing here | 00:51 |
| ← wootehfoot left | 00:51 |
| ← Zexaron left | 00:51 |
|
kadoban
| energizer: I am not of the school of thought that finds merging messy. | 00:53 |
|
energizer
| kadoban: like if i'm looking at the log of master, i'd just see a list of merge commits, right? not all the WIP stuff | 00:54 |
|
kadoban
| Depends which command you run I think. But ya, I like being able to see the little break outs and merges for features. It makes them nicely organized | 00:55 |
|
| Instead of giant blocks of undifferentiated commits, you can see little outs and ins, and it gives you a chance to document in the merge commit message | 00:55 |
| → darkbit joined | 00:56 |
| → dviola joined | 01:00 |
| ← dfee left | 01:00 |
| → b100s joined | 01:00 |
|
b100s
| hi2all; is there ability to revert only deleted lines ? : ) | 01:01 |
| ← gooooootime left | 01:02 |
| ← netj left | 01:04 |
| → netj joined | 01:04 |
|
energizer
| kadoban: sounds perfect, thanks | 01:05 |
| ← dansan left | 01:09 |
| → dansan joined | 01:09 |
| ← paulwood_ left | 01:11 |
| → Solifugus joined | 01:14 |
|
kadoban
| energizer: Anytime | 01:14 |
| ← Aquazi left | 01:14 |
|
kadoban
| b100s: Not directly, no. You can always customize a revert though (--no-commit) | 01:14 |
|
Solifugus
| I am tired of having to type in my github user/pass -- I think I remember there is a way to add it to git config... google insn't helping.. | 01:14 |
| ← jubal left | 01:16 |
| ← acercle left | 01:17 |
| ← orbyt_ left | 01:17 |
|
mud
| Solifugus: the usual way is to use ssh pubkey auth | 01:19 |
| → prakashdanish joined | 01:19 |
|
mud
| I think there's also some kind of credential manager, i never used it tho | 01:19 |
| ← thebope left | 01:20 |
| → thebope joined | 01:20 |
|
bremner
| man gitcredentials | 01:20 |
|
gitinfo
| the gitcredentials manpage is available at https://gitirc.eu/gitcredentials.html | 01:20 |
|
bremner
| ssh keys are better, if you can use them | 01:21 |
| → iam730 joined | 01:23 |
| ← kfoonamalik left | 01:23 |
| ← thiago left | 01:25 |
| ← thebope left | 01:25 |
| → weird_error joined | 01:26 |
| ← graphene left | 01:26 |
| → graphene joined | 01:27 |
| ← Sasazuka left | 01:27 |
| ← iam730 left | 01:29 |
| ← z|bandito left | 01:29 |
| → iam730 joined | 01:31 |
| → ukyrgf joined | 01:32 |
| ← Essadon left | 01:32 |
| → timvisher joined | 01:36 |
| ← qpdb left | 01:39 |
| → qpdb joined | 01:39 |
|
computerquip
| Is there any way to configure git to use more of my server when resolving deltas? Probably 25 minutes of building chrome goes into git and most of that is resolving deltas. | 01:42 |
| → keepLearning512 joined | 01:42 |
| ← silverballz left | 01:44 |
| ← al-damiri left | 01:46 |
| ← novum left | 01:46 |
| → astrofog joined | 01:51 |
| ← prakashdanish left | 01:52 |
| → Wetmelon joined | 01:55 |
| → thebope joined | 01:57 |
| ← sweatsuit left | 01:59 |
| → sweatsuit joined | 02:00 |
| → prakashdanish joined | 02:03 |
| → craftyguy joined | 02:06 |
| ← F0rTex left | 02:07 |
| ← ngui left | 02:08 |
| → F0rTex joined | 02:08 |
| ← in1t3r left | 02:09 |
| → ngui joined | 02:14 |
| ← Narrat left | 02:16 |
| ← dansan left | 02:17 |
| ← dviola left | 02:17 |
| → dansan joined | 02:18 |
| → Kaisyu7 joined | 02:18 |
| → mce joined | 02:19 |
|
dzho
| man git config | grep threads | 02:20 |
|
gitinfo
| the git-config manpage is available at https://gitirc.eu/git-config.html | 02:20 |
|
dzho
| that shows me two config options | 02:20 |
|
| grep.threads and pack.threads | 02:20 |
| → finalbeta joined | 02:20 |
|
dzho
| computerquip: not sure that'll help, but there it is | 02:21 |
| → silverballz joined | 02:23 |
| ← dansan left | 02:24 |
| ← g2anj left | 02:28 |
| ← bn_work left | 02:29 |
| → esrse joined | 02:32 |
| ← diogenese left | 02:33 |
| ← Solifugus left | 02:36 |
| ← silverballz left | 02:39 |
| → g2anj joined | 02:39 |
| ← keepLearning512 left | 02:41 |
| ← astrofog left | 02:45 |
| → navidr joined | 02:48 |
| ← prakashdanish left | 02:48 |
| ← weird_error left | 02:48 |
| ← graphene left | 02:49 |
| ← bavi left | 02:49 |
| → graphene joined | 02:49 |
| ← graphene left | 02:50 |
| → graphene joined | 02:51 |
| → alex_pa joined | 02:56 |
| → novum joined | 02:56 |
| → dansan joined | 02:56 |
| → diogenese joined | 02:57 |
| ← thebope left | 03:07 |
| ← darkbit left | 03:07 |
| ← sweatsuit left | 03:08 |
| ← Dirak left | 03:09 |
| ← cd left | 03:12 |
| → sweatsuit joined | 03:12 |
| ← sweatsuit left | 03:17 |
| → sweatsuit joined | 03:19 |
| ← mce left | 03:19 |
| → figurelisp joined | 03:24 |
|
figurelisp
| Now that i understand rebase i want to understand when i shouldn't rebase | 03:25 |
| ← sweatsuit left | 03:25 |
|
figurelisp
| say all my feature branches are from develop branch. Then after working on my feature branches i merge them back to dev and make a build off develop for QA. I rebase feture branches before merging them to develop | 03:26 |
|
| but now when pushing features to production, client decide to push 3 feature out of 4. | 03:27 |
| → sweatsuit joined | 03:27 |
|
figurelisp
| I have a release branch in which i merge features what should be on new release production as per client | 03:28 |
|
| but as i havve rebase all my features, merging latest feature branch means I'll have all four features on release branch | 03:28 |
|
| what should i do to tacle this situation | 03:28 |
|
| If someone can help me figure out and clear out this i would be really grateful | 03:29 |
|
| sorry for this long messages | 03:29 |
| lagothrix → Guest72582 | 03:29 |
| ← Guest72582 left | 03:29 |
| → lagothrix joined | 03:29 |
| ← ghost43 left | 03:30 |
| ← \void left | 03:31 |
| → Dirak joined | 03:31 |
| → ghost43 joined | 03:31 |
| → crackin joined | 03:31 |
| → cmaj9 joined | 03:31 |
| → nshp joined | 03:32 |
| ← andyhuzhill left | 03:34 |
| ← ngui left | 03:34 |
| → andyhuzhill joined | 03:34 |
| → ngui joined | 03:34 |
| ← andyhuzhill left | 03:38 |
| ← ngui left | 03:39 |
| → andyhuzhill joined | 03:39 |
| → ngui joined | 03:39 |
| jangal → jaggz | 03:39 |
|
jaggz
| deltab, I ended up emailing freenode, by the way, to lift the kline. :) | 03:47 |
|
deltab
| welcome back :-) | 03:47 |
| ← netj left | 03:47 |
| → netj joined | 03:48 |
|
jaggz
| heh, thanks :) | 03:48 |
|
| it was removed this morning sometime.. I slept through it so I didn't suffer much. | 03:48 |
| → fission6 joined | 03:52 |
| ← jorj left | 03:53 |
| → Toadisattva joined | 03:53 |
| → hernan604 joined | 03:53 |
| ← Willis left | 03:53 |
| ← profmac left | 03:53 |
| → motoko-chan joined | 03:53 |
| → gtristan joined | 03:54 |
|
deltab
| figurelisp: I'm new to this, but I would use interactive rebase to drop the unwanted feature, either after merging to production or on a new branch | 03:54 |
| → jorj joined | 03:54 |
| → Willis joined | 03:55 |
|
deltab
| alternatively rebase the three features onto production | 03:55 |
| → diginaut joined | 03:55 |
| → profmac joined | 03:56 |
|
figurelisp
| deltab: ok, another question if you don't mind. I read that i should not rebase on public branch and only on private branch | 03:58 |
| ← cbrt64 left | 03:58 |
|
figurelisp
| Is that also means that once i have pushed my provate branch to remote i should not rebase it | 03:58 |
|
deltab
| the issue as I understand it is that people could already be using commits, having created their own commits on top of it | 04:00 |
| → FermiDirak joined | 04:01 |
|
deltab
| so they'd have to do something extra, such as rebasing their work onto your new commits | 04:01 |
|
figurelisp
| what if my feature branch isn't merged back to public branch so people are not using my commit. So there is no rewrite of history of other people's commit | 04:01 |
|
deltab
| then I believe that would be okay | 04:03 |
|
figurelisp
| ok thank you for the help | 04:03 |
| ← Dirak left | 04:03 |
|
deltab
| but I don't really understand that area, so don't rely just on what I say | 04:04 |
|
figurelisp
| ok, i'll research more on it | 04:04 |
| ← mrCyborg|zzz left | 04:05 |
|
deltab
| oh, I think in addition to causing annoyance to people, there could also be situations in which work is lost | 04:05 |
| → mrCyborg|zzz joined | 04:05 |
|
deltab
| especially if using 'force' to overwrite branches | 04:07 |
| → howdoi joined | 04:07 |
|
figurelisp
| yeah but that wouldn't be the case if my commits are not known to public | 04:08 |
|
| then force push would be only of my commits | 04:08 |
|
| before anyone has them pulled | 04:08 |
|
| deltab nods noncomittally | 04:09 |
| → ColdKeyboard joined | 04:09 |
|
rafasc
| figurelisp: that's the gist of it, yes. | 04:14 |
|
| don't rewrite commits others might be using. | 04:15 |
|
| many projects consider PR branches not shared, so you can rebase them at will even if they're technically public. | 04:15 |
| → cswl joined | 04:16 |
|
figurelisp
| rafasc: So i understand what rebase does, but only one scenario i can think of using rebase is when there are say two feature branch from develop then another developer merges his feature to develop branch. Now my feature needs to use his feature branch code so i rebase my feature branch with develop. | 04:17 |
|
| keeping aside squashing,edit,picking or any other interactive mode features | 04:17 |
|
rafasc
| yes, but people also rebase PR's to keep up to date with the branch they intend to merge into. | 04:19 |
|
| imagine you make a feature off develop, you do 10 commits and go on vacation. When you comeback, you do another 5 and ask the feature to be merged. | 04:20 |
| → Cabanossi joined | 04:21 |
|
figurelisp
| yeah | 04:21 |
|
rafasc
| the maintainer may have a hard time merging it because develop diverged substantially and he doesn't know your code well. | 04:21 |
| ← fission6 left | 04:21 |
|
rafasc
| So you, as the person who knows more about that feature, rebase the PR on top of develop and ask to merge again. | 04:21 |
| ← Cabanoss- left | 04:22 |
|
rafasc
| This can be done with merges, but it doesn't look as nice. | 04:22 |
|
| merge develop into feature, then feature into develop | 04:22 |
| ← boombatower left | 04:23 |
|
figurelisp
| yeah it sure does pollute your tree | 04:24 |
| ← crackin left | 04:24 |
|
figurelisp
| let say one feature is completed and merged, now another feature is being worked on then rebased with develop so having code of first feature. | 04:25 |
|
| now my client says only publish second feature to production | 04:26 |
|
| but now second feature has code of first feature because of rebase | 04:26 |
|
| how to tackle this situation | 04:26 |
|
| rafasc: | 04:26 |
|
rafasc
| for that, you'll need to keep branches separate. | 04:29 |
| ← kadoban left | 04:29 |
| ← kegster left | 04:30 |
|
figurelisp
| this problem is more like which i have to figure it on my own right | 04:30 |
|
rafasc
| or you can try and rebase the branch onto the commit before it got merged. | 04:30 |
|
| but for that, that branch cannot depend on the work of the previous feature. | 04:31 |
|
figurelisp
| hmm | 04:31 |
| → kegster joined | 04:32 |
|
rafasc
| git rebase --onto <merge_from_feature_1>^1 <first commit of feature2>^1 feature_2 | 04:32 |
|
| man git rebase | 04:33 |
|
gitinfo
| the git-rebase manpage is available at https://gitirc.eu/git-rebase.html | 04:33 |
|
figurelisp
| thank you very much for thisguidance | 04:33 |
| ← figurelisp left | 04:36 |
| ← Emperor_Earth left | 04:48 |
| ← Wetmelon left | 04:48 |
| ← sweatsuit left | 04:49 |
|
jaggz
| hrm.. on github, how do I re-run a build's tests -- this one stalled for some reason: https://travis-ci.org/keras-team/keras/jobs/464412110 | 04:49 |
|
| (here's the PR: https://github.com/keras-team/keras/pull/11795 ) | 04:49 |
| → crackin joined | 04:50 |
| → sweatsuit joined | 04:51 |
| → timj1 joined | 04:52 |
| → mce joined | 04:53 |
| ← timj left | 04:54 |
| ← crackin left | 04:55 |
| → dfee joined | 04:59 |
|
rafasc
| .search travis rerun build | 05:00 |
|
gitinfo
| Trigger a Travis -CI rebuild without pushing a commit? - Stack ... <https://gitirc.eu/t/ao> | GitHub - thelinuxkid/ travis - rerun: re-run Travis CI jobs offline <https://gitirc.eu/t/ap> | Auto Rerun Pull Request Builds when Target Branch ... - GitHub <https://gitirc.eu/t/aq> | ... | 05:01 |
| → pks_ joined | 05:01 |
| ← pks left | 05:02 |
| pks_ → pks | 05:02 |
| → awkwords joined | 05:03 |
| ← xcm left | 05:08 |
| → xcm joined | 05:10 |
| ← rafasc left | 05:10 |
| → KeyJoo joined | 05:15 |
| → sauvin joined | 05:18 |
| → tsdh joined | 05:21 |
| ← libertyprime left | 05:22 |
| ← rsrx left | 05:22 |
| → cbrt64 joined | 05:24 |
| → heroux joined | 05:33 |
| ← topdownjimmy left | 05:34 |
| → topdownjimmy joined | 05:35 |
| ← xcm left | 05:37 |
| → wxg joined | 05:38 |
| → xcm joined | 05:38 |
| ← Toadisattva left | 05:43 |
| ← iam730 left | 05:44 |
| ← mce left | 05:45 |
| → mce joined | 05:47 |
| ← Shentino left | 05:47 |
| ← wxg left | 05:52 |
| → Shentino joined | 05:54 |
| → Wulf joined | 05:59 |
| ← awkwords left | 06:10 |
| ← alex_pa left | 06:14 |
| ← andyhuzhill left | 06:14 |
| → andyhuzhill joined | 06:14 |
| ← andyhuzhill left | 06:18 |
| → andyhuzhill joined | 06:19 |
| ← cbrt64 left | 06:24 |
| ← Goplat left | 06:25 |
| → sourcream joined | 06:28 |
| ← Xiti left | 06:29 |
| → cbrt64 joined | 06:30 |
| → Xiti joined | 06:31 |
| ← donofrio left | 06:31 |
| → Phylock joined | 06:31 |
| → sQVe joined | 06:32 |
| ← mce left | 06:33 |
| → elsheepo joined | 06:35 |
| ← cbrt64 left | 06:35 |
| ← sourcream left | 06:36 |
| → plexigras joined | 06:37 |
| ← dfee left | 06:39 |
| → silverballz joined | 06:42 |
| ← plexigras left | 06:42 |
| ← timj1 left | 06:46 |
| → thiago joined | 06:47 |
| → Ayo joined | 06:50 |
| → igemnace joined | 06:54 |
| → timj joined | 06:55 |
| ← FermiDirak left | 06:55 |
| ← Furai left | 07:03 |
| → cbrt64 joined | 07:03 |
| ← esrse left | 07:05 |
| → Furai joined | 07:09 |
| ← JoshuaD left | 07:11 |
| ← jakogut_ left | 07:17 |
| → supernov1h joined | 07:18 |
| → alex_pa joined | 07:21 |
| ← alex_pa left | 07:22 |
| → alex_pa joined | 07:22 |
| → awkwords joined | 07:23 |
| ← Ayo left | 07:25 |
| → Ayo joined | 07:26 |
| → Dirak joined | 07:27 |
| ← ghost43 left | 07:28 |
| → chele joined | 07:29 |
| ← motoko-chan left | 07:29 |
| ← supernov1h left | 07:29 |
| ← Dirak left | 07:32 |
| → crimastergogo joined | 07:34 |
| → ghost43 joined | 07:36 |
| ← thiago left | 07:36 |
| ← mowcat left | 07:38 |
| → dfee joined | 07:38 |
| ← Phylock left | 07:47 |
| → Dirak joined | 07:47 |
| → n3wborn joined | 07:49 |
| ← naoey left | 07:52 |
| ← zulutango left | 07:52 |
| → zulutango joined | 07:53 |
| → Silenced joined | 07:55 |
| → nxet joined | 07:59 |
| ← Silenced left | 07:59 |
| → sydbarret joined | 08:00 |
|
sydbarret
| how do you export 1 file to one branch to another? or its better to go to the other brunch and import? | 08:00 |
|
vlt
| sydbarret: I’m not sure if I understand the question. The answer might involve "cherry-pick". | 08:02 |
|
sydbarret
| say you are in branch A which has a.py file but you wanna replace that file with the one you have in branch B | 08:03 |
|
| git checkout B path/to/a.py? | 08:04 |
| ← crimastergogo left | 08:04 |
|
vlt
| That will put it (only) in your working dir. | 08:05 |
| → naoey joined | 08:05 |
|
sydbarret
| so whats the answer then | 08:06 |
|
| woulndt it replace it since im that branch already? | 08:06 |
| → Noti joined | 08:08 |
|
_ikke_
| It would replace that file in your working tree | 08:09 |
|
| You can then commit the changes to that file to get it into your branch | 08:10 |
|
vlt
| sydbarret: After checking put you can commit the file to the current branch. But you could also just cherry-pick the commit that put the file in the current state. | 08:10 |
|
| checking *out | 08:10 |
| ← gxt left | 08:10 |
|
sydbarret
| ok thanks | 08:10 |
| ← sydbarret left | 08:10 |
| → freeman42x joined | 08:11 |
| → mona_x joined | 08:14 |
| ← mona_x left | 08:14 |
| ← ngui left | 08:14 |
| → mona_x joined | 08:14 |
| ← Ayo left | 08:14 |
| → ngui joined | 08:14 |
| → Ayo joined | 08:17 |
| ← ngui left | 08:19 |
| → ngui joined | 08:19 |
| ← freeman42x left | 08:22 |
| ← anddam left | 08:25 |
| ← dfee left | 08:26 |
| ← mona_x left | 08:27 |
| ← elsheepo left | 08:29 |
| → Guest14049 joined | 08:31 |
| ← gtristan left | 08:32 |
| → mce joined | 08:34 |
| → Sonderblade joined | 08:34 |
| ← Sonderblade left | 08:34 |
| → dfee joined | 08:37 |
| ← Mat001 left | 08:40 |
| → crimastergogo joined | 08:44 |
| ← diogenese left | 08:45 |
| → mloskot joined | 08:45 |
| ← rkta left | 08:45 |
| → gtristan joined | 08:49 |
| → diogenese joined | 08:49 |
| ← andyhuzhill left | 08:51 |
| → nixroot joined | 08:53 |
| → andyhuzhill joined | 08:56 |
| → floppydh joined | 08:58 |
| → theoceaniscool joined | 08:59 |
| ← cbrt64 left | 09:00 |
| → mona_x joined | 09:03 |
| → eduardas_m joined | 09:03 |
| ← andyhuzhill left | 09:04 |
| → andyhuzhill joined | 09:05 |
| ← andyhuzhill left | 09:09 |
| → andyhuzhill joined | 09:09 |
| → T_UNIX joined | 09:12 |
| ← GreenJello left | 09:12 |
| ← Dirak left | 09:13 |
| → yyy joined | 09:13 |
| ← dpyro left | 09:17 |
| ← nixroot left | 09:27 |
| → rkta joined | 09:32 |
| ← andyhuzhill left | 09:33 |
| → nixroot joined | 09:34 |
| ← im0nde left | 09:37 |
| → dege joined | 09:44 |
| → aw1 joined | 09:46 |
| → Emperor_Earth joined | 09:48 |
| → sozuba joined | 09:48 |
| ← ngui left | 09:49 |
| → ngui joined | 09:49 |
| → d6d joined | 09:50 |
|
limbo_
| Anyone know of a free (free software) application for viewing diffs with a UI like meld, but support for comparing arbtrary branches of a git repo. | 09:50 |
|
| ?# | 09:50 |
| ← Emperor_Earth left | 09:53 |
| → joaoh82 joined | 09:54 |
| → Emperor_Earth joined | 09:55 |
| → moei joined | 09:56 |
| → planetcall|work joined | 09:57 |
|
pbodev1
| Hi, do you think this is a good alternative to git stash? https://stackoverflow.solutions/question/show_question_details/35 | 09:59 |
| → bsaboia joined | 09:59 |
| ← ngui left | 10:04 |
| → ngui joined | 10:04 |
| ← n3wborn left | 10:04 |
| → Mike11 joined | 10:07 |
| ← dfee left | 10:09 |
|
ThiefMaster
| wtf is this shit site (stackoverflow.solutions) | 10:11 |
| ← rkta left | 10:12 |
|
ThiefMaster
| taking SO content without credits... | 10:12 |
| → rkta joined | 10:12 |
|
pbodev1
| there's no SO content in there, is just the name | 10:14 |
|
ThiefMaster
| ok, so just a misleading domain name | 10:15 |
|
pbodev1
| i guess it was a bad call when i bought the domain | 10:15 |
|
ThiefMaster
| yeah, sounds like a way to get in legal trouble with SO | 10:15 |
|
pbodev1
| :)) | 10:15 |
|
Habbie
| pbodev1, 'git add .' may add new files - git stash does not do that | 10:15 |
|
ThiefMaster
| and about your question: manually committing instead of stashing seems like a bad idea | 10:15 |
|
Habbie
| pbodev1, also, the page does not say what your problem with git stash is | 10:16 |
|
pbodev1
| there are like 200 free SO domain to buy, i thought is not illegal when i did it | 10:16 |
|
| git stash always give me worrings | 10:17 |
|
| if i make a bad move I can lose things | 10:17 |
| ← ngui left | 10:19 |
| → ngui joined | 10:19 |
| → throstur` joined | 10:19 |
|
pbodev1
| so `git reset HEAD^` will not make it exactly the same, to the original position? | 10:20 |
|
ThiefMaster
| pbodev1: no, you can always `git stash pop` to restore it | 10:20 |
|
| also, `git stash save -p` to stash only selected changes | 10:20 |
|
| and unless you `git stash drop` you won't lose anything | 10:20 |
|
| i think `git reflog` might contain stashes as well so even dropping one doesn't permanently delete it | 10:20 |
|
pbodev1
| So about my SOS you think is a bad ideea? I was thinking at something la SO but just the question and the solution, like 20 people contributing for the same solution, instead of giving 20 different answers | 10:22 |
|
| so is like a SO solution, that is why `stackoverflow.solutions` | 10:23 |
| ← ngui left | 10:24 |
| → ngui joined | 10:24 |
|
pbodev1
| there's also https://stackoverflow.org/ so i thought there is no problem in doing this | 10:24 |
|
Habbie
| pbodev1, if you actually start doing the same thing, with the same name, that might be legally troublesome | 10:24 |
|
pbodev1
| is totally different in so many ways | 10:25 |
|
| i countered more then 20 | 10:25 |
|
Habbie
| 'ok' | 10:25 |
|
| if it's so different, then why call it the same? :) | 10:25 |
|
pbodev1
| and there is no content copy/paste | 10:25 |
|
| because someone comes on SO and makes a personal question and people are trying to help him and so on | 10:26 |
|
limbo_
| pbodev1: It's not illegal to own a confusing domain like that. Just don't try to imply that it's related to stackexchange's sites. | 10:26 |
|
grawity
| implying that it's related *would* be a trademark case, I'm sure | 10:27 |
|
pbodev1
| and after some time, is the natural thing to come with a final solution | 10:27 |
|
| ye.. | 10:27 |
|
| maybe i'll change it after all | 10:27 |
| ← joaoh82 left | 10:27 |
|
limbo_
| Also, stackoverflow is a specific kind of error in computer software. | 10:27 |
|
| People may forget. | 10:27 |
|
grawity
| it's irrelevant here | 10:28 |
|
| if the site was just talking about that kind of error, yes | 10:28 |
|
pbodev1
| and i like SO and i wanted to stay in the family :) felt natural to do it | 10:28 |
| → joaoh82 joined | 10:28 |
|
grawity
| but if it tries to be a stackoverflow-like QA site, that's another thing | 10:28 |
|
limbo_
| grawity: Good point, I looked at the homepage after saying that. | 10:29 |
|
pbodev1
| you cannot ask questions, you can only come with your own solution | 10:29 |
|
| and eventually somebody else to improve it | 10:30 |
|
limbo_
| pbodev1: imitating another site is a terrible idea if you want your site to be good or successful. Unless it's some kind of aggregation/interface to the other site, and that is clearly stated. | 10:30 |
| ← sozuba left | 10:31 |
|
limbo_
| It has nothing to do with SE, and seems to only have that naem for brand appeal. It's like making a soft drink called coca-pineapple. | 10:31 |
| ← KeyJoo left | 10:31 |
| ← awkwords left | 10:32 |
| → Essadon joined | 10:32 |
| ← yyy left | 10:33 |
| → sozuba joined | 10:33 |
| → awkwords joined | 10:37 |
| → CodeSlingerPaul joined | 10:40 |
| ← sQVe left | 10:41 |
| → jungsubk joined | 10:41 |
| ← nixroot left | 10:41 |
| → goodafternoon joined | 10:41 |
| ← g00s left | 10:42 |
|
pbodev1
| I deleted all the SO referencies, so now remains only the domain name | 10:43 |
| ← goodafternoon left | 10:43 |
| ← mce left | 10:44 |
| → rexwin_ joined | 10:45 |
| → nixroot joined | 10:45 |
| → weird_error joined | 10:50 |
| ← Kartagis left | 10:54 |
| ← ngui left | 10:54 |
| ← jungsubk left | 10:54 |
| → ngui joined | 10:54 |
| → fmgt joined | 10:58 |
| ← ngui left | 10:59 |
| → ngui joined | 10:59 |
|
YoungFrog
| it's funny that you mention git commit & git reset as a safer git stash. I see it the other way. | 10:59 |
| ← joaoh82 left | 11:01 |
| → mce joined | 11:01 |
| → sQVe joined | 11:06 |
|
pbodev1
| sometimes I invent strange things that I do not comprehend, and git is still a foreign language for me, and I think it will remain :) | 11:09 |
| ← crimastergogo left | 11:10 |
| ← Noti left | 11:10 |
|
pbodev1
| I have 3 new ideas every day, from different domains, most of them strange. was thinking making a site with ideas, that people would come and put their ideas for other people to implement them | 11:11 |
| → elsheepo joined | 11:14 |
| ← sQVe left | 11:17 |
| elsheepo → beatzz | 11:18 |
| ← Wulf left | 11:18 |
| → courrier joined | 11:19 |
| → yuriii joined | 11:19 |
| ← ngui left | 11:19 |
| → ngui joined | 11:19 |
|
yuriii
| Hello! | 11:21 |
|
| I'm having problem that git push --force is rejected with non (non-fast-forward), despite using --force. | 11:21 |
|
gitinfo
| yuriii: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 11:21 |
|
yuriii
| Ought to be a configuration problem | 11:21 |
|
| If I first delete the remote branch and then push, then pushing obviously works. | 11:23 |
|
| Any ideas? =) | 11:23 |
|
Habbie
| remotes can reject force pushes | 11:23 |
| ← ngui left | 11:24 |
|
bremner
| yuriii: did you look at the remote config? | 11:24 |
| → ngui joined | 11:24 |
|
yuriii
| What config option should I look for? | 11:24 |
| → ppang joined | 11:24 |
|
yuriii
| I haven't changed any setting on the remote repo. They should be default. | 11:25 |
|
Habbie
| they don't sound default :) | 11:26 |
|
| what kind of repo is it? | 11:26 |
| → Luyin joined | 11:27 |
|
bremner
| receive.denyNonFastForward | 11:27 |
|
yuriii
| My own created simply with "git init --bare --shared". Pushing some scripts from vm to a vm host. | 11:27 |
|
bremner
| +s | 11:27 |
| ← Puffball left | 11:28 |
|
yuriii
| It works! Thanks! | 11:29 |
|
Luyin
| hi! I'm trying to exclude a few paths via .gitignore. I got a folder temp in "FS": ./FS/temp/ and ./FS/temp_NEW, and I want to ignore both temp and temp_NEW, but nothing else in FS. Can I use "FS/temp*" in .gitignore for that? I think I can't because man gitignore says '"*" matches anything except "/"' | 11:29 |
|
gitinfo
| the gitignore manpage is available at https://gitirc.eu/gitignore.html | 11:29 |
| → Raging_Hog joined | 11:31 |
| → yyy joined | 11:33 |
| ← Ayo left | 11:35 |
| → Ayo joined | 11:35 |
|
DelTree
| if temp_NEW is a file, I would do ./FS/temp/* and ./FS/temp_NEW | 11:37 |
| → sQVe joined | 11:38 |
|
Luyin
| no, sorry. they're both directories | 11:39 |
| ← ngui left | 11:39 |
|
DelTree
| then maybe ./FS/temp*/*, but temp_OLD would be ignored as well... | 11:39 |
| → ngui joined | 11:39 |
| ← ngui left | 11:44 |
| → ngui joined | 11:44 |
| ← ngui left | 11:46 |
| ← dmc left | 11:48 |
| → dmc joined | 11:48 |
|
Luyin
| hmm ok temp_OLD doesn't exist, but it would probably not be a problem. But I see what you're trying to say. It would be cleaner to put two lines for that | 11:49 |
|
DelTree
| depends on what you intend to do with future temp* directories if they ever come to exist... | 11:50 |
| ← beatzz left | 11:54 |
| → jungsubk joined | 11:55 |
|
Luyin
| I see, makes sense. Thanks for the input! | 11:55 |
| → Boobie joined | 11:55 |
| → fission6 joined | 11:57 |
| → ngui joined | 11:59 |
| → joaoh82 joined | 12:00 |
| ← ngui left | 12:00 |
| → ngui joined | 12:02 |
| → lankanmon joined | 12:02 |
| → goodafternoon joined | 12:02 |
| → kadoban joined | 12:02 |
| ← Mike11 left | 12:04 |
| ← joaoh82 left | 12:05 |
| ← jungsubk left | 12:05 |
| → mobile_c joined | 12:07 |
| → jungsubk joined | 12:08 |
| → Silenced joined | 12:09 |
| → prakashdanish joined | 12:14 |
| ← jungsubk left | 12:16 |
| ← sozuba left | 12:16 |
| → shaarad joined | 12:16 |
| ← ngui left | 12:16 |
| → jungsubk joined | 12:17 |
| → ngui joined | 12:17 |
| → overbythere joined | 12:17 |
| → jubal joined | 12:18 |
| ← fission6 left | 12:18 |
| Ayo → Guest29520 | 12:19 |
| ← Guest29520 left | 12:19 |
| → Ayo joined | 12:19 |
| ← ngui left | 12:21 |
| → ngui joined | 12:21 |
| → MooNJaCk- joined | 12:26 |
| ← Silenced left | 12:28 |
| ← shaarad left | 12:31 |
| → shaarad joined | 12:32 |
| ← jungsubk left | 12:33 |
| ← chele left | 12:33 |
| → chele joined | 12:34 |
| ← shaarad left | 12:35 |
| → joaoh82 joined | 12:37 |
| ← joaoh82 left | 12:37 |
| ← chele left | 12:39 |
| ← Guest14049 left | 12:40 |
| ← ngui left | 12:41 |
| → ngui joined | 12:42 |
| → sozuba joined | 12:46 |
| → TheRuckus joined | 12:46 |
| → mostlybadfly joined | 12:50 |
| ← overbythere left | 12:53 |
| → chele joined | 12:55 |
| ← igemnace left | 12:55 |
| ← ngui left | 12:56 |
| ← yyy left | 12:56 |
| → ngui joined | 12:56 |
| → th3m1s joined | 12:57 |
| ← sozuba left | 13:00 |
| ← throstur` left | 13:01 |
| ← aw1 left | 13:01 |
| ← TheRuckus left | 13:03 |
| → daurnimator joined | 13:03 |
| → joaoh82 joined | 13:04 |
| → blackmesa joined | 13:04 |
| → CheckDavid joined | 13:04 |
| → yyy joined | 13:04 |
| → gxt joined | 13:05 |
| ← chele left | 13:05 |
| ← mce left | 13:05 |
| ← joaoh82 left | 13:07 |
| → joaoh82 joined | 13:08 |
| → chele joined | 13:08 |
| ← courrier left | 13:09 |
| → mce joined | 13:09 |
|
Anthaas
| Is there a name for different...techniques of getting thing live? For example, multiple devs create feature branches, create PRs against a release branch which a single or all other devs approve etc before a single dev merges them in and deploys? | 13:10 |
|
| If so, what would you call the dev which does the merging/deploying? | 13:10 |
|
demiurge
| release engineer | 13:10 |
| ← alex_pa left | 13:11 |
| → alex_pa joined | 13:12 |
| Ayo → Guest71760 | 13:13 |
| → Ayo joined | 13:13 |
| ← dege left | 13:13 |
| ← Guest71760 left | 13:14 |
| ← ngui left | 13:16 |
| → ngui joined | 13:17 |
| → throstur` joined | 13:17 |
| → awkwords_ joined | 13:19 |
| ← Ayo left | 13:20 |
| → rkta_ joined | 13:20 |
| ← mloskot left | 13:20 |
| → Ayo joined | 13:20 |
| → Silmarilion joined | 13:20 |
| ← ngui left | 13:21 |
| ← awkwords left | 13:21 |
| → ngui joined | 13:22 |
| ← timvisher left | 13:22 |
| ← rkta left | 13:23 |
| rkta_ → rkta | 13:23 |
| → arooni joined | 13:24 |
| → andrybak joined | 13:25 |
| → fission6 joined | 13:27 |
| ← th3m1s left | 13:32 |
| ← throstur` left | 13:33 |
| ← awkwords_ left | 13:33 |
| → TheRuckus joined | 13:34 |
| ← TheRuckus left | 13:34 |
| → awkwords joined | 13:34 |
| ← tsdh left | 13:34 |
| → th3m1s joined | 13:35 |
| → throstur` joined | 13:36 |
| → TheRuckus joined | 13:36 |
| ← prakashdanish left | 13:37 |
|
Luyin
| release manager? | 13:39 |
| → solarjoe4 joined | 13:41 |
| ← ppang left | 13:43 |
| ← mce left | 13:44 |
|
Anthaas
| Sorry - phone call, thanks! | 13:45 |
| ← novum left | 13:46 |
| → crackin joined | 13:49 |
| ← zulutango left | 13:50 |
| ← goodafternoon left | 13:50 |
| → kerframil joined | 13:52 |
| ← crackin left | 13:53 |
| → rominronin joined | 13:54 |
| ← fmgt left | 13:55 |
| → rafasc joined | 13:56 |
| → jungsubk joined | 13:57 |
| ← nixdork left | 13:58 |
| → awkwords_ joined | 14:03 |
| ← awkwords left | 14:05 |
| → keepLearning512 joined | 14:06 |
| ← fission6 left | 14:08 |
| ← jungsubk left | 14:08 |
| → jungsubk joined | 14:08 |
| ← keepLearning512 left | 14:10 |
| → keepLearning512 joined | 14:10 |
| ← keepLearning512 left | 14:11 |
| ← yyy left | 14:12 |
| → fission6 joined | 14:13 |
| → yyy joined | 14:14 |
| → logithack joined | 14:15 |
| ← ngui left | 14:16 |
| → keepLearning512 joined | 14:17 |
| → ngui joined | 14:17 |
| ← keepLearning512 left | 14:18 |
| → bjoe2k4 joined | 14:19 |
| ← ngui left | 14:21 |
| → ngui joined | 14:21 |
| ← jungsubk left | 14:22 |
| → Mike11 joined | 14:22 |
| ← fission6 left | 14:24 |
| ← alex_pa left | 14:24 |
| → alex_pa joined | 14:24 |
| ← nixroot left | 14:27 |
| → keepLearning512 joined | 14:29 |
| ← keepLearning512 left | 14:30 |
| → keepLearning512 joined | 14:31 |
| ← floppydh left | 14:31 |
| → jungsubk joined | 14:33 |
| ← joaoh82 left | 14:35 |
| → joaoh82 joined | 14:35 |
| ← keepLearning512 left | 14:36 |
| → Mat001 joined | 14:37 |
| ← yyy left | 14:37 |
| → yyy joined | 14:38 |
| ← Mike11 left | 14:38 |
| → bolovanos joined | 14:39 |
| → nixroot joined | 14:40 |
| ← Raed left | 14:40 |
| → czart joined | 14:41 |
| → awkwords joined | 14:41 |
| ← blackmesa left | 14:41 |
|
rexwin_
| I am trying to clone of a repository from Github. it does not create any folder after clicking on clone repo | 14:42 |
| ← jungsubk left | 14:43 |
| → nixr00t joined | 14:43 |
| ← awkwords_ left | 14:43 |
| ← Dariuk left | 14:43 |
| ← nixroot left | 14:46 |
| → boombatower joined | 14:47 |
| → Raed joined | 14:48 |
| ← joaoh82 left | 14:48 |
| → fission6 joined | 14:50 |
| → rsrx joined | 14:50 |
| → joaoh82 joined | 14:51 |
| ← Raed left | 14:54 |
| → Raed joined | 14:55 |
| → Dariuk joined | 14:56 |
| ← joaoh82 left | 14:58 |
| → gkze joined | 14:58 |
| ← MooNJaCk- left | 14:58 |
| ← Raed left | 15:01 |
| ← ngui left | 15:01 |
| → Raed joined | 15:02 |
| → ngui joined | 15:02 |
| ← Trieste left | 15:02 |
| ← nxet left | 15:02 |
| → Trieste joined | 15:03 |
| → blackmesa joined | 15:05 |
| ← ngui left | 15:06 |
| ← rkta left | 15:06 |
| → ngui joined | 15:06 |
| ← czart left | 15:08 |
|
rexwin_
| I am getting this when trying to commit | 15:09 |
|
| fatal: LF would be replaced by CRLF in .gitattributes | 15:09 |
| Ayo → Guest40769 | 15:11 |
| ← Guest40769 left | 15:11 |
| → Ayo joined | 15:12 |
|
rexwin_
| git config --global core.safecrlf false did the trick | 15:13 |
|
| but there are no fines upload to my github repo | 15:13 |
|
| files | 15:13 |
| → draget joined | 15:14 |
| ← Silmarilion left | 15:15 |
|
draget
| If I have a submodule and the host on which the submodule lies is not available, can I still clone all files from the parent repository including the submodule files? | 15:15 |
| → bsanford joined | 15:16 |
|
draget
| I want to use files from a specific commit from another repository. I thought a submodule might be the 'cleaner' approach than just copying the files. But I am not 100% sure if the host with the other repository is always available. | 15:16 |
| ← alex_pa left | 15:17 |
| Ayo → Guest19173 | 15:17 |
| → Ayo joined | 15:17 |
| ← Guest19173 left | 15:17 |
| ← nixr00t left | 15:18 |
|
qqx
| draget: No. The parent repo will only have the commit ID(s), not the content. You could create a mirror of that repository, and get the submodules from there. | 15:18 |
|
draget
| Do you think a mirror would be cleaner that just copying the files and point out the state in a README? | 15:19 |
| ← jwest left | 15:19 |
| ← ngui left | 15:21 |
| → ngui joined | 15:22 |
| ← CheckDavid left | 15:23 |
| → jnewt_ joined | 15:24 |
|
rafasc
| Do you have a mirror available? | 15:24 |
|
draget
| I am running a private gitlab. | 15:24 |
| ← mns left | 15:25 |
|
rafasc
| git has a mechanism to rewrite urls, I think you can make a rule that redirects the requests to the url from the repo to your mirror. | 15:26 |
|
| (which can be just a local repo in a repository) | 15:26 |
| ← ngui left | 15:26 |
| ← yyy left | 15:26 |
| → ngui joined | 15:26 |
| → yyy joined | 15:27 |
| → Mike11 joined | 15:28 |
|
rafasc
| And... I missed the point. Too early to talk, need more coffee. | 15:29 |
|
| git subtree is a viable in your situation, and it should be better than just copying the files. Especially if you want to contribute back to that repository. | 15:30 |
| ← sQVe left | 15:32 |
| → eldritch2 joined | 15:32 |
| ← bsanford left | 15:33 |
| → anderson_ joined | 15:34 |
| → joaoh82 joined | 15:35 |
| → freeman42x joined | 15:36 |
| ← ngui left | 15:36 |
| → cdown_ joined | 15:36 |
| ← joaoh82 left | 15:37 |
|
draget
| What about simply commiting the other repository under the frist one? Anything wrong with that? | 15:37 |
| → Toadisattva joined | 15:38 |
| ← cdown left | 15:39 |
| cdown_ → cdown | 15:39 |
| ← Luyin left | 15:44 |
| → dege joined | 15:46 |
|
rafasc
| yes | 15:47 |
|
| git recognize other repos and make 'gitlinks' to it. | 15:47 |
|
| 'gitlinks' are part of what submodules are. | 15:48 |
|
| So you're not really avoiding the problem, you're just making it worse because now you have a gitlink, but not the extra metadata that make submodules work. | 15:49 |
| ← chele left | 15:50 |
| → discopatrick joined | 15:50 |
| → greggerz joined | 15:52 |
| ← throstur` left | 15:53 |
| ← solarjoe4 left | 15:56 |
| ← yuriii left | 15:58 |
| ← raffo left | 15:59 |
| → dpyro joined | 16:03 |
| ← bsaboia left | 16:06 |
| ← rominronin left | 16:07 |
| → blackmesa1 joined | 16:07 |
| → psprint joined | 16:09 |
| ← blackmesa left | 16:09 |
|
psprint
| How to check that a revision exists, if it's only fetched (git fetch origin myBranch), not checked out yet (so no tracking is set up). `git rev-parse --verify --quiet "myBranch"' doesn't work | 16:10 |
| → raffo joined | 16:11 |
|
moritz
| psprint: it's called origin/myBranch, not myBranch | 16:12 |
| ← Ayo left | 16:12 |
|
psprint
| ahso | 16:12 |
| → Ayo joined | 16:12 |
|
psprint
| could I somehow check all possible remotes, like `git rev-parse --verify --quiet "*/myBranch"' ? | 16:13 |
|
moritz
| for remote in $(git remote); do git rev-parse --very --quiet "$remote/myBranch"; done | 16:15 |
|
psprint
| It's weird that this doesn't work: git rev-parse --verify --quiet --glob-pattern "refs/*/ZPath-feature" && echo yes || echo no | 16:16 |
|
rafasc
| psprint: what are you trying to do? | 16:16 |
|
_ikke_
| psprint: might it be that * does not match /? | 16:16 |
|
| so refs/remotes/foo/ZPath-feature does not match? | 16:17 |
| → fahadash joined | 16:17 |
|
psprint
| rafasc: I'm doing syntax highlighting in shell (zsh) that's very specific, interprets commands, highlight e.g. correct/incorrect refs passed to diff, checkout, pull, etc. - and here I'm aiming at highlighting fetched repository as correct-ref if it's an argument for `git checkout ...', because the command will work correctly, set up tracking, etc. | 16:18 |
|
rafasc
| maybe look up into https://github.com/git/git/blob/master/contrib/completion/git-completion.bash#L635 | 16:20 |
|
psprint
| _ikke_: the fetched branch is under refs/origin/ZPath-feature, hmm | 16:20 |
|
_ikke_
| psprint: huh, that's not a valid remote tracking branch | 16:21 |
|
| psprint: ie, git branch -r would not list it | 16:21 |
| ← d6d left | 16:21 |
|
psprint
| _ikke_: It is to be checked out and set-up tracking only after the `git checkout ZPath-feature' will be run | 16:21 |
|
| which is the command that I want to highlight as using a correct ref ZPath-feature | 16:22 |
| → zsoc joined | 16:23 |
|
psprint
| _ikke_: I see origin/ZPath-feature after `git branch -r', hmm. Did I wrongly assume that it will be refs/heads/... ? | 16:23 |
|
rafasc
| problem is that the logic behind the magic used in git checkout is not as simple as that. | 16:23 |
| → dviola joined | 16:23 |
|
psprint
| 3000 lines in the completion, that might be the destination number of lines for the syntax-highlighter of Git, as it does pretty similar thing | 16:25 |
| → mowcat joined | 16:26 |
|
psprint
| the completion doesn't contain glob-pattern option | 16:27 |
| → igemnace joined | 16:27 |
| → thiago joined | 16:29 |
| ← eduardas_m left | 16:31 |
|
psprint
| I'm doing `git fetch origin ZPath-feature', the branch shows in `branch -r' as origin/ZPath-feature, OK, but following find command found 1 match in logs/ only: `find . -iname '*ZPath*feature*''. Could it be that git is using some other storage than files ? ;) | 16:35 |
| → Goplat joined | 16:35 |
|
rafasc
| psprint: refs can be packed. You should not parse the contents of .git/ | 16:36 |
|
psprint
| ok | 16:37 |
|
rafasc
| you need to use the API. Anthing else will fail. | 16:37 |
|
psprint
| Lol, I was doing --glob-pattern, while it is: --glob=pattern.. The following finally works correctly: git rev-parse --verify --quiet --glob="*/ZPath-feature" && echo yes || echo no | 16:38 |
|
rafasc
| e.g. git for-each-ref refs/remotes/<remote> --format='%(refname:short)' | 16:38 |
|
| having a ref that ends in ZPath-feature doesn't guarantee the checkout will succeed. | 16:39 |
|
| if you have more than one remote with refs with the same name, which is extremely common, checkout will fail. | 16:40 |
|
| read about the checkout.defaultRemote config. | 16:42 |
|
psprint
| hmm, so I should first-level check if the ref with the suffix exists, and then test if there are more than 1 | 16:42 |
|
rafasc
| You basically will need to re-implement the entire DWIM logic in shell script. | 16:43 |
| → linuxmodder joined | 16:44 |
|
rafasc
| including checking if checkout.defaultRemote is set, dealing with the difference between checking out a remote tracking branch vs a local branch (former implies --track, latter doesn't) etc. | 16:45 |
|
| I think in this case it's easier to ask forgiveness than permission. | 16:47 |
| → linuxmodder_ joined | 16:50 |
| → prakashdanish joined | 16:52 |
| ← linuxmodder left | 16:52 |
|
psprint
| ok. One thing: git rev-parse with --glob="*/master" will return $? != 0, even though it will find the ref(s) | 16:53 |
|
rafasc
| git for-each-ref refs/remotes/*/<name> --format='%(refname:short)' | wc -l == 1 | 16:53 |
| → Ranhir joined | 16:53 |
| → linuxmodder joined | 16:54 |
| → vdl joined | 16:54 |
|
rafasc
| git for-each-ref refs/remotes/$remote/<name> --format='%(refname:short)' | wc -l == 1 | 16:55 |
|
psprint
| It might be even a bug, the non-zero exit status, as I see only 3 mentions of "return" in https://www.git-scm.com/docs/git-rev-parse | 16:55 |
|
rafasc
| where remote=checkout.defaultRemote if defined, * otherwise | 16:55 |
| ← linuxmodder_ left | 16:57 |
| → KeyJoo joined | 16:57 |
| → thebope joined | 16:58 |
|
psprint
| the for-each-ref returns 0 always, on the other hand | 16:59 |
| ← thiago left | 16:59 |
|
rafasc
| check if $git rev-list --glob=refs/remotes/$remote/$branch --no-walk --count; returns 1; | 16:59 |
| → Guest14049 joined | 17:00 |
|
rafasc
| branch= the ref you're testing, remote= checkout.defaultRemote if configured, otherwise '*' | 17:00 |
|
| I think that's the best you can do. | 17:01 |
|
psprint
| yes it returns 1 and 0 correctly, but I mean the shell exit status code, the $? | 17:01 |
|
| ahso | 17:01 |
|
rafasc
| psprint: no, it will print to stdout. | 17:01 |
|
| it's not an exit code. | 17:01 |
|
psprint
| rafasc: yes, and I mean the exit code | 17:01 |
| → durham joined | 17:03 |
|
psprint
| Finally it works, the code in question - using -n "..." instead of shell exit code (which seems to be always false, non-zero for this command): [[ "${FAST_HIGHLIGHT[chroma-git-subcommand]}" = "checkout" && -n "$(command git rev-parse --verify --quiet --glob="*/$__wrd" 2>/dev/null)" ]]; then | 17:03 |
| ← qqx left | 17:03 |
| → qqx joined | 17:04 |
| ← KeyJoo left | 17:04 |
| → awkwords_ joined | 17:04 |
|
rafasc
| psprint: I think you can use rev-parse verify, but you need to change that --glob. | 17:05 |
| ← mooasaurus left | 17:06 |
|
psprint
| rafasc: how? | 17:06 |
| → mooasaurus joined | 17:06 |
|
rafasc
| to take into account checkout.defaultRemote | 17:06 |
| ← awkwords left | 17:07 |
|
qqx
| I don't think it makes sense to use rev-parse --verify and --glob together. | 17:08 |
|
psprint
| Ok, I'll do it in a second pass to the code, I've had stressful 2 hours trying to match all odds and stuff, so that the basic check for fetched branch works | 17:08 |
|
| qqx: ah, maybe this is the reason it always returned $? != 0 | 17:09 |
|
qqx
| psprint: Yeah. | 17:09 |
|
rafasc
| psprint: instead of * use prefix="refs/remotes/$(git config --default '*' --get checkout.defaultRemote)" | 17:09 |
| ← T_UNIX left | 17:10 |
|
qqx
| psprint: Yes, you weren't passing any object name for --verify to work with, so it was considering that to be an error. | 17:10 |
|
rafasc
| psprint: --glob="refs/remotes/$(git config --default '*' --get checkout.defaultRemote)/$__wrd" | 17:10 |
|
qqx
| The pattern for --glob doesn't count there. | 17:10 |
|
psprint
| qqx: without --verify, it always returns $? = 0, no error, even with no refs are found, But that's fine, I'll stick to the -n "" output testing | 17:11 |
| ← Ayo left | 17:12 |
|
psprint
| rafasc: thanks | 17:12 |
|
rafasc
| or check if $rev-list --count --no-walk --glob="refs/remotes/$(git config --default '*' --get checkout.defaultRemote)/$__wrd"; evaluates to 1; | 17:12 |
|
psprint
| true, that would cover the conflicting-names issue | 17:13 |
|
| rafasc: error: unknown option `default' | 17:14 |
|
rafasc
| yes, the count differs from 1, it either doesn't exist or there's more than one entry that matches. | 17:14 |
| → Ayo joined | 17:14 |
|
rafasc
| I guess --default is newish. | 17:14 |
|
| do it separately and test it if its empty. | 17:15 |
|
psprint
| I can do ${$(git config ...):-*} | 17:15 |
|
qqx
| The main benefit to config --default is that it can do some conversions, but that doesn't apply to the default remote. | 17:16 |
| ← raulp left | 17:17 |
|
psprint
| I got a final version: git rev-list --count --no-walk --glob="refs/remotes/${$(git config --get checkout.defaultRemote):-*}/$__wrd" | 17:17 |
| → GreenJello joined | 17:18 |
| → im0nde joined | 17:18 |
|
psprint
| yay, it works :) thanks | 17:19 |
| → raulp joined | 17:21 |
| → SmashingX joined | 17:21 |
|
SmashingX
| anybody using smartgit? | 17:22 |
|
rafasc
| psprint: now do: git branch new; git checkout new; and watch it fail, even though it shouldn't ;) | 17:22 |
| ← Goplat left | 17:23 |
| ← GreenJello left | 17:23 |
|
SmashingX
| anybody using smartgit for linux, do you know how to be able to show the files that are unchanged in the current directory but not in the whole repo? | 17:23 |
|
rafasc
| SmashingX: yes. I'd assume at least the author of it uses it. | 17:23 |
|
| !gui | 17:24 |
|
gitinfo
| Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed. | 17:24 |
|
rafasc
| I don't think you'll get answers about that. | 17:24 |
|
SmashingX
| well maybe somebody is using it here | 17:25 |
|
| who knows | 17:25 |
| ← durham left | 17:25 |
|
rafasc
| SmashingX: grep -Fxvf <(git ls-files --modified) <(git ls-files) | 17:27 |
|
| warranty not included | 17:27 |
|
SmashingX
| ? | 17:28 |
|
| rafasc: put that in where? | 17:28 |
|
| where in the UI? | 17:28 |
|
rafasc
| in the shell. If there's one | 17:29 |
|
psprint
| rafasc: It seems to work, highlights "new" as a correct ref: http://psprint.blinkenshell.org/git-checkout-new-hl.png | 17:29 |
| → keepLearning512 joined | 17:29 |
| → blackmesa joined | 17:29 |
|
rafasc
| psprint: o.O how? | 17:30 |
| → nixdork joined | 17:30 |
| ← logithack left | 17:30 |
|
psprint
| By your method, rev-list, I think it has no flaws | 17:30 |
|
rafasc
| how is it detecting local branches if were globbing against refs/remotes? | 17:31 |
|
SmashingX
| rafasc: mhhh, this is basic functionality, there should be just a button for that | 17:31 |
|
psprint
| rafasc: hah, I see | 17:31 |
| ← blackmesa1 left | 17:31 |
|
rafasc
| you're probably highlighting everything correctly. try git checkout askdladk; | 17:32 |
|
| because rev-list is writing 1 to stdout, not exiting with status 1. But that's just a guess | 17:32 |
| → blackmesa1 joined | 17:34 |
|
psprint
| rafasc: no, I get missed matches too: https://asciinema.org/a/YWmwZM3iQu07uJfmRmo5oLn94 | 17:35 |
| ← blackmesa left | 17:35 |
|
rafasc
| SmashingX: you found the first issue with GUIs. There's not enough buttons for everything without making a mess. | 17:35 |
|
psprint
| rafasc: ah! it's because of previous code | 17:35 |
|
| rafasc: the code that handles local branches by its semi-old coded paths | 17:36 |
| → bebbet joined | 17:36 |
| ← fission6 left | 17:37 |
|
rafasc
| psprint: you checkout new and your prompt says master o.0 | 17:37 |
| ← nixdork left | 17:38 |
|
psprint
| I pressed Ctrl-C :] | 17:38 |
| ← keepLearning512 left | 17:38 |
|
rafasc
| I figured a second after writing it, by the color of your triangle | 17:39 |
|
psprint
| to explain it totally, there's if git rev-parse --verify --quiet "$__wrd"; then ...; else "1" = "$(git rev-list ...", so it first tries to find local branch, only then tries to find a remote one | 17:39 |
|
rafasc
| makes sense 👍 | 17:40 |
|
Learath2
| what was that PS1 program included with git called? | 17:41 |
|
| (or script, don't remember if it was one) | 17:41 |
| → logithack joined | 17:41 |
|
rafasc
| prompt.sh? | 17:42 |
| ← bebbet left | 17:42 |
|
rafasc
| git::master/contrib/completion^{tree} | 17:43 |
|
gitinfo
| Git web link: https://github.com/git/git/commits/master/contrib/completion^{tree} | 17:43 |
|
rafasc
| git::master/contrib/completion | 17:43 |
|
gitinfo
| Git web link: https://github.com/git/git/commits/master/contrib/completion | 17:43 |
| → buyfn joined | 17:43 |
|
rafasc
| git-prompt.sh | 17:43 |
| → bebbet joined | 17:43 |
| → Regon joined | 17:44 |
| ← polyrob left | 17:44 |
|
gitinfo
| Git web link: https://github.com/git/git/blob/master/contrib/completion | 17:44 |
| ← Mike11 left | 17:46 |
| → polyrob joined | 17:46 |
| ← Ayo left | 17:47 |
| ← blackmesa1 left | 17:47 |
| → Ayo joined | 17:47 |
| ← Guest14049 left | 17:47 |
| → nixdork joined | 17:49 |
| → TJ- joined | 17:51 |
| ← prakashdanish left | 17:52 |
| → GreenJello joined | 17:52 |
| → wootehfoot joined | 17:54 |
| ← bebbet left | 17:55 |
| → bebbet joined | 17:57 |
| → Silenced joined | 17:57 |
| ← bebbet left | 17:57 |
| → bebbet joined | 17:58 |
| ← raulp left | 17:59 |
| ← watabou left | 18:00 |
| → raulp joined | 18:01 |
| → seventh__ joined | 18:02 |
| → fission6 joined | 18:03 |
| → dfee joined | 18:05 |
| → fragamus joined | 18:06 |
| → orbyt_ joined | 18:07 |
| ← yyy left | 18:13 |
| → yyy joined | 18:13 |
| → rkta joined | 18:14 |
| ← rexwin_ left | 18:15 |
| ← sauvin left | 18:18 |
| ← fragamus left | 18:23 |
| → thiago joined | 18:23 |
| ← sunri5e left | 18:25 |
| ← igemnace left | 18:25 |
| ← inkbottle left | 18:26 |
| ← lamont left | 18:27 |
| → sunri5e joined | 18:28 |
| → Narrat joined | 18:29 |
| ← anderson_ left | 18:30 |
| ← eldritch2 left | 18:30 |
| ← yyy left | 18:32 |
| → yyy joined | 18:32 |
| → lamont joined | 18:33 |
| ← fahadash left | 18:36 |
| ← yyy left | 18:36 |
| ← planetcall|work left | 18:37 |
| Ayo → Guest79497 | 18:38 |
| ← Guest79497 left | 18:38 |
| → yyy joined | 18:38 |
| → Ayo joined | 18:38 |
| → \void joined | 18:38 |
| ← yyy left | 18:43 |
| → Dirak joined | 18:43 |
| → paulwood_ joined | 18:43 |
| ← paulwood_ left | 18:45 |
| → Gambit--_ joined | 18:46 |
| Gambit--_ → Gambit- | 18:46 |
|
Gambit-
| Hi folks | 18:46 |
|
rafasc
| Gambit-: Hi! | 18:47 |
|
Gambit-
| I'd like to include an "example" credential file that people can copy and make use of, but I'd like to prevent anyone from actually editing that exact file and making changes to it. pre-commit on NOCOMMIT would work except of course that hooks aren't propagated. And .gitignore doesn't cover tracked files. Any other clever solutions? | 18:47 |
| → blackmesa1 joined | 18:47 |
|
Gambit-
| I'll probably solve this in a slightly different way, but I'm curious if there's some trick I'm unaware of that could be applied to situations like this. | 18:48 |
| ← bebbet left | 18:48 |
| → bebbet joined | 18:49 |
|
sparr
| I have just done a `git merge` and I would like to undo it. Is there any shorthand for that? | 18:50 |
|
rafasc
| reset the branch to the commit before the merge: | 18:51 |
|
qqx
| sparr: git reset --hard @~ | 18:51 |
|
rafasc
| git reset <merge_hash>^1 | 18:51 |
|
| qqx's version will also discard any uncommited changes | 18:52 |
|
BtbN
| Gambit-, add it to gitignore and then force add it anyway. | 18:57 |
|
qqx
| BtbN: That won't really do anything. gitignore doesn't apply to files that are already tracked by git. | 18:58 |
|
BtbN
| Won't it prevent adding new changes? | 18:58 |
|
qqx
| BtbN: No | 18:58 |
|
BtbN
| Well, hope your users aren't stupid enough to commit their real creds. | 18:58 |
|
Gambit-
| Yeah, I thought of and tried the .gitignore thing too, and it behaves exactly as qqx describes. | 19:00 |
|
| BtbN, we should all be so lucky :D | 19:00 |
| → yyy joined | 19:02 |
| ← Silenced left | 19:02 |
| → eldritch joined | 19:05 |
| → anderson_ joined | 19:05 |
| → jakogut_ joined | 19:05 |
| → fragamus joined | 19:06 |
| → Puffball joined | 19:06 |
|
rafasc
| add a creds.sample to the repo and ignore 'creds' | 19:07 |
|
BtbN
| Yeah, the usual pattern is somefile-dist, which you are supposed to rename to somefile, and somefile in gitignore | 19:08 |
| Ayo → Guest92453 | 19:12 |
| ← Guest92453 left | 19:12 |
| → Ayo joined | 19:12 |
| ← fission6 left | 19:18 |
|
Gambit-
| rafasc: Yeah that's the basic model I decided made the most sense. I'm doing something slightly different because I (heh) realized I was making a library and not something they would directly checkout, but still. | 19:25 |
|
| Thank you both for the pattern insight. It's good to know what convention looks like and that there's not some intrinsic feature I'm mis-using. | 19:25 |
|
rafasc
| !config | 19:26 |
|
gitinfo
| [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas | 19:26 |
|
rafasc
| there's more approaches there you can think about. | 19:26 |
| → Silmarilion joined | 19:27 |
|
Gambit-
| *thumbs up* | 19:27 |
|
| Off to create more havoc, thanks again! | 19:27 |
| ← Gambit- left | 19:27 |
| ← diogenese left | 19:28 |
| → TrentonDAdams joined | 19:30 |
|
TrentonDAdams
| So I'm rebasing a branch (X) against master, then rebasing another branch (Y) against branch X. Every time I do it I get the same conflicts, repeatedly it seems for many of the commits in branch Y. So, I've squashed all the commits in branch X so that there's only one commit difference between X and master. Now I'm going to do the same for branch Y against X, as I think that'll make it simpler going forward. Thoughts? | 19:33 |
|
| And in the future, I probably won't do multi-branch rebases, lol | 19:33 |
| → diogenese joined | 19:34 |
| ← Silmarilion left | 19:35 |
|
rafasc
| or you could make git remember how you solve the conflicts by enabling git rerere. | 19:37 |
| ← gxt left | 19:40 |
| → GinoMan joined | 19:41 |
| → czart joined | 19:42 |
|
TrentonDAdams
| rafasc: Thanks. So, from what I'm gathering, once I enable git rerere in the git config it mostly manages that stuff automatically? | 19:44 |
| ← mooasaurus left | 19:44 |
|
rafasc
| yes, it will stop for conflict resolution, but it should resolve automatically if the conflict is exactly the same. | 19:46 |
|
| this is done in order to give you a chance to verify if it resolved correctly | 19:46 |
|
| it's been a while since I last used it, not sure I can help you much more than that. | 19:47 |
|
TrentonDAdams
| No problem, that's helpful, cause I'm getting sick of this resolution, lol | 19:47 |
| ← yyy left | 19:48 |
| ← fragamus left | 19:49 |
| ← discopatrick left | 19:50 |
|
rafasc
| then (re)use the (re)corded (re)solution | 19:53 |
| ← thebope left | 19:54 |
|
TrentonDAdams
| rafasc: I found the source of my problem. rebase squash caused me grief. I squashed master -> branch X. The last time I rebased Y against X the X had multiple commits. So Y has a record of those commits. I then squashed X's commits, so git is attempting to re-apply X's old commits as if they are Y's commits because it now can't tell that they were X's commit. If that makes any sense, lol | 19:59 |
| ← linuxmodder left | 19:59 |
| → acercle joined | 20:00 |
| → durham joined | 20:00 |
| ← durham left | 20:02 |
| → Jitta joined | 20:02 |
| → fission6 joined | 20:04 |
| ← dviola left | 20:12 |
| → yyy joined | 20:12 |
| → bn_work joined | 20:13 |
| → fragamus joined | 20:15 |
| ← czart left | 20:15 |
| ← dfee left | 20:18 |
| ← netj left | 20:22 |
| → netj joined | 20:22 |
| → Sasazuka joined | 20:23 |
| → yyy- joined | 20:23 |
| ← fragamus left | 20:24 |
| ← Dirak left | 20:25 |
| ← andrybak left | 20:25 |
| → jwest joined | 20:25 |
| → joeyy joined | 20:27 |
| ← yyy left | 20:27 |
| → wildlander joined | 20:29 |
| → fragamus joined | 20:29 |
| → rc96 joined | 20:30 |
| ← bachler left | 20:30 |
| ← mowcat left | 20:31 |
| → bachler joined | 20:34 |
| ← graphene left | 20:34 |
| → graphene joined | 20:35 |
| ← wootehfoot left | 20:36 |
|
rc96
| Why do I keep getting prompted when I do a git pull | 20:36 |
|
| for credentials | 20:36 |
|
| I'm in Windows 10 | 20:37 |
|
GreenJello
| rc96, you're probably using an https remote instead of ssh | 20:37 |
| → GinoMan2440 joined | 20:39 |
| ← GinoMan left | 20:43 |
| ← rc96 left | 20:43 |
| ← timj left | 20:47 |
| → timj joined | 20:48 |
| ← buyfn left | 20:48 |
| → iam730 joined | 20:49 |
| → novum joined | 20:49 |
| ← bebbet left | 20:51 |
| ← gtristan left | 20:52 |
| → Dirak joined | 20:54 |
| ← fragamus left | 21:00 |
| ← raffo left | 21:02 |
| ← kerframil left | 21:06 |
| → cd joined | 21:08 |
| ← mostlybadfly left | 21:09 |
| ← diogenese left | 21:11 |
| → AtumT joined | 21:16 |
| ← Hello71 left | 21:16 |
| → Hello71 joined | 21:17 |
| ← cswl left | 21:21 |
| → D630 joined | 21:22 |
|
SmashingX
| rafasc: That's not totally true. | 21:25 |
|
rafasc
| to each their own. | 21:25 |
| → dfee joined | 21:25 |
|
SmashingX
| that is just basic functionallity as I was saying | 21:27 |
|
| I don't see why that would make a mess | 21:27 |
|
rafasc
| the problem isn't that specific feature. | 21:28 |
| → bebbet joined | 21:28 |
|
rafasc
| it's that git is massively complex and there are tons of features that are "basic functionality" | 21:28 |
|
| if you have bash completion, type git diff --<tab><tab> | 21:30 |
|
| https://ptpb.pw/ElF- | 21:31 |
| ← acercle left | 21:31 |
| → acercle joined | 21:32 |
|
rafasc
| that's just the basic functionality for a single command. | 21:32 |
| ← dolphy left | 21:32 |
|
rafasc
| git help -av | wc -l returns 150 | 21:32 |
| ← Ram-Z left | 21:34 |
| ← bebbet left | 21:35 |
| → Ram-Z joined | 21:35 |
| → bebbet joined | 21:36 |
| ← Regon left | 21:37 |
| → kfoonamalik joined | 21:37 |
|
rafasc
| SmashingX: https://d2.alternativeto.net/dist/s/smartgit_895177_full.png?format=jpg&width=1600&height=1600&mode=min&upscale=false | 21:37 |
|
| looks like you can have a column with index state and working tree state. | 21:38 |
|
| sort by that. | 21:38 |
|
SmashingX
| But I'm confused why they don't have that functionality in smartgit but they do have it in smartsvn | 21:39 |
|
| which is made by the same company | 21:39 |
|
rafasc
| you'll have to ask them. | 21:39 |
|
SmashingX
| when you select view all files, it only shows you the files in the directory either if they are modified or not | 21:40 |
|
| but when I click that button in smartgit it shows me a bunch of hidden files (.bar) and many others, so it's hard to see | 21:40 |
| ← kapil____ left | 21:41 |
| ← GinoMan2440 left | 21:44 |
| → pawle joined | 21:45 |
| → joeco joined | 21:48 |
| ← novum left | 21:48 |
| joeco → joseph99 | 21:50 |
|
rafasc
| ever better: git ls-files --no-modified | 21:52 |
|
| was not aware that ls-files had --no-modified | 21:52 |
| → Arcaelyx joined | 21:52 |
|
rafasc
| SmashingX: can't beat this ^ ;) | 21:53 |
| → linuxmodder joined | 21:54 |
| ← jakogut_ left | 21:54 |
| → Goplat joined | 21:55 |
| → jakogut_ joined | 21:56 |
|
SmashingX
| I appreciate the suggestions, but I don;t think we are in the same channel | 21:57 |
| → Geezus42 joined | 21:58 |
| ← Emperor_Earth left | 22:03 |
| ← TheRuckus left | 22:06 |
|
rafasc
| again, to each their own | 22:07 |
| → novum joined | 22:10 |
| ← linuxmodder left | 22:12 |
| → wreed joined | 22:12 |
| → linuxmodder joined | 22:16 |
| → mooasaurus joined | 22:18 |
| → dviola joined | 22:21 |
| ← tazle_ left | 22:24 |
| → raffo joined | 22:27 |
| ← silverballz left | 22:30 |
| ← Ayo left | 22:33 |
| → inkbottle joined | 22:35 |
| → yyy joined | 22:35 |
| ← yyy left | 22:35 |
| → Thominus joined | 22:41 |
| → strugee joined | 22:41 |
| → Onionnion joined | 22:46 |
| → Guest14049 joined | 22:54 |
| ← yyy- left | 22:58 |
| → dre_ joined | 23:01 |
| → Silenced joined | 23:01 |
| ← greggerz left | 23:01 |
| ← graphene left | 23:02 |
| → graphene joined | 23:03 |
| ← irdr left | 23:03 |
| → n3wborn joined | 23:03 |
| ← TJ- left | 23:03 |
| ← fission6 left | 23:06 |
| → timvisher joined | 23:08 |
| → str joined | 23:09 |
| → drith joined | 23:10 |
| ← paraxial left | 23:13 |
| → diogenese joined | 23:13 |
| → paraxial joined | 23:13 |
| ← MACscr left | 23:14 |
| ← bolovanos left | 23:15 |
| ← Silenced left | 23:15 |
| ← Ram-Z left | 23:18 |
| → TheRuckus joined | 23:21 |
| ← th3m1s left | 23:25 |
| ← anderson_ left | 23:26 |
| ← netj left | 23:28 |
| → anderson joined | 23:28 |
| → netj joined | 23:28 |
| → linuxmodder_ joined | 23:30 |
| → Ram-Z joined | 23:30 |
| ← linuxmodder left | 23:32 |
| → linuxmodder joined | 23:34 |
| → Urangst joined | 23:35 |
| ← linuxmodder_ left | 23:36 |
| ← pawle left | 23:40 |
| → sunri5e_ joined | 23:40 |
| ← sunri5e left | 23:42 |
| ← CodeSlingerPaul left | 23:42 |
| ← Jitta left | 23:42 |
| ← thiago left | 23:43 |
| ← Dirak left | 23:47 |
| → ngui joined | 23:51 |
| → linuxmodder_ joined | 23:51 |
| → Dirak joined | 23:51 |
| ← Narrat left | 23:53 |
| ← linuxmodder left | 23:53 |
| ← TheRuckus left | 23:54 |
| ← theoceaniscool left | 23:55 |
| → thebope joined | 23:57 |
