IRCloggy #git 2024-10-18

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.

2024-10-18

← peirik_ left00:00
← twice left00:00
→ twice joined00:00
← gildasio left00:04
→ jaredce joined00:07
→ rainn92675560720 joined00:07
← jaredce left00:11
→ iomari891 joined00:25
→ peirik_ joined00:27
→ pveierland joined00:27
← peirik_ left00:32
→ gildasio joined00:33
← gsi left00:34
→ gsi joined00:36
→ peirik_ joined00:43
← peirik_ left00:48
→ ackyshake joined00:51
← masber left00:55
← ptrck5456 left01:02
→ ptrck5456 joined01:05
→ peirik_ joined01:15
→ ESphynx joined01:16
ESphynx Hi all! I'm trying to use 'git mergetool' with Meld. In my middle file, I see conflicts in red, and the other changes differ from both the left and right side, so I'm a bit confused how one is supposed to use this for resolving conflicts. I'm used to manually resolving conflicts.01:17
→ trafficjam joined01:18
trafficjam is git defaulting to `main` now for new repos?01:18
← peirik_ left01:20
→ Gary_Sinise joined01:20
ESphynx i.e., I don't understand why the middle file does not already have the correct lines for non-conflicting regions01:22
← kurahaupo left01:27
← davispuh left01:33
← puff left01:44
→ peirik_ joined01:45
→ kurahaupo joined01:45
← afdee1c_ left01:47
← peirik_ left01:50
→ James0r joined01:51
→ lucasta joined01:56
← pedahzur left02:05
← FreeBDSM left02:10
← trafficjam left02:10
← lucasta left02:15
→ peirik_ joined02:17
→ ferdna_ joined02:18
← pks left02:18
→ pks joined02:19
← ferdna left02:20
← peirik_ left02:22
← ChmEarl left02:23
← osc4rpt left02:26
→ peirik_ joined02:50
← James0r left02:50
← peirik_ left02:54
← XV8 left02:55
← hdh left02:56
← ferdna_ left02:59
→ James0r joined03:10
← shalok left03:18
→ peirik_ joined03:22
→ tetsuo-cpp joined03:25
← Gary_Sinise left03:26
← peirik_ left03:27
← skapata left03:46
← kurahaupo left04:02
← James0r left04:10
→ James0r joined04:11
← dlh404 left04:15
← monkfish left04:19
← smallville7123 left04:20
→ shalok joined04:21
→ smallville7123 joined04:21
← cpackham left04:23
→ osc4rpt joined04:24
→ peirik_ joined04:26
← peirik_ left04:31
← koo5_ left04:48
→ koo5_ joined04:49
→ YuGiOhJCJ joined04:51
→ ajfriesen167 joined05:05
← ajfriesen16 left05:07
ajfriesen167 → ajfriesen1605:07
← pveierland left05:09
→ kale joined05:11
← James0r left05:12
→ pveierland joined05:13
→ rosco joined05:13
← smallville7123 left05:16
→ smallville7123 joined05:17
← jinsun left05:19
→ jmd joined05:21
← apdg left05:23
← intelfx left05:28
← shalok left05:30
← hbautista_ left05:32
→ intelfx joined05:36
→ happyleaf joined05:40
→ peirik_ joined05:50
→ hwpplayer1 joined05:50
← peirik_ left05:55
← Echoz left05:59
→ Echoz joined06:00
→ happylea` joined06:09
← happyleaf left06:10
→ XV8 joined06:12
← XV8 left06:18
→ duxsco joined06:19
← intelfx left06:22
→ peirik_ joined06:22
← duxsco left06:22
→ duxsco joined06:24
← peirik_ left06:27
← hwpplayer1 left06:31
→ monkfish joined06:34
→ duxsco_ joined06:35
← duxsco left06:37
→ th3voic3 joined06:37
← happylea` left06:40
→ happylea` joined06:41
← monkfish left06:45
→ x_x joined06:46
→ XV8 joined06:46
← thiago left06:48
← rosco left06:48
→ Jck_true joined06:50
→ peirik_ joined06:54
← m1dnight left06:56
→ m1dnight joined06:57
→ rfuentess joined06:58
← peirik_ left07:00
← YuGiOhJCJ left07:00
→ YuGiOhJCJ joined07:00
→ gandhibobandhi__ joined07:02
← PortableDave left07:02
→ PortableDave joined07:03
← happylea` left07:04
→ happylea` joined07:05
→ user_oreloznog joined07:07
→ peirik_ joined07:08
← Echoz left07:15
← ggGuest10 left07:15
→ cronos joined07:19
→ ggGuest10 joined07:20
← PortableDave left07:24
→ Echoz joined07:25
← larryv left07:30
→ john_johnk joined07:31
→ theyneversleep joined07:35
← Lord_of_Life left07:36
→ Lord_of_Life joined07:37
→ rosco joined07:49
← iomari891 left07:50
← XV8 left07:51
← cronos left07:53
→ cronos joined08:00
ch i find myself in places with meh internet more often nowadays, what are good + convenient strategies for making git clone suck less?08:01
→ XV8 joined08:04
← cronos left08:04
selckin git init; git remote add foo; while true; do git fetch; done08:04
→ duxsco joined08:05
mgedmin shallow clones?08:05
ch selckin: hah, fun idea that08:06
ikke Don't store everything and the kitchen sink in git08:06
ch i think the remote is like 25MB08:06
not exactly the kitchen and the sink in there08:07
selckin why are you constantly cloning it08:07
ch i'm not?08:07
selckin then whats the problem08:07
ch the internet has more than one repository08:07
← duxsco_ left08:08
ch anyway, how do i go from a --depth 1 clone to checking out a remote branch that exists? git fetch origin zeha/uf2-reenum in a --depth 1 clone doesn't seem to do enough so that git checkout works08:09
← XV8 left08:10
→ cronos joined08:12
ch git remote set-branches origin '*' && git fetch --depth 1 helps08:30
→ XV8 joined08:31
← ESphynx left08:36
← XV8 left08:36
← happylea` left08:43
← Elodin left08:44
→ happylea` joined08:44
→ mtj joined08:45
← reset left08:46
← gandhibobandhi__ left08:47
→ XV8 joined08:49
obiwahn How do i Rebase history that contains subtrees?08:53
← XV8 left08:55
→ gandhibobandhi__ joined08:57
→ jaredce joined09:05
→ XV8 joined09:08
← jaredce left09:10
← happylea` left09:15
→ happylea` joined09:16
← Flow left09:24
→ PortableDave joined09:27
→ crossby1004 joined09:30
→ Flow joined09:38
← rosco left09:46
← YuGiOhJCJ left09:48
← mkosmo26750 left09:49
→ mkosmo26750 joined09:49
← michele left09:53
→ Elodin joined09:57
→ michele joined09:59
→ sgm joined10:12
← leah2 left10:12
→ theoceaniscool joined10:17
← john_johnk left10:18
← fstd left10:22
→ fstd joined10:22
→ becm joined10:23
→ ___nick___ joined10:32
← ___nick___ left10:33
→ ___nick___ joined10:35
→ celmor joined10:40
→ leah2 joined10:45
← pveierland left10:47
← leah2 left10:50
→ pveierland joined10:57
← sgm left10:59
→ alexherbo2 joined11:03
→ sgm joined11:03
→ leah2 joined11:05
→ dlh404 joined11:07
→ john_johnk joined11:15
← robobub left11:16
→ makarov_the_grea joined11:18
← Flow left11:18
← wolf left11:21
→ wolf joined11:21
→ hwpplayer1 joined11:27
→ rosco joined11:33
→ Flow joined11:35
← fandre1986 left11:46
← PortableDave left11:52
← JanC left11:59
→ JanC joined11:59
← peirik_ left12:11
→ XV9 joined12:17
← alexherbo2 left12:18
→ alexherbo2 joined12:18
→ duxsco_ joined12:20
← XV8 left12:20
← duxsco left12:23
← hwpplayer1 left12:23
→ jaredce joined12:24
← theoceaniscool left12:25
→ hwpplayer1 joined12:28
← celmor left12:28
← jaredce left12:29
← jmd left12:32
→ jmd` joined12:32
← alexherbo2 left12:33
→ alexherbo2 joined12:34
← alexherbo2 left12:38
← duxsco_ left12:41
← frobnic left12:42
→ duxsco joined12:42
← hwpplayer1 left12:44
→ alexherbo2 joined12:48
← john_johnk left12:52
← Flow left12:53
→ gareppa joined12:55
→ peirik_ joined12:55
lockywolf How do I rebase the first commit?13:05
→ Flow joined13:05
selckin --root13:05
← peirik_ left13:06
→ gandhibobandhi_ joined13:07
← kale left13:07
← theyneversleep left13:07
lockywolf selckin: thank you!13:09
← gandhibobandhi__ left13:10
→ afdee1c_ joined13:11
→ frobnic joined13:12
→ jensen1 joined13:16
← frobnic left13:19
→ frobnic joined13:19
← alexherbo2 left13:21
→ peirik_ joined13:24
lockywolf hm... I might be asking for something strange, but is it possible to add a project itself as a submodule?13:26
a different branch, of course13:26
I am trying to do `git submodule add -b attic -- ./.git ./resources/`13:27
but the system says "fatal: transport 'file' not allowed"13:27
→ alex__c joined13:28
← becm left13:29
→ becm joined13:29
← nopjmp left13:29
selckin maybe you want a worktree13:30
← peirik_ left13:30
→ nopjmp joined13:30
→ skapata joined13:30
← Flow left13:30
→ spare joined13:30
← memset left13:31
→ Flow joined13:32
→ memset joined13:32
lockywolf I used worktree once13:34
but for an opposite thing13:34
I had two branches checked-out side-by-side13:34
→ pick joined13:35
lockywolf the thing is that on most machines I don't need the contents of ./resources/13:35
selckin submodules are really annoying if they arent global13:36
← pickanick left13:37
← pick left13:38
→ peirik_ joined13:38
→ pick joined13:38
← memset left13:40
→ memset joined13:41
→ otisolsen70 joined13:41
← otisolsen70 left13:42
← peirik_ left13:43
→ otisolsen70 joined13:43
→ phryk joined13:44
→ Left_Turn joined13:47
→ shalok joined13:48
← gildasio left13:49
→ gildasio joined13:50
← pveierland left13:51
→ hbautista_ joined13:53
→ duxsco_ joined13:54
→ kale joined13:56
→ krishna joined13:56
← duxsco left13:57
→ Turn_Left joined13:58
krishna → Herz13:58
← happylea` left13:59
← Left_Turn left14:01
→ peirik_ joined14:03
lockywolf git -c protocol.file.allow=always submodule add --force -b attic -- ./ ./resources/14:04
works as expected14:04
← Betal left14:05
→ pveierland joined14:06
← peirik_ left14:08
→ davispuh joined14:08
→ hwpplayer1 joined14:12
← becm left14:13
→ becm1 joined14:13
becm1 → becm14:15
← duxsco_ left14:18
→ ChmEarl joined14:20
← skered left14:23
→ skered joined14:25
← Herz left14:26
→ Left_Turn joined14:34
→ peirik_ joined14:35
← Turn_Left left14:36
← peirik_ left14:40
← dsimic left14:41
→ alexherbo2 joined14:42
→ dsimic joined14:43
← becm left14:43
→ becm joined14:44
→ rsx joined14:49
→ peirik_ joined15:03
← LinearArray left15:07
→ LinearArray joined15:07
← Elodin left15:07
← peirik_ left15:08
→ thiago joined15:11
← rsx left15:13
→ Betal joined15:13
→ Turn_Left joined15:20
← rfuentess left15:22
← memset left15:23
→ memset joined15:24
← Left_Turn left15:24
← alexherbo2 left15:25
→ Left_Turn joined15:26
← pveierland left15:28
→ DPA joined15:28
← Turn_Left left15:30
→ lucasta joined15:31
← memset left15:32
→ memset joined15:33
← rosco left15:34
→ peirik_ joined15:34
→ john_johnk joined15:37
→ Guest2 joined15:39
← peirik_ left15:39
← Guest2 left15:41
→ Guest2 joined15:43
→ aiyunyuner45 joined15:45
← aiyunyuner4 left15:47
aiyunyuner45 → aiyunyuner415:47
← XV9 left15:47
← john_johnk left15:48
→ aiyunyuner48 joined15:51
← aiyunyuner4 left15:53
aiyunyuner48 → aiyunyuner415:53
→ XV8 joined16:00
← x_x left16:03
→ bambams joined16:03
→ alexherbo2 joined16:04
← XV8 left16:06
← becm left16:09
→ becm joined16:09
→ x_x joined16:12
← Guest2 left16:13
← alex__c left16:13
→ Minvera joined16:15
← becm left16:17
← bambams left16:21
← saavedro left16:22
wallbroken does .gitignore affects when cloning the repository?16:25
selckin no16:26
wallbroken this means that when cloning the repository, all the files included in .gitignore have been downloaded?16:28
gnoo all the files that have been added and comitted16:29
osse wallbroken: The files included in the repo itself are downloaded. gitignore does not affect cloning in any way16:29
wallbroken ok, i'm going to explain what is my goal16:30
my project have some sample file16:30
IE: settings.py.sample16:30
the user, after cloning the, needs to edit the file and rename setting.py16:30
i don't want neither settings.py nor settings.sample.py have to be considered in the commit/push16:31
because they contains personal local configuration16:31
is it clear what my need is?16:31
gnoo don't have personal local configuration on settings.sample.py16:32
osse wallbroken: yes. Put settings.py in .gitignore. The sample is already a part of the repo and cannot be ignored16:32
wallbroken ok but when you rename sample, the file is seen as a new file16:33
gnoo i'd also suggest renaming it to settings.py.sample to discourage making changes on that file16:33
→ XV8 joined16:33
wallbroken and git considers it in the commit push16:33
→ cdown joined16:33
gnoo not if you have settings.py in the .gitignore. copy settings.py.sample instead of renaming it16:33
wallbroken the only way is to copy the file and not just rename it16:33
osse wallbroken: in that case something is wrong with your .gitignore16:33
it should not be seen as a new file16:34
(the old one will be seen as deleted, yes. no way around that)16:34
wallbroken yed16:34
git is asking me to delete it from the repository16:34
gsish git is most probably not doing that16:35
osse copy the sample instead of deleting it16:36
gnoo if you've already renamed it, do git restore settings.sample.py16:37
← otisolsen70 left16:38
← XV8 left16:40
wallbroken ok16:43
thank you16:43
← lucasta left16:49
→ memset_ joined16:54
← memset left16:58
← specing left17:00
← hbautista_ left17:01
→ specing joined17:02
→ hdh joined17:03
→ James0r joined17:03
→ XV8 joined17:09
→ alex__c joined17:11
→ intelfx joined17:14
← alex__c left17:20
→ jinsun joined17:20
→ BolzmannPain joined17:22
← BolzmannPain left17:23
→ BolzmannPain2 joined17:23
← afdee1c_ left17:33
→ Elliria joined17:34
← smallville7123 left17:40
→ smallville7123 joined17:40
← pick left17:41
→ pickanick joined17:41
→ XV8|MBP16in joined17:44
→ YuGiOhJCJ joined17:44
← memset_ left17:47
→ memset joined17:48
← navi left17:53
← ztrawhcse left17:53
→ navi joined17:53
→ ztrawhcse joined17:53
← n-st left17:54
→ n-st joined17:54
← supernovah left17:55
→ supernovah joined17:56
→ gandhibobandhi__ joined17:59
← gandhibobandhi_ left18:01
→ BolzmannPain13 joined18:01
← alexherbo2 left18:02
← skapata left18:03
→ skapata joined18:04
← BolzmannPain2 left18:04
← jinsun left18:07
→ npcomp joined18:08
← sgm left18:09
← P1ro left18:09
← gandhibobandhi__ left18:11
→ FreeBDSM joined18:12
← CrunchyFlakes left18:14
→ P1ro joined18:16
← rainn92675560720 left18:17
→ CrunchyFlakes joined18:17
← XV8 left18:19
← spare left18:20
← XV8|MBP16in left18:21
← cdown left18:22
→ rainn92675560720 joined18:32
← memset left18:33
→ memset joined18:33
← defec7ed left18:35
→ defec7ed joined18:37
→ XV8 joined18:39
XV8 → XV8|MBP14in18:45
← kale left18:58
← BolzmannPain13 left19:02
← James0r left19:07
← makarov_the_grea left19:08
→ larryv joined19:10
→ aiyunyuner44 joined19:11
→ BolzmannPain2 joined19:12
→ makarov joined19:12
← aiyunyuner4 left19:12
aiyunyuner44 → aiyunyuner419:12
← makarov left19:17
→ peirik_ joined19:20
← peirik_ left19:25
← lembron left19:26
← skered left19:30
→ skered joined19:31
← crabbedhaloablut left19:34
→ crabbedhaloablut joined19:36
← Elliria left19:42
→ skyl4rk joined19:42
← Noisytoot left19:43
← jmd` left19:45
→ Noisytoot joined19:52
→ peirik_ joined19:53
← peirik_ left19:57
← ___nick___ left20:04
← Vonter left20:05
→ Vonter joined20:07
→ pedahzur joined20:10
← BolzmannPain2 left20:15
→ m0viefreak joined20:18
→ peirik_ joined20:25
← DPA left20:26
← shalok left20:26
← brw9 left20:29
→ epicout joined20:30
→ brw9 joined20:30
← peirik_ left20:30
→ puff joined20:34
→ ferdna joined20:35
→ DPA joined20:42
← thiago left20:48
→ thiago joined20:48
← t3ch left20:49
← crossby1004 left20:56
→ peirik_ joined20:57
← peirik_ left21:02
→ peirik_ joined21:06
← phryk left21:10
← peirik_ left21:11
→ phryk joined21:11
selckin is there a way to see or remove object/pack files left behind from failed repacks/gc21:11
without running gc, since not enough disk space21:11
← gareppa left21:13
← thiago left21:16
selckin nevermind i'll just fix that21:18
→ peirik_ joined21:20
← hwpplayer1 left21:22
→ fury_ joined21:24
→ aunk05 joined21:25
← aunk05 left21:25
← user_oreloznog left21:27
→ Guest55 joined21:27
fury_ I'm working with Jenkins on something with git. inside a bash script ran by Jenkins, I need to get the currently checked out branch name from git. Normally, "git branch --show-current" works. In this case, it doesn't, for some reason. Jenkins checks the branch out as 'git checkout -f <commit hash>' after doing a few things to figure out the most recent commit hash. is there any way I can get git21:27
to tell me which branch that is (ie. something more reliable than git branch --show-current)?21:27
→ seanh1 joined21:28
selckin git rev-parse --symbolic-full-name --abbrev-ref HEAD21:29
maybe21:29
seanh1 → seanh21:29
Guest55 Hi, everybody, I'm trying to use git sparse-checkout and I'm having trouble configuring it. I want to sparse-checkout the following: all files in the main repo folder; only one of its subfolders, along with all of that folder's contents (files and folders). So far I've been unable to achieve this. Is there a way to achieve this? If so, could21:30
someone help? Sorry if this is a horribly basic question.21:30
fury_ selckin: that just gets me "HEAD"21:30
← Betal left21:30
selckin then you need like what git branch --contains HEAD returns, someone else will know21:31
b0nn git status -unormal, then fish out the "On branch" string21:34
← Guest55 left21:34
→ Betal joined21:34
fury_ I see, this is a "detached" head21:34
selckin when i had that problem i changed jenkins to actually checkout the branch and not the commit21:35
fury_ I'm sure Jenkins is outside the scope of this channel, but this is a multibranch pipeline, I don't see a way to do that21:36
selckin was like 10 years ago, don't remember how, but it gave a lot of problems with tools that made tags & stuff for releases too21:37
fury_ well since I now know it's just a detached head, I could 'git checkout <branch>'21:38
→ peirik__ joined21:38
← peirik_ left21:40
← Minvera left21:43
← peirik__ left21:43
fury_ well, yeah, I'm just going to do that. I just need to go commit about a dozen Jenkinsfile instances across a few branches, which is annoying, but whatever. it works21:44
if you're curions, `sh "git checkout $env.BRANCH_NAME"` in a Jenkinsfile will cure most of your headaches21:44
← cmc left21:50
→ cmc joined21:51
→ peirik_ joined21:55
← cmc left21:57
→ cmc joined21:57
← cmc left21:59
← peirik_ left21:59
→ cmc joined21:59
puff Evening, what is the preferred way to install git on a mac?22:01
selckin https://git-scm.com/downloads/mac22:02
puff Thanks.22:03
So not brew or somesuch?22:04
R2robot just use brew if you have it22:04
puff Ah, I see that page explains how to use brew.22:04
R2robot :D22:05
puff Which one is generally considered best/easiest/most reliable, Brew, macports, etc?22:05
R2robot brew22:05
puff I find Mac (or really Apple) often does things in counterintuitive ways.22:06
R2robot brew is not part of apple.. but that's another topic22:06
the official git page shows brew, not any others. So there's that.22:07
puff Ah, okay, thanks.22:07
selckin the 'mac' way is probably a gui like github desktop22:08
brew is very popular22:08
→ thiago joined22:14
puff Thanks.22:14
Hm, Brew's installer says it's downloading command line tools for xcode, but it's been a while. It's not giving me any progress indicator, is that normal and it's still downloading, or is it hung?22:22
→ peirik_ joined22:23
puff Ah, it printed that ine again, and then it said it's installing command line tools for xcode.22:26
← peirik_ left22:28
← skered left22:29
← romibi left22:29
→ skered joined22:29
← th3voic3 left22:37
→ th3voic3 joined22:38
← epicout left22:39
→ romibi joined22:42
← Left_Turn left22:55
→ shalok joined23:02
puff man, "brew install git" got to the line: Installing git dependenc: cmake\n==> ./bootstrap --prefix=/usr/local/cellar/cmake/3.30.5 --no-system-libs --parallel=423:03
← x_x left23:03
puff and it seems to be just stuck there.23:03
selckin #brew23:04
puff Okay, thanks.23:04
Er what? There's no #brew channel.23:05
R2robot any of the mac channels23:05
puff Ok23:06
R2robot ##apple, #macosx23:06
→ ferdna_ joined23:15
→ arahael_ joined23:16
← ferdna left23:18
← arahael left23:19
arahael_ → arahael23:19
→ vrach joined23:19
→ peirik_ joined23:24
lrvick I would remind you that brew does not sign packages, so you are trusting anyone capable of phishing one of 500+ people with brew access, with access to execute any code they want on your computer.23:24
R2robot ~10 years, no issues so far for me23:24
lrvick Most don't use hardware 2FA or even commit signing.23:24
That is survivors bias talking. You are talking to someone that does supply chain attacks like this on my clients for a living. It is easy, and attacks in the wild went up 152% this year. Blackhats are starting to figure out just how easy it is.23:25
→ crossby1004 joined23:26
R2robot And that is your bias speaking...23:26
lrvick Often it is as easy as finding a brew maintainer whose personal email domain expired this week and buying the domain, so you can reset their github password and push a commit as them.23:26
R2robot and off topic23:26
lrvick Just advising against people installing git via known dangerous non-reproducible and unsigned methods.23:26
that advice will burn everyone eventually23:27
R2robot ...23:27
← memset left23:28
← peirik_ left23:29
→ memset joined23:29
→ thomasross joined23:30
← thomasross left23:32
SuperLag puff: #machomebrew23:34
Is my understanding of how to set up a pre-commit hook correct? Set up your hook actions in bash format in $REPO/.git/hooks/pre-commit and then mark it +x?23:35
→ thomasross joined23:35
larryv a hook can be any sort of executable. don't have to be a shell script23:36
*doesn't23:36
← simon8162 left23:39
← Vonter left23:40
← crossby1004 left23:40
→ simon816 joined23:40
SuperLag larryv: does the file have to be named "pre-commit"?23:42
→ masber joined23:42
larryv yes23:42
(even if you do symlink shenanigans like i do, the link still has to be called "pre-commit")23:44
← P1ro left23:45
← XV8|MBP14in left23:45
→ pveierland joined23:59
← masber left23:59

Logs Search ←Prev date Next date→ Channels Documentation