IRCloggy #git 2022-03-03

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2022-03-03

← Codaraxis left00:01
← zumba_addict left00:03
→ zumba_addict joined00:03
ripdog I'm just thinking, once I've applied this patch, I won't be able to easily re-generate it. Won't the changes from the new version of the base program become a part of my commit history, and thus become a part of any patch I generate in this way to apply to a future version of the base program? I.e. currently, all the commits I'm diffing over are only my changes on version 3.4, but when I merge version 3.5 + my changes, git diff {commit 2} would include all the00:03
changes made between 3.4 and 3.5 by the original developers?00:03
Perhaps I should hold onto this patch, and then next update I just create a second patch containing the changes not included in this patch?00:04
OnlineCop There's a difference between `git diff master..feature` (two dots) and `git diff master...feature` (three dots).00:05
You could do that, yes.00:05
→ Null_A joined00:05
← Tangent-Man left00:06
OnlineCop When I pull in others' work, I like to `git pull --rebase` so all of my changes get applied on top of whatever others had committed onto that branch.00:06
→ geowiesnot joined00:07
OnlineCop You could also just adopt a policy to always merge your changes instead of rebasing, so that's a bit of a personal/coworker preference.00:07
← sobkas left00:07
OnlineCop In either case, there could be conflicts during the merge/rebase, so you're responsible for dealing with those conflicts as you would normally.00:07
← romesrf left00:07
← sa0 left00:09
→ sa0 joined00:10
ripdog So I guess keeping my patch files is the safest option... not ideal but I guess it is a logical match for what I'm doing - patching a codebase. Thanks for the advice.00:14
→ pulse joined00:15
← sa0 left00:15
→ sudomann joined00:21
← hseg left00:24
→ hseg joined00:25
← qpdb left00:26
← sudomann left00:26
← GNUmoon left00:29
→ GNUmoon joined00:30
← stewie925 left00:32
← DoofusCanadensis left00:32
← tehenderz_ left00:35
→ tehenderz joined00:36
→ sudomann joined00:41
→ kaiseisei joined00:42
← geowiesnot left00:43
→ stewie925 joined00:44
← sudomann left00:45
← Null_A left00:47
→ Null_A joined00:48
→ Kohe joined00:49
→ sa0 joined00:50
← Null_A left00:52
← sa0 left00:55
→ Null_A joined00:55
→ sudomann joined00:57
← kaiseisei left00:58
→ kaiseisei joined00:59
← sudomann left01:01
← k8yun left01:02
→ sudomann joined01:03
→ karabaja4 joined01:05
→ TonyStone joined01:09
← TonyStone left01:10
← sudomann left01:18
→ Codaraxis joined01:19
← Cera left01:20
← pretty_dumm_guy left01:21
→ Cera joined01:22
→ khole joined01:24
→ sudomann joined01:25
→ troyt joined01:29
→ geowiesnot joined01:29
→ vysn joined01:36
← jmcb left01:42
→ lgc joined01:47
hendry I'm working on a commit and when I do a git pull, I don't want a merge, I still want it to be the last commit before I push it. I guess people rebase to sort this out?01:49
← Yruama left01:51
→ rgrinberg joined01:55
→ digitalnomad joined01:58
OnlineCop The last commit? As in, `fetch` but don't merge/rebase?01:58
If you mean that you want to `git pull --rebase` so your changes sit on top of the latest on origin, that's going to avoid doing a merge.01:59
← Kohe left02:00
← lgc left02:00
digitalnomad Hello ! I'm trying to install the latest version of git using the git-core PPA recommended in the docs on the bullseye version of Debian (it's a docker container) and I'm getting a certificate verification error. I've tried manually setting this as trusted within `sources.list`, reinstalling `ca-certificates`, and other troubleshooting but I can't02:02
seem to get around this. Could someone please explain why this cert is not being trusted and how I can install the latest version of Debian in my case? Thanks in advance!02:02
→ vicfred joined02:08
← pulse left02:08
hendry OnlineCop: thanks, I need to try that!02:08
← digitalnomad left02:19
← Gustavo6046 left02:28
→ Gustavo6046_ joined02:28
← ChmEarl left02:30
→ digitalnomad joined02:31
← vicfred left02:36
← Sulky left02:37
← Sulky__ left02:37
← stewie925 left02:37
← hseg left02:40
← nyah left02:40
← justAstache left02:41
→ justAstache joined02:42
← Murr left02:44
→ Murr joined02:44
← digitalnomad left02:46
← Gustavo6046_ left02:46
→ Gustavo6046 joined02:47
→ anaveragehuman joined02:49
→ sentriz_ joined02:50
sentriz_ → sentriz02:51
← donofrio left02:53
→ Xenguy_ joined02:54
← geowiesnot left02:56
← Xenguy left02:56
← Null_A left02:57
← igemnace left02:58
→ Null_A joined02:58
← tyson2 left02:58
→ igemnace joined02:59
← FinnElija left03:00
← Null_A left03:03
→ sicelo joined03:05
← sicelo left03:05
→ sicelo joined03:05
→ FinnElija joined03:06
→ llh joined03:08
← FinnElija left03:09
→ finn_elija joined03:09
finn_elija → FinnElija03:09
→ Null_A joined03:11
→ TonyStone joined03:14
→ lllh joined03:22
← kyshoc left03:23
→ kyshoc joined03:23
← kyshoc left03:23
→ kyshoc joined03:23
→ gast0n joined03:24
← llh left03:25
← khole left03:25
→ khole joined03:26
← vdamewood left03:27
→ vdamewood joined03:28
← rgrinberg left03:29
→ SteveR joined03:34
← thebombzen left03:37
← sudomann left03:39
← tehenderz left03:41
→ tehenderz joined03:41
→ terrorjack joined03:44
← Wuzzy left03:44
← vdamewood left03:48
→ vdamewood joined03:49
→ sudomann joined03:53
→ khole_ joined03:57
← khole_ left03:57
← khole left03:57
← sudomann left03:57
← crashrep left04:06
← Gustavo6046 left04:07
→ sudomann joined04:09
→ Gustavo6046 joined04:10
← Gustavo6046 left04:10
← sudomann left04:14
→ Gustavo6046 joined04:14
← mat001 left04:17
→ zulutango joined04:23
→ Guest83 joined04:24
← Guest83 left04:25
→ sudomann joined04:26
← sudomann left04:30
→ phrix joined04:37
← tehenderz left04:37
← phrix left04:38
→ tehenderz joined04:38
→ coot joined04:40
← Murr left04:43
→ Murr joined04:44
← Null_A left04:48
→ Null_A joined04:49
→ cdown_ joined04:50
← Null_A left04:51
→ Null_A joined04:51
← cdown left04:53
cdown_ → cdown04:53
← jstein left04:54
← stenno left04:55
← Gustavo6046 left04:56
→ pmcnabb joined04:57
→ sudomann joined04:59
→ phrix joined05:00
→ Codaraxis_ joined05:00
← sudomann left05:03
← Codaraxis left05:05
→ _9pfs joined05:05
← phrix left05:07
← vdamewood left05:09
→ sudomann joined05:17
← Null_A left05:17
← cdown left05:17
→ Null_A joined05:18
← skapata left05:19
→ stenno joined05:22
← sudomann left05:22
← Null_A left05:22
→ arch-angel joined05:23
← anaveragehuman left05:24
← great_taste left05:24
← xkuru left05:24
→ sudomann joined05:31
→ Null_A joined05:35
→ humanBird joined05:35
← tehenderz left05:35
← bloody left05:35
→ tehenderz joined05:36
→ Sulky joined05:44
→ Sulky_ joined05:44
← ferdna left05:45
→ ferdna joined05:47
← ferdna left05:48
← Null_A left05:52
← gast0n left05:52
→ kenanmarasli joined05:53
← sudoforge left05:53
→ jkl joined05:58
→ rgrinberg joined06:02
← emf left06:03
→ emf joined06:04
← emf left06:05
→ emf joined06:06
← hbautista left06:06
← emf left06:06
→ emf joined06:08
← cryptonector left06:09
← GNUmoon left06:11
← _9pfs left06:13
→ Kohe joined06:14
← retroid_ left06:20
→ Null_A joined06:23
← Null_A left06:23
→ Null_A joined06:23
→ madewokherd` joined06:25
→ retroid_ joined06:25
→ howdoi joined06:26
→ cryptonector joined06:26
← madewokherd left06:26
← zebrag left06:28
← FinnElija left06:29
→ FinnElija joined06:29
← rgrinberg left06:41
← junktext left06:45
← thiago left06:50
→ bkircher_afk joined06:55
→ carl- joined06:56
→ Gustavo6046 joined06:58
bkircher_afk → bkircher06:58
→ mannequin joined06:58
← Misotauros left06:58
← bkircher left07:01
← Kohe left07:02
→ Kohe joined07:03
→ aminvakil joined07:05
← SteveR left07:09
← Kohe left07:10
← Cera left07:12
→ otisolsen70 joined07:15
← pyever___ left07:20
→ Jenna16bit joined07:30
← Null_A left07:34
→ Null_A joined07:35
→ ajfriesen701 joined07:41
ajfriesen701 → ajfriesen7007:42
← frobnic left07:43
← Null_A left07:45
→ nyah joined07:47
→ GNUmoon joined07:47
→ palasso joined07:47
→ frobnic joined07:48
← baffodoro left07:51
← Gustavo6046 left07:55
→ vicecea joined07:57
→ Null_A joined08:00
← Sulky left08:01
← Sulky_ left08:01
→ Akiva joined08:02
→ Sulky joined08:02
→ Sulky_ joined08:02
→ jstein joined08:04
← unluckyshrubbery left08:04
← masoudd left08:08
→ sa0 joined08:14
→ MajorBiscuit joined08:17
← Null_A left08:18
→ DibbTubberOne joined08:18
← sa0 left08:18
→ Tangent-Man joined08:19
→ Null_A joined08:19
← Tangent-Man left08:20
← Jenna16bit left08:20
→ Tangent-Man joined08:20
← Null_A left08:27
→ feriman joined08:29
→ yuckey2d joined08:30
← roadie left08:31
→ Jenna16bit joined08:38
→ DoubleJ joined08:39
← DoubleJ left08:39
→ DoubleJ joined08:39
← DoubleJ left08:39
→ roadie joined08:42
→ DoubleJ joined08:42
← DoubleJ left08:42
← cryptonector left08:43
← humanBird left08:43
← Murr left08:43
← aminvakil left08:44
→ Murr joined08:44
→ Null_A joined08:44
→ aminvakil joined08:44
← Null_A left08:45
→ Null_A joined08:45
← ishutin left08:45
→ TheCatBehemoth joined08:48
→ TomyWork joined08:49
← roadie left08:49
→ cryptonector joined08:50
→ YoungFrog joined08:52
→ masoudd joined08:53
← Null_A left08:55
← AbleBacon left08:56
→ phrix joined08:57
← phrix left08:58
← emf left08:59
→ roadie joined09:03
← howdoi left09:05
→ drbeco joined09:07
← TomyWork left09:08
→ TomyWork joined09:09
→ ishutin joined09:09
→ Null_A joined09:11
← Null_A left09:16
← roadie left09:17
← burakcank left09:20
← DibbTubberOne left09:24
← MajorBiscuit left09:24
← wondiws left09:24
→ Null_A joined09:24
← jazzy left09:25
→ MajorBiscuit joined09:26
← MajorBiscuit left09:33
← Null_A left09:34
→ MajorBiscuit joined09:34
→ burakcank joined09:40
← Akiva left09:41
→ Sulky__ joined09:44
→ amcsi joined09:46
← Sulky left09:46
← Sulky_ left09:47
→ Sulky_ joined09:49
→ Null_A joined09:50
→ YuGiOhJCJ joined09:50
← Sulky__ left09:51
← Null_A left09:55
→ unluckyshrubbery joined09:55
→ gevreeen joined09:56
gevreeen I've tried with code.opensuse.org for an empty repo and followed the official guide which does https://bpa.st/RTCQ and yet I'm getting "error: failed to push some refs to 'ssh://git@code.opensuse.org/bbbbb/ttttt.git'" in red, any ideas?09:57
which happens at the last step09:58
which is "git push -u origin master"09:58
→ bilbo joined09:58
gevreeen the paste is directly copied from code.opensuse.org's instruction09:58
osse gevreeen: what's the rest of the error ?09:59
gevreeen "error: failed to push some refs to 'ssh://git@code.opensuse.org/bbbbb/ttttt.git'" in red is all I get from cmdline09:59
osse that's strange10:00
but it seems weird to create a new branch named main, and then try to push a branch named master10:00
gevreeen that's opensuse's instruction, but let's see10:00
"git push -u origin main" seems to be working (still working)10:01
lots of lines, with the last one being "Branch 'main' set up to track remote branch 'main' from 'origin'."10:01
→ vimal joined10:02
gevreeen so I guess political correctness asks folks to s/master/main/10:02
and yet the documention isn't updated accordingly10:02
which is what this is really about10:02
osse If I try to run a BS push command I get two lines: "error: src refspec eargaedrgaedf does not match any" follwoed by the same line as you in red10:04
gevreeen BS?10:06
osse bullshit10:07
I mean I was just trying to reproduce the error you saw10:08
gevreeen just one line for me. probably since I'm running windows10:08
when it was master in place of main10:08
"git version 2.26.2.windows.1"10:09
(the version number sounds like some ancient gnome2)10:09
osse maybe they added that other line later10:09
it's fairly recent. newest is 2.35.110:10
gevreeen the latest is 2.35.1, yes10:11
but my git says 2.26.210:11
osse yes10:12
gevreeen this is from PortableGit-2.26.2-64-bit.7z.exe10:12
right, I have two copies10:12
osse it's just weird you don't see that first line. but whatever, not that interesting10:13
→ lehinsun joined10:13
gevreeen now I have 2.35.110:13
osse since git push -u origin main works it means the error was because you tried to push something that didn't exist10:14
← lehinsun left10:14
gevreeen but how could I force "git push -u origin main" to use ssh?10:15
osse you are already using ssh10:16
← MajorBiscuit left10:16
gevreeen so essentially the ssh comes from the fact I cloned the repo with ssh, no?10:16
osse yes10:16
→ chao joined10:17
osse you can change the URL afterwards, or push to a URL directly10:18
← stenno left10:20
→ MajorBiscuit joined10:21
← olebra left10:25
← YuGiOhJCJ left10:31
chao → stenno10:34
→ YuGiOhJCJ joined10:34
← kaiseisei left10:35
→ jmcb joined10:44
gevreeen and, what's the difference between "git push origin main" and "git push -u origin main"?10:55
manual says "For every branch that is up to date or successfully pushed, add upstream (tracking) reference . . ."10:56
but can you explain this in plain words?10:56
further, is there a way to publish changes without a commit message?10:56
← YuGiOhJCJ left11:03
← adanwan left11:05
→ adanwan joined11:07
← vishal left11:16
→ zeenk joined11:17
← igemnace left11:18
→ vishal joined11:19
osse gevreeen: !remote_tr11:19
gitinfo gevreeen: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branc11:19
osse if you use -u then git will remember that main "tracks" origin/main, and git status will show whether you're ahead or behind etc. automatically11:20
it's a one time thing. it just write something to .git/config11:20
git commit --allow-empty-message11:20
→ bbju joined11:21
→ zer0bitz joined11:22
← Sulky_ left11:24
→ Sulky_ joined11:25
→ roadie joined11:26
→ enoq joined11:29
→ DoubleJ joined11:36
← bbju left11:40
← szkl left11:41
→ geowiesnot joined11:45
← roadie left11:46
→ roadie joined11:49
→ steerpike joined11:50
→ TheCatBe1 joined11:53
← roadie left11:53
← TheCatBehemoth left11:56
→ Sulky joined12:00
→ sh0ne joined12:06
→ Misotauros joined12:07
← sh0ne left12:08
gevreeen so, without -u the remote branch won't be updated?12:14
← jmcb left12:14
gevreeen right. in the sense of a mapping between main and remotes/origin/main12:16
osse gevreeen: it will be updated, but the mapping thingy won't be created12:17
← geowiesnot left12:17
→ donofrio joined12:19
← donofrio left12:19
→ mei joined12:19
→ donofrio joined12:19
→ zer0bitz_ joined12:25
← zer0bitz left12:26
gevreeen (so the mapping thing is only for the benefit of git status?)12:27
→ chao joined12:29
osse gevreeen: it provides a couple of shortcuts:12:31
you can use @{u} and @{upstream} to magically refer to origin/master on the command line12:32
← stenno left12:32
osse 'git push' without any other args will work like 'git push origin master'12:32
similar for pull12:32
probably some other's I forget12:33
gevreeen I supposed the "remote refs" in https://git-scm.com/docs/git-push are just remote branches?12:35
← mei left12:37
→ d[-_-]b joined12:38
← amcsi left12:38
← chao left12:40
gevreeen !refs12:41
gitinfo [!treeish] A tree-ish is something that looks like a tree. Read 'man gitrevisions' and http://git-scm.com/book/en/Git-Tools-Revision-Selection12:41
gevreeen (perhaps there be a dictionary for git terminologies somewhere?012:41
never mind. found https://treehozz.com/what-is-a-git-ref12:42
selckin man gitglossary12:42
gitinfo the gitglossary manpage is available at https://gitirc.eu/gitglossary.html12:42
→ humanface joined12:43
→ zer0bitz joined12:43
← zer0bitz_ left12:44
gevreeen neat. would that it were present on gitirc.eu12:45
← mannequin left12:47
← Misotauros left12:48
gevreeen also, could modern/recent git use a hash other than sha1?12:49
such as sha2-256/sha3/etc?12:49
ikke There is experimental support for sha25612:50
→ pyeveryt_ joined12:51
← mlaogd^ left12:52
gevreeen hmm, but is there a way to convert a repo to sha256?12:52
an empty or nigh-empty repo to be specific12:52
really, I don't mind doing it by hand for a nigh-empty repo12:53
d[-_-]b → stenno12:54
gevreeen found it on https://git-scm.com/docs/git-init12:54
--object-format=<format>12:55
and this line "Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways."12:55
is it really that dangerous?12:55
→ pulse joined12:56
gevreeen for how long has been git offering sha256 object format though12:57
if the date on https://git-scm.com/docs/hash-function-transition/ could be trusted, then it's around for 3-4 years12:59
so I guess this thing is very likely to remain static12:59
but, does using sh256 as the object format require remote server support?12:59
ikke Yes13:00
gevreeen found this > https://lwn.net/Articles/823352/ which was in in 2020, and it's 202213:03
← enoq left13:03
→ roadie joined13:03
selckin weren't you the one using a version released in 2020 earlier13:05
gevreeen that was a mistake which has been corrected13:06
and https://lwn.net/Articles/834674/ says "The final leg of SHA-256 transition"13:07
I guess they didn't fix the docs13:07
(and it wasn't probably updated for ages)13:07
so, let's hope this thing is going to work13:08
← kenanmarasli left13:09
ikke I don't think any of the hosted git solutions support it yet13:10
bremner gitolite does :P13:12
→ rsx joined13:12
gevreeen I'm gonna try this on launchpad and code.opensuse13:12
probably going to work on the latter13:12
if it doesn't work on the former, then I'll probably just ditch launchpad for suse13:13
→ amcsi joined13:16
→ tyson2 joined13:17
→ geowiesnot joined13:21
← The_Blode left13:22
→ ianliu joined13:23
→ bloody joined13:24
ianliu I have a repo that I would like to merge the first 3 commits into a single commit. The first added a very large file to the repo, and the second commit removed that file. Essentially, I would like the third commit to become the new first commit. How can I do this?13:24
→ sh0ne joined13:24
ianliu I've tried to git rebase -i --root and "squash" the first three commits, but this seems to have created an orphan branch with a single commit.13:25
→ evlc joined13:25
→ The_Blode joined13:27
ianliu oh, never mind, I had to squash the second and third commit. The first should stay as "pick"13:27
→ skapata joined13:28
← skapata left13:28
→ skapata joined13:28
← stenno left13:31
← unluckyshrubbery left13:31
← Codaraxis_ left13:31
← sentriz left13:31
← vysn left13:31
← ripdog left13:31
← wolfshappen_ left13:31
← koo5 left13:31
← kapil left13:31
← Oblomov left13:31
← [RiFo] left13:31
← Techcable left13:31
← pulec left13:31
← tehenderz left13:32
→ stenno joined13:32
→ unluckyshrubbery joined13:32
→ Codaraxis_ joined13:32
→ sentriz joined13:32
→ vysn joined13:32
→ ripdog joined13:32
→ wolfshappen_ joined13:32
→ koo5 joined13:32
→ kapil joined13:32
→ Oblomov joined13:32
→ [RiFo] joined13:32
→ Techcable joined13:32
→ lcn joined13:32
→ flupe joined13:32
→ pulec joined13:32
→ swistak joined13:32
→ realies joined13:32
→ R2robot joined13:32
→ shailangsa joined13:32
→ Crispy joined13:32
→ kadobanana joined13:32
→ khronosschoty joined13:32
→ Rondom joined13:32
→ nightstrike joined13:32
→ shored joined13:32
→ Echoz joined13:32
→ auri joined13:32
→ dob1 joined13:32
→ packet_lozenge joined13:32
→ derelict joined13:32
→ jab416171 joined13:32
→ x88x88x joined13:32
→ kristjansson joined13:32
→ qwedfg joined13:32
→ Cork joined13:32
→ cweiss076532 joined13:32
→ voker57 joined13:32
→ gajus joined13:32
→ Manouchehri joined13:32
→ ch joined13:32
→ NiKaN joined13:32
→ quesker joined13:32
→ sunyibo joined13:32
→ elichai2 joined13:32
→ johncs joined13:32
→ rwp joined13:32
→ keypusher joined13:32
→ mooz joined13:32
→ dodo joined13:32
→ MrC joined13:32
→ Malin joined13:32
→ BtbN joined13:32
→ qwd joined13:32
→ makara joined13:32
→ seds joined13:32
→ williewillus joined13:32
→ warthog9 joined13:32
→ MrMagic joined13:32
→ ssiyad joined13:32
→ Albright joined13:32
→ themill joined13:32
→ sangy joined13:32
→ limon joined13:32
→ teear joined13:32
→ euidzero_ joined13:32
→ simon816 joined13:32
→ rewt joined13:32
→ RichiH joined13:32
→ deepy joined13:32
→ jast joined13:32
→ aindilis joined13:32
→ alex88 joined13:32
→ nickel715 joined13:32
→ fcser joined13:32
→ Oddly joined13:32
→ mingdao joined13:32
→ tehenderz joined13:32
← euidzero_ left13:33
← qwd left13:33
← Techcable left13:33
← Malin left13:33
← qwedfg left13:33
← shailangsa left13:33
← dob1 left13:33
← deepy left13:33
← keypusher left13:33
← Codaraxis_ left13:33
← Manouchehri left13:33
← wolfshappen_ left13:33
← ssiyad left13:33
→ ssiyad joined13:33
→ Techcable joined13:33
→ Malin joined13:33
→ wolfshappen joined13:33
→ euidzero joined13:33
→ dob1 joined13:33
→ Codaraxis_ joined13:33
→ keypusher joined13:33
→ Manouchehri joined13:33
→ deepy joined13:34
gevreeen fatal: protocol error: unexpected capabilities^{}13:34
that's on code.opensuse.org, which is gitolite13:34
gevreeen sobs13:34
→ qwd joined13:34
← geowiesnot left13:35
→ qwedfg joined13:35
→ vladoski joined13:36
← NiKaN left13:36
→ NiKaN joined13:38
gevreeen gitolite can't do sha256 this is for sure13:39
everything goes back to normal as soon I gutted object-format back to sha113:39
← feriman left13:41
gevreeen also, do I have to have *both* upstream and origin defined in git-remote?13:42
in particular when the remote end is an empty repository,13:43
I defined both upstream and origin to be the same thing and git push -u origin --all worked, and when I clone the same repo again, git remote -v only shows origin defined13:44
BtbN You can name your remote(s) whatever you like. origin is just the default13:44
gevreeen so essentially I just need origin defined but *not* upstream, right?13:45
mackerman The name doesn't matter, but origin is the default.13:45
← amcsi left13:45
mackerman If they are the same url, probably should only be one remote named.13:45
BtbN If you have another remote, that is the "upstream", i.e. where you forked a github repo from, for example, upstream is a very common name for that13:45
→ Kohe joined13:46
gevreeen https://makandracards.com/kiat_git/24453-create-local-repository-and-push-to-remote uses both "upstream" and "remote" there though13:46
→ feriman joined13:46
gevreeen nvm13:47
BtbN For exactly the scenario I just described13:47
gevreeen I think I got itwrong13:47
ok. let's do it all over again.13:47
→ zer0bitz_ joined13:48
← zer0bitz left13:50
← evlc left13:51
← pyeveryt_ left13:52
→ Null_A joined13:53
→ shailangsa joined13:55
shailangsa does anybody know whether it's possible to track a folder and file outside of the local git repository in windows?13:56
→ tasty joined14:00
← drbeco left14:01
osse gevreeen: if there is only one repo "out there" that you care about then you only need one remote14:05
shailangsa: you mean 'git add ../some/other/path' ? No.14:06
← tasty left14:07
→ tasty joined14:07
← coot left14:07
shailangsa git repository is in C:\xampp\htdocs\here and i also wanted to track C:\xampp\mysql\data\db though?14:08
osse no can do14:09
← Null_A left14:09
shailangsa is it dosable with symlinks?14:09
osse if you keep the actual file(s) in git and symlinks in the other location, yes.14:10
→ coot joined14:11
mackerman Tracking a mysql database seems like a bad idea as it is !binary data14:11
gitinfo Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions14:11
furrymcgee maybe with hardlinks14:12
shailangsa !annex14:12
gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs14:12
mackerman I would use more traditional not-git backups for relational databases.14:12
← masoudd left14:12
→ geowiesnot joined14:13
→ masoudd joined14:13
→ kenanmarasli joined14:13
shailangsa changing the database schema is part of the design process and should be included though14:13
furrymcgee it lloks like htdocs+mysql submodules with xampp superproject14:14
shailangsa when changing specific sub directories within a large code base is it recommend to set up multiple git repositories within the sub directories or set up the git repository in the root directory and ignore all other directories that are not needed?14:17
mackerman Ignore means a git clean can delete them, possibly not what you want.14:18
gevreeen hence, it goes without saying saving binary builds in a git repo is a very bad idea?14:18
mackerman It went with saying; I said it already14:19
→ chao joined14:19
← Xenguy_ left14:19
→ thiago joined14:19
gevreeen I stand corrected14:19
mackerman Multiple repos has the benefit of a large mysql/db not inflating the size of the htdocs repo :)14:20
→ zer0bitz joined14:21
← stenno left14:21
mackerman Database schema can be tracked with SQL scripts that create it alongside your code, not necessary to track all of data.14:21
← zer0bitz_ left14:22
furrymcgee git init . prevents clean14:23
mackerman Of ignored files?14:24
← chao left14:24
→ junktext joined14:24
→ enoq joined14:25
furrymcgee did they ask about files or directories?14:25
→ chao joined14:25
← enoq left14:25
shailangsa files and directories?14:25
← MajorBiscuit left14:26
mackerman gitignore is not for files you want to keep.14:28
→ MajorBiscuit joined14:30
→ vitali64 joined14:30
furrymcgee individual files naybe handled with filters, see man gitattributes14:32
gitinfo the gitattributes manpage is available at https://gitirc.eu/gitattributes.html14:32
furrymcgee you could use this to copy from outside14:33
→ mannequin joined14:34
→ no_gravi1y joined14:36
no_gravi1y Good Afternoon!14:36
← pulse left14:37
selckin the hero has returned14:37
no_gravi1y I wonder how to review a pull request on GitHub. The "Files changed" do not show the diff to *my* repo but to the submitters repo. How do I know what the pull request will change in my repo?14:37
→ Null_A joined14:38
→ cdown joined14:41
selckin not sure thats correct, but not a big github user14:42
ikke no_gravi1y: it shows the differences between the source branch on their fork and the target branch on your repo14:42
← Null_A left14:42
no_gravi1y ikke: Yes. But before I merge it, how do I see a diff to *my* repo?14:43
selckin when you create the pull requests you pick the branch in the other repo, so maybe they picked the wrong branch ?14:47
it should already to be a diff to your repo14:47
is it a public project?14:47
no_gravi1y selckin: https://github.com/no-gravity/web_app_from_scratch/pull/10/files14:48
selckin: For example, this shows "36 - mkdir mysite". But that line does not exist anymore in the repo.14:48
I wonder how I can see a diff of what the PR will actually change.14:48
→ duxsco joined14:50
ikke no_gravi1y: it may be that the source branch is based on an older commit14:53
← zer0bitz left14:54
no_gravi1y ikke: Yes, it is.14:55
I just asked the submitter to rebase. Lets see what happens.14:57
For now, thanks!14:57
→ Thanatermesis joined14:57
selckin yeah thats why i don't know, never do this :)14:58
← no_gravi1y left15:00
shailangsa does anybody know whether it's possible to change gitignore to later include previously ignored files and folders in later commits?15:01
selckin you can force add files that are ignored, tracked files are never ignored15:02
← junktext left15:02
→ junktext joined15:04
← Oblomov left15:08
← cdown left15:09
→ Oblomov joined15:10
→ Null_A joined15:10
← Tangent-Man left15:11
→ dsrt^ joined15:11
→ pulse joined15:11
← Null_A left15:15
→ d[-_-]b joined15:17
← chao left15:19
← coot left15:26
→ zer0bitz joined15:27
→ madewokherd joined15:29
← madewokherd` left15:31
→ luke-jr joined15:32
← sh0ne left15:33
→ zebrag joined15:35
← sudomann left15:46
→ rgrinberg joined15:54
→ sudomann joined15:55
→ aniruddha joined15:56
← humanface left15:59
→ version joined15:59
→ vicfred joined16:00
→ k8yun joined16:00
← d[-_-]b left16:01
→ coot joined16:06
→ crashrep joined16:06
← duxsco left16:08
→ l4s8g_ joined16:16
← zebrag left16:18
→ zebrag joined16:21
→ Null_A joined16:23
→ hseg joined16:28
→ vdamewood joined16:31
← Null_A left16:32
← unluckyshrubbery left16:33
→ unluckyshrubbery joined16:34
← hseg left16:35
→ evlc joined16:35
→ hseg joined16:36
→ travisghansen joined16:36
← sudomann left16:38
→ Null_A joined16:40
← MajorBiscuit left16:42
← rgrinberg left16:42
← evlc left16:43
← Murr left16:43
→ Murr joined16:43
→ jmcb joined16:44
→ MajorBiscuit joined16:44
← jmcb left16:45
→ sudomann joined16:46
→ Yruama joined16:47
→ DoofusCanadensis joined16:47
→ xkuru joined16:47
← hseg left16:48
← feriman left16:53
→ sa0 joined17:03
→ gh34 joined17:03
→ Codaraxis__ joined17:03
→ Rashad joined17:06
← Codaraxis_ left17:07
→ Betal joined17:08
→ zmt00 joined17:10
→ Sulky__ joined17:10
← rsx left17:11
← vysn left17:11
← Strom left17:12
← Sulky_ left17:13
← Sulky left17:13
→ rgrinberg joined17:13
→ Sulky joined17:13
→ Strom joined17:14
← Codaraxis__ left17:14
→ sudoforge joined17:16
← k8yun left17:16
← rgrinberg left17:16
→ m0viefreak joined17:18
steerpike hi17:19
i'm adding binary packages to a git repo, and using lfs to track them17:19
so when a user does a git pull, how do they know where to pull the binaries from?17:20
DoofusCanadensis I believe the lfs destination is recorded in the config file17:21
← Null_A left17:23
← sa0 left17:26
→ sa0 joined17:26
← l4s8g_ left17:28
→ phrix joined17:29
← coot left17:30
→ l4s8g_ joined17:32
→ ChmEarl joined17:32
→ Misotauros joined17:33
→ Akiva joined17:34
steerpike DoofusCanadensis: sorry, is that the .gitattributes file?17:34
← l4s8g_ left17:35
← travisghansen left17:35
steerpike DoofusCanadensis: because it didn't ask me to provide a destination anywhere17:35
→ cdown joined17:35
→ l4s8g joined17:35
← vdamewood left17:37
→ pretty_dumm_guy joined17:38
DoofusCanadensis okay, I'm gonna have to read up on how lfs stores it's information17:38
→ vdamewood joined17:38
→ l4s8g__ joined17:39
→ Null_A joined17:40
← l4s8g left17:40
→ bambanxx joined17:41
steerpike "when you push a file tracked by git lfs it is intercepted and placed on a different server, leaving a pointer in your git repository."17:42
uh.. what different server17:42
does that need to be setup on the server-side?17:42
ikke steerpike: yes, you need an LFS server to store the files17:43
→ emf joined17:43
bookworm that's the whole point of using LFS in the first place17:44
steerpike ikke: ok, so i have a self-managed version of gitlab installed, do i need to configure it to use a separate lfs server for integration?17:44
i'm trying to figure out how it needs to be set up17:44
ikke steerpike: check the gitlab documentation, they have support for lfs17:44
version → stenno17:44
stenno lol17:44
← Null_A left17:45
steerpike i also have an lfs repo i would prefer to use17:45
DoofusCanadensis that's a great question... I have LFS separate from Git and have no idea how I got LFS to use my custom repo17:45
→ l4s8g joined17:46
DoofusCanadensis oh. look in the LFS docs for config options... specifically lfs.url (derived by default from the clone url)17:47
steerpike ah, thanks :)17:47
wait, where is lfs.url17:48
should i create it?17:48
DoofusCanadensis man git-lfs-config17:48
sigh17:49
← l4s8g__ left17:49
DoofusCanadensis !man git-lfs-config17:49
gitinfo The git man pages are available online at https://gitirc.eu/git.html. Or were you looking for the "man git-foo" syntax (without the !)?17:49
← bambanxx left17:49
DoofusCanadensis !man git-lfs17:49
I give17:49
steerpike yeah, i don't have the man page17:49
locally17:49
← l4s8g left17:49
steerpike https://helpmanual.io/man1/git-lfs/17:50
DoofusCanadensis https://github.com/git-lfs/git-lfs/blob/main/docs/man/git-lfs-config.5.ronn17:50
→ mncheck joined17:50
← mncheck left17:50
→ rgrinberg joined17:51
← phrix left17:51
→ l4s8g joined17:52
mfiano How would one create a new repository with the commits re-applied anew from an existing repository limited to a specific sub-path thereof? In other words, how would you unsplit a single "component" of a monorepo, given some path into that repository?17:52
steerpike so .lsconfig should be placed in the git repo? does it need to be staged/committed?17:53
DoofusCanadensis seems wise, steerpike17:53
mfiano: !filter17:53
gitinfo mfiano: [!filters] Filters can be very useful for automatically making changes to files at checkout(smudge) and checkin/add(clean). See 'man gitattributes' for more information17:53
DoofusCanadensis bah17:53
osse mfiano: git filter-branch --subdirectory-filter perhaps17:53
DoofusCanadensis filter-branch is what I meant17:54
mfiano That sounds like one piece to the puzzle of many.17:54
← rgrinberg left17:57
← carl- left17:57
→ ipe joined17:58
→ drbeco joined18:00
→ k8yun joined18:01
← adanwan left18:02
→ adanwan joined18:02
osse how so18:03
← l4s8g left18:04
→ AAGJKE joined18:06
← Akiva left18:10
→ rgrinberg joined18:13
mfiano Well for starters, it assumes the directory path remains constant throughout the history, and doesn't track renames.18:15
and loads of other gotchas iirc18:15
→ Tangent-Man joined18:17
← geowiesnot left18:19
→ duxsco joined18:20
← sudomann left18:20
→ k8yun_ joined18:21
← MajorBiscuit left18:21
← k8yun left18:23
osse hmm18:24
maybe a tree/index filter that deletes everything else in that case18:24
→ junktext_ joined18:26
← Tangent-Man left18:26
→ Tangent-Man joined18:27
→ Gustavo6046 joined18:27
→ coot joined18:27
← junktext left18:27
→ l4s8g joined18:28
← l4s8g left18:29
→ mat001 joined18:29
mfiano Reading the manpage, it recommends an external tool instead (git-filter-repo), which seems to handle things better.18:29
→ l4s8g joined18:30
→ bambanxx joined18:31
← justAstache left18:31
→ sudomann joined18:33
← l4s8g left18:35
← sudomann left18:37
← coot left18:38
← Betal left18:38
→ justAstache joined18:39
→ coot joined18:39
← imMute left18:39
→ imMute joined18:39
← imMute left18:40
→ imMute joined18:40
← vladoski left18:41
← Murr left18:43
→ Murr joined18:43
← masoudd left18:45
← duxsco left18:48
→ duxsco joined18:50
→ sudomann joined18:50
→ Cera joined18:52
→ ThorMojito joined18:55
← sudomann left18:55
→ Codaraxis joined18:55
← crashrep left18:56
→ Codaraxis_ joined18:56
← DoofusCanadensis left18:56
← Codaraxis left19:00
← bambanxx left19:03
→ sudomann joined19:08
← rgrinberg left19:09
→ sig_ joined19:10
sig_ → lungaro19:10
→ jensen joined19:12
lungaro if i'm getteing "fatal: refusing to merge unrelated histories" -- is there no way to fix that? I switched remotes and honestly dont remember if they do share histories19:13
→ rgrinberg joined19:13
→ bambanxx joined19:13
jensen ls-tree's ---full-name does not show absolute path, is this a bug or semantics?19:13
lungaro i could very easily just trash my dotfiles and start fresh, but i'd rather not19:13
imMute lungaro: --allow-unrelated-histories but you should verify that the merge is really what you want to do, it's quite likely that it's not (which is why the default doesn't let you)19:14
← sudomann left19:14
lungaro thanks, i'll try19:14
→ igemnace joined19:14
lungaro doh, it def is not what i want. LOL. NICE19:15
imMute jensen: the tree blob only contains the given directory's path, so that's all it can show. I'm not sure what --full-name is supposed to do because showing the full path from the root of the repo isn't really possible19:16
(one counter example being identical trees in two different locations in the work tree - which path should be shown?)19:16
← ishutin left19:16
→ ishutin joined19:18
→ Null_A joined19:18
imMute ah, I see --full-name is meant to be used with -r19:19
← rgrinberg left19:19
jensen thanks19:20
→ crashrep joined19:23
→ l4s8g_ joined19:24
→ i7c joined19:24
← ishutin left19:25
→ rgrinberg joined19:26
→ ishutin joined19:26
→ sudomann joined19:27
← Null_A left19:28
← tyson2 left19:28
← ishutin left19:28
→ howdoi joined19:29
← l4s8g_ left19:30
→ yagamilito joined19:30
→ ___nick___ joined19:31
→ ishutin joined19:33
← ThorMojito left19:36
→ jazzy joined19:38
→ Null_A joined19:45
→ JanC joined19:45
← bambanxx left19:47
→ bambanxx joined19:48
→ Akiva joined19:49
→ Lord_of_Life_ joined19:51
← crashrep left19:52
← Lord_of_Life left19:52
← Kohe left19:53
← ___nick___ left19:54
Lord_of_Life_ → Lord_of_Life19:54
← coot left19:54
→ ___nick___ joined19:55
← ___nick___ left19:56
← bambanxx left19:57
→ ___nick___ joined19:58
→ bambanxx joined19:59
→ ThePhilgrim joined19:59
← junktext_ left20:02
← ThePhilgrim left20:02
→ ikowasz joined20:02
→ crashrip joined20:02
← Null_A left20:03
→ ThePhilgrim joined20:03
→ junktext_ joined20:03
→ l4s8g joined20:06
→ ThorMojito joined20:06
← ThorMojito left20:07
→ Fubbe joined20:07
← bambanxx left20:07
← Fubbe left20:08
← ThePhilgrim left20:08
→ ThePhilgrim joined20:09
← rgrinberg left20:09
→ Fubbe joined20:09
→ bambanxx joined20:09
← Fubbe left20:10
← ThePhilgrim left20:10
→ ueberall joined20:11
→ Codaraxis joined20:13
→ coot joined20:16
← Codaraxis_ left20:16
← sudomann left20:16
← bilbo left20:21
← ishutin left20:26
← donofrio left20:27
→ donofrio joined20:27
→ ishutin joined20:28
→ sudomann joined20:29
← l4s8g left20:31
← TheCatBe1 left20:31
→ Null_A joined20:33
→ Baphomet joined20:33
← sudomann left20:34
→ Codaraxis_ joined20:34
→ junktext__ joined20:35
← Codaraxis left20:37
← junktext_ left20:37
← Null_A left20:37
→ ThorMojito joined20:39
← aniruddha left20:45
→ sudomann joined20:45
← ThorMojito left20:46
→ tyson2 joined20:48
← sudomann left20:51
← GNUmoon left20:53
→ l4s8g joined20:54
→ sudomann joined20:55
← coot left21:00
→ ThorMojito joined21:00
→ feriman joined21:01
← ___nick___ left21:03
← ThorMojito left21:04
→ Null_A joined21:06
← l4s8g left21:10
→ ThorMojito joined21:13
← vitali64 left21:15
← crashrip left21:18
→ sobkas joined21:19
← mannequin left21:24
← ThorMojito left21:27
← TomyWork left21:27
→ rgrinberg joined21:28
→ TheCatBehemoth joined21:30
→ ash_worksi joined21:30
ash_worksi has anyone seen that futurama episode where Fry is debating between getting leela a swarm of lizards or a parrot (this is going somewhere I promise)?21:31
Leela*21:31
imagine every time he changes his mind (including later when he ultimately fails to ever get Leela the parrot and says, "I'm gonna get you _so many_ lizards), is a commit21:33
you've run through most the episode and now decided that the lizards was probably a better idea. What does your commit message look like?21:34
← pretty_dumm_guy left21:35
→ DoofusCanadensis joined21:37
→ Maxattax97 joined21:37
← R2robot left21:37
→ orbyt joined21:41
← bambanxx left21:50
← Codaraxis_ left21:53
→ crashrep joined21:57
← rwp left21:58
→ pretty_dumm_guy joined21:58
← pretty_dumm_guy left21:58
→ rwp joined22:00
→ pretty_dumm_guy joined22:01
→ Lunatrius` joined22:01
← pretty_dumm_guy left22:01
← kenanmarasli left22:01
→ pretty_dumm_guy joined22:02
→ pulse_ joined22:02
← pulse left22:03
pulse_ → pulse22:03
→ bgs joined22:03
Lunatrius` → Lunatrius22:04
← feriman left22:04
→ R2robot joined22:06
← Null_A left22:07
← otisolsen70 left22:11
← Tangent-Man left22:20
← ipe left22:21
→ Null_A joined22:21
← karabaja4 left22:22
← Akiva left22:23
← skapata left22:24
→ irc_user joined22:24
← zeenk left22:27
→ karabaja4 joined22:29
← ishutin left22:30
← howdoi left22:30
→ AbleBacon joined22:31
→ ishutin joined22:32
← nickel715 left22:33
→ thekingofbandit joined22:33
→ ghost43_ joined22:33
→ Artea joined22:33
→ greyrat joined22:33
→ nickel715 joined22:33
← ueberall left22:34
← ghost43 left22:34
→ ueberall joined22:34
→ geowiesnot joined22:36
← orbyt left22:36
→ bond_ joined22:36
← gh34 left22:38
← Null_A left22:40
← rgrinberg left22:43
← Maxattax97 left22:44
→ ThorMojito joined22:45
← ishutin left22:47
← TonyStone left22:47
← ThorMojito left22:48
→ ishutin joined22:49
← junktext__ left22:52
→ tehenderz_ joined22:56
← tehenderz left22:56
← igemnace left22:56
→ Codaraxis joined22:57
← Thanatermesis left23:00
→ mattf joined23:03
→ pizdets_ joined23:03
← pizdets left23:04
← TheCatBehemoth left23:05
→ TonyStone joined23:05
← geowiesnot left23:05
← nyah left23:09
→ Thanatermesis joined23:13
→ bambanxx joined23:13
← ghost43_ left23:15
→ ghost43 joined23:16
→ euidzero_ joined23:18
← euidzero left23:19
← vicecea left23:19
→ Guest56 joined23:20
→ vicecea joined23:20
← ssiyad left23:21
→ ssiyad joined23:21
→ cvmn joined23:30
← hololeap left23:32
← bambanxx left23:33
→ hololeap joined23:34
→ cation21 joined23:34
cation21 → cation23:38
→ Null_A joined23:43
← Null_A left23:47
→ romesrf joined23:48
← yagamilito left23:48
→ skapata joined23:49
← skapata left23:49
→ skapata joined23:49
→ Xenguy joined23:50
→ ferdna joined23:51
→ rgrinberg joined23:54
→ mven joined23:59

Logs Search ←Prev date Next date→ Channels Documentation