IRCloggy #git 2023-01-05

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.

2023-01-05

← chexum left00:00
→ terminalpusher joined00:00
→ chexum joined00:01
→ dvopgy joined00:01
twb I thought best practice for submodules was "don't"?00:03
→ bn_work joined00:04
→ koolazer joined00:05
← dvopgy left00:06
zebrag[m] git difftool --tool=kdiff3 -y XXX:file1 YYY:file2, oddly enough kdiff3 open the expected files, but the names it is showing are both file1.00:08
twb might be a kdiff bug?00:09
does e.g. meld exhibit same problem?00:10
← jacobk left00:12
← ferdna left00:13
→ hexadecagram joined00:13
zebrag[m] twb: I don't have it installed at the moment (meld) and it's pulling lots of dependencies00:14
but I think the names are those given by git difftool to kdiff300:15
twb I don't remember; you'll have to RTFS00:16
But that seems reasonable00:16
← XV8 left00:17
zebrag[m] yes it does00:18
Kangie_ → Kangie00:18
→ dvopgy joined00:18
→ Murr- joined00:19
← Murr left00:20
Murr- → Murr00:20
← serapath left00:22
← dvopgy left00:23
→ EdFletcher joined00:24
→ Xardas joined00:25
→ defjam joined00:26
← nyah left00:31
← epony left00:31
← defjam left00:32
→ dvopgy joined00:35
← giu- left00:37
← dvopgy left00:40
← bgs left00:42
← theoceaniscool left00:44
→ lmelmtdwrs^ joined00:44
← lmelmtdwrs^ left00:44
← duxsco left00:47
→ KaitoDaumoto joined00:51
→ dvopgy joined00:51
warthog19 → warthog900:51
← thebombzen left00:52
← momomo left00:54
→ bywaterloo joined00:55
← dvopgy left00:56
→ momomo joined01:00
→ defjam joined01:02
→ Arokh joined01:02
← defjam left01:06
→ dvopgy joined01:07
← terminalpusher left01:09
← dvopgy left01:12
← EdFletcher left01:15
← Xardas left01:16
→ EdFletcher joined01:17
→ blahboybaz joined01:18
← gas51627_ left01:20
→ dvopgy joined01:25
← chemsmith left01:27
← bkircher left01:29
→ bkircher joined01:30
← dvopgy left01:30
→ gast0n joined01:30
← structoha left01:31
→ structoha joined01:31
→ arescorpio joined01:34
← lucasta left01:35
→ Xardas joined01:36
→ defjam joined01:37
← tirnanog left01:39
← defjam left01:42
→ dvopgy joined01:42
← Murr left01:45
→ Murr joined01:46
← dvopgy left01:47
→ alt-romes joined01:48
← arescorpio left01:49
← romesrf left01:50
→ lucasta joined01:52
← alt-romes left01:53
KillerWasp hello. i still can't clone the repository from bitbucket. i activate pipeline and add ssh keys, what more i need here?01:57
→ chemsmith joined01:57
→ dvopgy joined01:58
→ BlessJah joined01:59
← Michaela left02:03
← dvopgy left02:03
← dermoth left02:05
cbreak you don't need pipeline02:06
you need to have access rights as user, and your user must have the ssh public key associated with it, if you use ssh02:07
→ defjam joined02:10
← rgrinberg left02:10
← GNUmoon left02:11
→ GNUmoon joined02:12
← rama left02:13
← llh left02:14
← chemsmith left02:15
← defjam left02:15
KillerWasp cbreak: what?? you can't use ssh keys without pipeline!02:16
→ dvopgy joined02:16
← hyperair left02:17
KillerWasp and what keys i must use/generate and where put/copy/paste?02:17
cbreak of course I can02:17
pipelines have nothing to do with git02:17
they are some CI stuff02:18
you obviously need to have an ssh private key to log in with ssh anywhere that uses public key authentication02:18
the server needs to have your public key02:18
add that public key somewhere in your account / user settings02:18
→ alt-romes joined02:19
→ Michaela joined02:19
→ hyperair joined02:20
KillerWasp cbreak: only have a option of ssh key, and need the pipeline, are in the options of pipeline and you can't use it without pipeline02:20
cbreak no02:20
KillerWasp no what?02:21
cbreak you do not need pipelines.02:21
to clone a repository, you only need a git server02:21
you do NOT need CI02:21
KillerWasp cbreak: please, stop trolling.02:21
← dvopgy left02:21
← Yruama left02:21
→ dsrt^ joined02:22
KillerWasp you can't connect anymore with git, give problem ofg c02:22
of credentials02:22
← clemahieu left02:24
→ dermoth joined02:24
KillerWasp cbreak: ok, maybe not trolling, but you need check it for update your knowledge02:25
cbreak KillerWasp: no.02:26
get a clue before you blabber nonsense, honestly02:26
Follow https://support.atlassian.com/bitbucket-cloud/docs/configure-ssh-and-two-step-verification/02:26
then follow https://support.atlassian.com/bitbucket-cloud/docs/set-up-personal-ssh-keys-on-macos/ (or what ever variant)02:27
in particular, read the section titled "Provide Bitbucket Cloud with your public key"02:27
do that.02:27
obviously, none of this has anything to do with pipelines, since pipelines are not required for anything git does.02:27
→ chemsmith joined02:28
EdFletcher cbreak is 100% correct. If there’s a troll in this exchange, it isn’t them.02:28
← alt-romes left02:28
KillerWasp cbreak: lol, that don't work. ssh key need pipeline and dont work any keys inside. the doc i already reading and it's very old02:28
cbreak KillerWasp: nonsense.02:29
← MiguelX413 left02:31
← kkawg left02:32
→ dvopgy joined02:32
→ thiago joined02:33
→ MiguelX413 joined02:34
← dvopgy left02:37
← chemsmith left02:39
→ epony joined02:39
→ gsi_ joined02:43
← cyberpear left02:43
dimi1947 I have a branch w no commits but w some files modified...if I merge into main will these changes be reflected to main or not?02:45
← gsi left02:45
→ transhumanist_ joined02:45
← lucasta left02:45
cbreak dimi1947: merging only considers history (commits)02:46
KillerWasp cbreak: "no" "no what?" "you don't need pipelines", with breaking two line single information you really look like a trool. you think that avoid share guide or clue you can make a good way for the user?....02:46
cbreak modified files are not part of git history, only committed state is02:46
→ defjam joined02:47
dimi1947 chreak: so...if I merge the files in main will preserve their state02:47
cbreak KillerWasp: I told you several times what you have to do02:47
if you don't like getting your questions answered, you're free to leave.02:47
→ alt-romes joined02:47
dimi1947 thanks02:47
cbreak dimi1947: unless you commit them, their content will not change02:48
KillerWasp more easy is saying: "shut up!! stupid dumb sheep!! try hard find your fix and stop annoying here!!"02:48
dimi1947 got it02:48
← m0viefreak left02:48
cbreak if the other branch has different state, the merge will fail since you have those uncommitted changes02:48
KillerWasp cbreak: you only say that don't need pipeline, that's all.02:48
cbreak no.02:48
I told you to associate the key with your user02:48
← moldorcoder7 left02:49
cbreak in your account settings02:49
even gave you a very detailed documentation that describes it02:49
were you unable to follow the instructions?02:49
KillerWasp cbreak: which make more confusion, what user? more up in the settings have the permision list of users, which you mentioned02:50
→ dvopgy joined02:50
cbreak your user...02:50
obviously...02:50
the one you want to clone with...02:50
honestly, go to the link I gave you02:51
then go to the section I already pointed you to02:51
read it02:51
then follow it02:51
KillerWasp not for me. i have bitbucket for years and just now i found the "user" option.02:51
← defjam left02:51
KillerWasp like, really exist??02:51
cbreak you didn't know you had a user account?02:52
← alt-romes left02:52
→ chemsmith joined02:52
→ lucasta joined02:52
KillerWasp cbreak: yes, but i always use the options in the left, no the hidden option in the tiny icon in the right-top02:53
cbreak those are not relevant here, beyond adding your user to the access list.02:53
they are repository options02:53
ssh is NOT a repository option02:53
KillerWasp but i guesss that ssh is a protocol that git use for upload/download files02:54
cbreak yes02:54
it is.02:54
← dvopgy left02:55
KillerWasp well02:55
cbreak it's also used for authentication, when ever you use it for uploading / downloading02:55
KillerWasp ok. then https don't work anymore, only ssh02:56
cbreak it works, but not in the same way02:57
people finally realized that passwords are crap02:57
(when chosen by humans)02:57
so you have to create an application key for it.02:57
(because 2fa doesn't work there)02:57
KillerWasp yes, make a pair of keys is more easy02:58
← dtux left02:59
KillerWasp i don't know about of security, havea own group of problems. but now i must change all https to ssh remotes.02:59
i guess have a ***02:59
cbreak yes. Or create an application password.02:59
if bb supports that02:59
using ssh is the better option...02:59
KillerWasp well, thanks by the help. i finally upload all the files. :)03:01
→ finn_elija joined03:02
← FinnElija left03:02
finn_elija → FinnElija03:02
→ dvopgy joined03:07
← dvopgy left03:11
→ structoha1 joined03:14
← structoha left03:17
→ thebombzen joined03:19
→ defjam joined03:19
→ ikwyl6 joined03:24
→ dvopgy joined03:24
← defjam left03:24
← gast0n left03:24
← Sulky left03:26
← dvopgy left03:29
← dansan left03:33
← lucasta left03:34
→ jacobk joined03:35
← structoha1 left03:36
← ikwyl6 left03:39
← keypusher left03:40
← xx left03:41
→ ikwyl6 joined03:41
→ dvopgy joined03:42
← Xardas left03:44
→ lucasta joined03:44
← Murr left03:45
→ Murr joined03:46
← dvopgy left03:47
→ defjam joined03:54
← defjam left03:58
→ dvopgy joined03:59
→ raindrop777 joined04:02
← dvopgy left04:05
→ blackhawk joined04:07
← blackhawk left04:07
→ blackhawk joined04:07
blackhawk → stolen04:07
→ n0where joined04:10
→ dansan joined04:11
→ agowa joined04:11
→ b4udv8 joined04:12
← bywaterloo left04:12
← b4udv8 left04:13
→ rama joined04:13
← rama left04:14
← agowa338 left04:15
→ dvopgy joined04:16
→ xx joined04:19
← dvopgy left04:21
→ small joined04:23
→ defjam joined04:28
← n0where left04:28
← defjam left04:33
→ powftw joined04:33
← stolen left04:33
→ structoha1 joined04:34
← roo- left04:34
→ roo- joined04:34
→ defjam joined04:34
→ dvopgy joined04:35
← lucasta left04:35
← structoha1 left04:39
← dvopgy left04:40
← Cleverness left04:40
→ crawfish joined04:41
→ rgrinberg joined04:42
← transhumanist_ left04:42
← crawfish left04:43
→ lucasta joined04:44
← MiguelX413 left04:48
← Betal left04:50
→ dvopgy joined04:50
← thiago left04:52
→ blackhawk joined04:52
→ MiguelX413 joined04:54
← dvopgy left04:56
← ChmEarl left05:02
→ dtux joined05:03
→ rustyshackleford joined05:05
← momomo left05:08
→ white_shadow joined05:08
white_shadow Hi05:09
← warthog9 left05:09
→ dvopgy joined05:09
white_shadow After commmiting the code our android build is failing, it is giving error "Not enough room for 100 in BUILD width=2"05:10
What does it mean?05:10
but when we are not commiting, it is able to create the build05:11
← rgrinberg left05:11
← dvopgy left05:12
→ dvopgy joined05:12
→ momomo joined05:14
← dvopgy left05:17
← lucasta left05:21
← farzat left05:25
→ warthog19 joined05:28
→ lucasta joined05:28
→ dvopgy joined05:28
← white_shadow left05:33
← dvopgy left05:33
warthog19 → warthog905:34
→ white_shadow joined05:34
← lucasta left05:37
→ Xardas joined05:43
← white_shadow left05:44
← Murr left05:45
→ Murr joined05:46
→ dvopgy joined05:46
← blackhawk left05:46
← dvopgy left05:51
→ lucasta joined05:52
← lucasta left05:55
← vdamewood left05:55
→ vdamewood joined05:56
→ alt-romes joined05:56
→ dvopgy joined06:02
→ madewokherd` joined06:02
→ blackhawk joined06:04
← alt-romes left06:04
← madewokherd left06:05
→ lucasta joined06:05
→ farzat joined06:06
→ srinidhi joined06:06
← dvopgy left06:06
← lucasta left06:10
← defjam left06:10
→ defjam joined06:11
→ lucasta joined06:12
→ hrberg joined06:13
← lucasta left06:17
→ lucasta joined06:20
→ dvopgy joined06:20
→ c0dehu1k joined06:21
← lucasta left06:24
← dvopgy left06:25
→ arrayboltXE joined06:28
→ lucasta joined06:28
arrayboltXE Quick question from a semi-newbie. I know git bisect can find a regression between two arbitrary commits. However, assuming I don't switch the meanings of "bad" and "good" for the sake of avoiding confusion, can it find an accidental bug fix between two commits? Like if I do "git checkout <commit deep in the guts of the project>", "git bisect start", "git bisect good", "git checkout master", "git06:29
bisect good master", will that work?06:29
I'm facing the interesting case in which a bug that caused a particular crash magically vanished somewhere in the development cycle and no one has any idea what changed to fix the bug. The project has earlier LTS releases that still have the bug, so knowing what fixed it is valuable so that the fix can be backported.06:30
ikke arrayboltXE: you can use it to track any transition to history having a property and history not having one06:32
arrayboltXE And that will work even if the "bad" commit is in the guts of the tree and the "good" commit at the head, rather than the usual other way around? Just double-checking so that I don't give myself a worse headache :P06:33
ikke with the default terms, git expects history starting good and going bad06:33
← epony left06:34
ikke ie, what commit introduced a bug06:34
arrayboltXE Hmm. So I might have to use "git bisect good" to mark the commit deep in the history that's actually bad, and "git bisect bad" to mark the later commit that's actually good?06:34
← lucasta left06:34
ikke yes06:35
that's why git bisect allows you to specify alternate terms06:35
arrayboltXE OK. I'll look up how to do that so I don't make a mistake. Thanks for your time and help!06:35
← xx left06:37
→ dvopgy joined06:37
ikke 'git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] ..'06:37
→ xx joined06:37
← igemnace left06:38
← dimi1947 left06:39
→ igemnace joined06:40
→ lucasta joined06:40
← dtux left06:41
← dvopgy left06:41
→ zeroes_ joined06:42
← lucasta left06:44
→ bgs joined06:44
← zeroes left06:46
→ lucasta joined06:46
arrayboltXE ikke: Thanks, got it set up with --term-old broken --term-new fixed... and now I'm realizing I probably forgot the = signs :D This is what I get for coding past midnight. Anyway, thanks again for your help.06:47
→ dvopgy joined06:47
ikke they are optional06:47
← raindrop777 left06:48
→ otisolsen70 joined06:49
arrayboltXE Ah, good.06:49
→ alt-romes joined06:50
← otisolsen70 left06:51
→ otisolsen70 joined06:52
← alt-romes left06:55
← dvopgy left07:03
→ epony joined07:03
→ maret joined07:08
← otisolsen70 left07:11
← Xardas left07:14
→ dvopgy joined07:18
→ csm3105 joined07:21
→ Shentino_ joined07:22
← dvopgy left07:23
← jinsun left07:27
← lucasta left07:31
→ dvopgy joined07:32
← srinidhi left07:35
→ lucasta joined07:36
→ sa0 joined07:40
→ otisolsen70 joined07:41
→ iomari891 joined07:44
← bn_work left07:44
← myme left07:44
← Murr left07:45
← lucasta left07:46
→ Murr joined07:46
→ lucasta joined07:48
→ lpapp joined07:53
← lucasta left07:53
lpapp hmm, how does git bisect think about having a good commmit and then a bad, and trying to find what broke it, but actually, it broke once in this range, got fixed, and broke again07:53
and let us say, I want to find the latest breakage?07:54
← defjam left07:54
lpapp by chance, it may get navigated to the first breakage07:54
I guess I should first try to find the latest good?07:54
Not sure I have done git bisect in such a non-trivial case before.07:54
I guess I would need something like bisecting between bad and bad07:55
to find where it was good07:55
I guess that will be manual bisect as git bisect is not meant for that?07:56
ikke I guess it's bisect day today07:57
but yes, bisect assumes a single transition from good (old) to bad (new)07:57
lpapp thanks07:58
I hope to convince my colleagues in the future not to have a year long long-lived branch07:58
where all sorts of bug transitions can occur making it a pain to bisect07:58
← csm3105 left08:02
← Michaela left08:02
→ Michaela joined08:03
→ lucasta joined08:03
→ srinidhi joined08:04
← skapata left08:05
← lpapp left08:06
→ cami||e joined08:07
← blackhawk left08:09
← unluckyshrubbery left08:09
→ derfflinger joined08:11
← lucasta left08:15
← otisolsen70 left08:16
→ Guest83 joined08:17
← Guest83 left08:18
→ defjam joined08:18
→ zeenk joined08:19
→ Sulky joined08:19
→ ampersand joined08:21
ampersand → Guest565408:21
Guest5654 I am getting an error message saying github identification error08:22
Hello08:23
→ EvgenyK joined08:23
→ coot joined08:23
arrayboltXE Guest5654: GitHub and Git are not the same thing. Git is an application, GitHub is a code hosting website that holds Git repos.08:24
Guest5654 → ampersand19108:24
arrayboltXE If you're getting an error related to authentication, you might be mistyping your username and/or access token, or something similar.08:24
→ tchan1 joined08:26
← tchan left08:28
→ EvilDMP joined08:29
→ GreenAlpaca joined08:30
ampersand191 Thanks arrayboltXE. Finally, the problem is solved.08:31
arrayboltXE \o/08:32
ampersand191 \o/08:33
← Sulky left08:35
← EvgenyK left08:38
← blahboybaz left08:39
← ampersand191 left08:39
← Teacup left08:40
→ Teacup joined08:40
→ funhouse_ joined08:41
→ EvgenyK joined08:41
← funhouse left08:45
→ csm3105 joined08:46
← EvgenyK left08:46
→ cdown joined08:50
→ alt-romes joined08:50
← powftw left08:53
→ vlado_ joined08:54
→ dionysus69 joined08:54
→ EvgenyK joined08:57
→ _sa0sin_ joined09:00
← csm3105 left09:02
← sa0 left09:03
→ Masklin__Gurder joined09:04
→ reset joined09:05
← Masklin left09:05
Masklin__Gurder → Masklin09:06
epony The Latin Roman Catholic X masse II in old style for the funeral of Pope Emeritus Benedictus XVI proceeding at the moment on a television near you..09:07
→ theoceaniscool joined09:07
← arrayboltXE left09:09
→ arrayboltXE joined09:11
→ csm3105 joined09:12
← warmana left09:14
→ DrowningElysium joined09:15
→ Sulky joined09:15
→ feriman joined09:18
← hbautista left09:19
→ blackhawk joined09:19
→ warmana joined09:20
← momomo left09:22
← alt-romes left09:23
→ humanface joined09:25
← feriman left09:25
→ cart_ joined09:26
→ skfax joined09:27
→ momomo joined09:27
→ gryffus_ joined09:28
← gryffus left09:29
→ duxsco joined09:30
← EvilDMP left09:31
→ elevenkb joined09:36
zeroes_ → zeroes09:37
← blackhawk left09:40
← Murr left09:45
→ Murr joined09:45
→ Guest51 joined09:46
← Guest51 left09:46
← elevenkb left09:48
← small left09:48
→ small joined09:49
← derfflinger left09:54
→ keypusher joined09:55
→ alt-romes joined09:55
→ derfflinger joined09:59
→ avar joined09:59
← derfflinger left10:00
→ derfflinger joined10:00
← farzat left10:05
→ unluckyshrubbery joined10:06
→ farzat joined10:07
→ Murr- joined10:11
→ tirnanog joined10:11
→ derfflinger_ joined10:12
← Murr left10:13
Murr- → Murr10:13
→ powftw joined10:16
← derfflinger left10:16
→ freeman_h joined10:18
freeman_h hi all I am trying to ignore whitespace changes on my project has the are over 89 files with just whitespace changes. I tried git config apply.whitespace fix however this did nothing then i tried git config apply.whitespace still the same10:19
just wondering what is the command to remove all files in the change that only have whitespace changes? I am using linux ubuntu if that make any difference10:19
← jazzy left10:22
freeman_h found the solution with git config core.filemode false10:22
← Michaela left10:23
← austincheney left10:24
ikke That has nothing to do with whitespace changes10:24
ikke set mode: -o10:24
→ Michaela joined10:26
→ feriman joined10:27
← twb left10:29
← defjam left10:31
→ defjam joined10:34
← derfflinger_ left10:34
→ Lord_of_Life_ joined10:35
← Lord_of_Life left10:36
← zeroes left10:37
→ zeroes joined10:37
Lord_of_Life_ → Lord_of_Life10:38
← bgs left10:43
→ mpldr joined10:46
← farzat left10:47
→ rkta_ joined10:48
→ farzat joined10:49
rkta_ → rkta10:49
← EvgenyK left10:50
← defjam left10:52
→ defjam joined10:53
→ elevenkb joined10:53
→ derfflinger joined10:57
← derfflinger left10:58
→ derfflinger joined10:59
→ FergX5 joined10:59
← farzat left11:00
FergX5 hello, i want some advise on how to handle my git branches. I have a branch feature/a and a branch feature/b with open PRs to origin/master. I want to create a third branch feature/a+b and open a PR to origin/master. How should i do that?11:00
→ EvgenyK joined11:03
← feriman left11:03
→ Sulky_ joined11:05
← Sulky left11:05
ikke FergX5: What is the reason you want to create a seperate MR for A+B?11:07
What happens if either A, B or A+B is merged?11:07
FergX5 ikke to be honest i have open merge request for master of two features in seperate branches, that i must combine and push the new feature c=a+b into master11:08
not sure how i should proceed. normally i wait for feature a and feature b to be merged into master first, before going to feature c11:08
ikke You could start a new branch feature/c which first merges in feature/a and feature/b, then work on feature/c and make an MR11:10
but you need to clean that up once feature/a and feature/b are merged11:10
→ terminalpusher joined11:12
← roadie left11:14
→ moldorcoder7 joined11:15
← duxsco left11:18
← EvgenyK left11:19
→ ___nick___ joined11:19
→ EvgenyK joined11:22
← FergX5 left11:25
← rustyshackleford left11:27
→ vinleod joined11:27
← skfax left11:30
← vdamewood left11:31
→ gast0n joined11:31
→ funhouse__ joined11:33
← csm3105 left11:35
→ Eryn_FL joined11:36
← funhouse_ left11:37
→ thiago joined11:38
→ farzat joined11:41
vinleod → vdamewood11:41
→ nyah joined11:43
← gryffus_ left11:43
← Murr left11:45
→ Murr joined11:45
→ lucasta joined11:46
← EvgenyK left11:47
← alt-romes left11:51
← tchan1 left11:53
← srinidhi left11:53
→ tchan joined11:53
→ gryffus_ joined11:56
← freeman_h left11:57
→ duxsco joined11:58
→ feriman joined12:02
← vishal left12:02
→ vishal joined12:06
← duxsco left12:13
← gryffus_ left12:16
← lucasta left12:17
← DrowningElysium left12:19
→ gryffus joined12:20
→ austincheney joined12:23
← vdamewood left12:23
→ vdamewood joined12:24
→ srinidhi joined12:26
→ lucasta joined12:27
← weko left12:30
→ weko joined12:30
→ EvgenyK joined12:35
← defjam left12:39
← EvgenyK left12:40
→ rsx joined12:42
→ DrowningElysium joined12:44
→ m4r35n357 joined12:47
← zeroes left12:47
→ zeroes joined12:47
→ myme joined12:48
→ blackhawk joined12:49
← roo- left12:51
→ roo- joined12:51
← cami||e left12:57
→ defjam joined13:07
← defjam left13:11
→ defjam joined13:12
→ EvgenyK joined13:23
← taupiqueur left13:27
← fflam left13:27
← EvgenyK left13:27
→ fflam joined13:27
→ csm3105 joined13:35
← momomo left13:36
← mei left13:36
→ eroux_ joined13:36
← eroux left13:38
→ eroux joined13:41
→ momomo joined13:41
leah2 is there a tool to make arbitrary git trees from a list of filenames and contents? i guess i could generate some fast-import format else...13:42
ikke man git-mktree?13:42
gitinfo the git-mktree manpage is available at https://gitirc.eu/git-mktree.html13:42
← eroux_ left13:44
← magic_ninja left13:44
← peterhil left13:45
→ magic_ninja joined13:46
→ m0viefreak joined13:47
→ raindrop777 joined13:47
→ mei joined13:48
→ madewokherd joined13:50
← madewokherd` left13:53
← lucasta left13:54
leah2 ok, then i need to add the blobs first i guess13:57
ikke yes13:58
git hash-object -w13:58
leah2 reasonable, thx13:58
→ Xardas joined13:58
→ f_ joined13:59
→ forgotmynick joined14:02
→ festive_kurbus joined14:04
→ kkawg joined14:05
← csm3105 left14:08
← GreenAlpaca left14:09
← Sulky_ left14:12
→ Sulky joined14:12
← festive_kurbus left14:18
→ bloody joined14:20
→ bywaterloo joined14:28
← maret left14:30
→ skapata joined14:31
→ EvilDMP joined14:33
→ roadie joined14:42
→ jinsun joined14:46
→ maret joined14:46
→ BUSY joined14:50
→ vancz joined14:52
← vancz left14:52
← madewokherd left14:52
← jinsun left14:53
→ festive_kurbus joined14:53
→ jinsun joined14:53
→ vsynthese joined14:53
← vsynthese left14:55
→ vsynthese joined14:56
← vsynthese left14:57
→ vsynthese joined14:57
← bloody left14:58
← vsynthese left14:59
→ vsynthese joined15:00
→ lucasta joined15:01
← vsynthese left15:01
→ vsynthese joined15:03
→ rustyshackleford joined15:04
← vsynthese left15:04
→ vancz joined15:06
← clime left15:06
← c0dehu1k left15:07
→ vsynthese joined15:07
→ c0dehu1k joined15:07
← feriman left15:08
← c0dehu1k left15:08
→ duxsco joined15:08
→ SuperLag joined15:08
← vsynthese left15:08
→ c0dehu1k joined15:08
← rsx left15:09
← c0dehu1k left15:09
← SuperLag left15:10
→ c0dehu1k joined15:10
← c0dehu1k left15:11
→ c0dehu1k joined15:12
→ bgs joined15:12
← festive_kurbus left15:13
→ MajorBiscuit joined15:13
→ vsynthese joined15:13
← vsynthese left15:15
← raindrop777 left15:15
← defjam left15:15
← gryffus left15:15
→ vsynthese joined15:20
→ SuperLag joined15:20
← vsynthese left15:21
→ geosmile joined15:22
← Sulky left15:25
→ rgrinberg joined15:26
→ vsynthese joined15:26
← dionysus69 left15:27
→ dionysus69 joined15:27
← vsynthese left15:28
← powftw left15:30
← maret left15:32
→ vsynthese joined15:33
← duxsco left15:33
← vsynthese left15:34
→ taupiqueur joined15:35
→ gryffus joined15:38
→ vsynthese joined15:39
← vsynthese left15:41
sebboh Hello. gitk doesn't show ^M at the end of lines anymore in the diff output when dealing with some file which have switched from CRLF to LF or vice versa. I think I can pass some git-diff command line options to gitk.. but I15:42
only see "ignore" directives regarding linefeeds. Is there a "don't ignore"?15:42
← Xardas left15:42
sebboh sorry, when I say "anymore", I mean, I presume it used to, since git-diff used to, according to some web searches I did.15:43
→ causasui joined15:43
ikke git diff itself does not explicitly do that15:43
it's the pager (less) that shows it15:43
→ derpydoo joined15:43
selckin also make sure the ignore space changes box is not selected in gitk15:44
sebboh ikke, ok, in this case, the pager is gitk, eh?15:44
selckin: I only invoke it from the command line, but ok, I'll check15:44
← rgrinberg left15:44
→ defjam joined15:44
← elevenkb left15:45
ikke sebboh: not sure if it's really used as a pager15:46
→ vsynthese joined15:46
sebboh selckin: where do I find that checkbox? I looked in Edit (menu) > Preferences in gitk .. version.. something. gitk doesn't respond to --version and the About box doesn't specify.15:47
→ rgrinberg joined15:47
selckin just above the diff view15:47
← vsynthese left15:47
sebboh selckin: got it, ok, nope, not checked.15:48
← defjam left15:49
selckin git diff does show them right?15:49
sebboh I don't know how to use git diff to show the past.15:50
← EvilDMP left15:50
selckin so we're not even sure you have line ending changes?15:50
ikke sebboh: git show <commit>15:50
sebboh That would not be correct at all. :)15:50
selckin is not sure what the problem is anymore, time to go find food15:52
← cdown left15:52
→ vsynthese joined15:52
sebboh I'm in a dummy repo. "Initial commit", "First commit", "Second commit", "Third commit". The problem is that I want gitk to tell me if any given commit is changing the line endings on a line.15:53
magit does this just fine. I guess. It's not quite a drop in replacement for gitk tho.. It's not a quick little viewer.15:53
← vsynthese left15:54
sebboh The reason I'm using a dummy repo is because I need to learn how to correctly identify and fix each type of line ending problem that exists in the real repo at $WORK and then go do that.15:55
← lucasta left15:58
→ vsynthese joined15:59
foo I merged in a branch into master that I now want to undo. I believe it only had 2 commits. How do I revert merging in a branch is the question on the table. *googles16:00
→ rosco joined16:00
ikke foo: Did opyou push that merge already16:00
← vsynthese left16:00
→ alexherbo2 joined16:00
ikke Do you want to it to appear like it never happened, or do you want to just undo the changes?16:00
foo ikke: yup16:01
ikke: just undo the change is ok16:01
like it never happened would be git reset --hard <commit-id-before-merge> I believe16:01
ikke correct16:01
git revert -m1 <merge-commit>16:02
selckin sebboh: i had whitespace = cr-at-eol option set that removed ^M in git diff output, doesn't show in gitk tho, can't really remember if it ever did16:02
foo ikke: I can't feed that a branch, right?16:02
oh, wait, merge commit16:02
selckin sebboh: it should show the whole line as changed tho16:02
→ cdown joined16:03
→ vsynthese joined16:06
← vsynthese left16:07
← alexherbo2 left16:07
← taupiqueur left16:11
← rgrinberg left16:11
→ vsynthese joined16:12
→ rgrinberg joined16:13
← vsynthese left16:13
→ fspax joined16:16
← c0dehu1k left16:17
→ palasso joined16:18
→ vsynthese joined16:19
→ defjam joined16:19
← vsynthese left16:20
← defjam left16:23
→ vsynthese joined16:25
← bywaterloo left16:26
← vsynthese left16:26
→ c0dehu1k joined16:27
← fspax left16:29
→ madewokherd joined16:29
→ vsynthese joined16:32
← vsynthese left16:33
→ vladoski joined16:33
→ Wh0 joined16:34
← vlado_ left16:36
→ freeman_h joined16:37
→ vsynthese joined16:38
← vsynthese left16:38
→ vsynthese joined16:39
← vsynthese left16:39
→ vsynthese joined16:39
← vsynthese left16:39
→ Nixkernal joined16:39
→ vsynthese joined16:39
← vsynthese left16:39
→ vsynthese joined16:41
→ Sulky joined16:42
→ festive_kurbus joined16:42
← derfflinger left16:44
→ defjam joined16:45
→ lucasta joined16:45
← ___nick___ left16:48
→ ___nick___ joined16:50
← ___nick___ left16:51
→ ___nick___ joined16:53
← rgrinberg left16:57
→ fuzzybear396540 joined16:58
← SuperLag left16:58
← humanface left16:58
→ rama joined17:02
← rama left17:02
→ dfee joined17:02
→ rama joined17:02
→ Betal joined17:05
← moldorcoder7 left17:05
← defjam left17:05
→ moldorcoder7 joined17:06
→ alexherbo2 joined17:06
→ SuperLag joined17:07
← dvopgy left17:09
← dionysus69 left17:10
← alexherbo2 left17:11
← Sulky left17:12
→ Sulky joined17:13
→ alexherbo2 joined17:24
→ dvopgy joined17:26
← Michaela left17:26
→ taupiqueur joined17:28
→ Michaela joined17:28
← DrowningElysium left17:29
← dvopgy left17:31
→ EvilDMP joined17:32
→ rgrinberg joined17:32
→ defjam joined17:36
→ bertronika joined17:36
→ dvopgy joined17:42
→ john_johnk joined17:43
← rgrinberg left17:43
← warmana left17:44
→ fspax joined17:46
← dvopgy left17:47
← festive_kurbus left17:49
→ festive_kurbus joined17:49
→ rgrinberg joined17:52
← fspax left17:53
← lucasta left17:54
← jacobk left17:55
← rosco left17:55
→ fspax joined17:57
← freeman_h left17:57
→ dvopgy joined17:59
→ FFY00 joined18:00
← terminalpusher left18:01
→ lungaro joined18:01
→ raindrop777 joined18:01
lungaro i'm tired of putting all these safe dirs in my ~/.gitconfig (it's part of my dotfiles)18:01
does anyone have a workaround?18:01
→ terminalpusher joined18:01
→ FFY00_ joined18:02
lungaro i could see having include support provide the ability of best of both worlds18:02
← m4r35n357 left18:02
← blackhawk left18:02
ikke git config --global safe.directory '*'18:02
lungaro is that really safe?18:03
ikke no18:03
lungaro haha18:03
← dvopgy left18:04
← FFY00 left18:05
→ duxsco joined18:05
lungaro oh it does have include support18:05
ok, not ideal but i can just have ~/.gitconfig include my dotfile stuffs18:08
← defjam left18:08
lungaro then leave .gitconfig as a regular file outside of my dotfiles git repo18:09
seems like safe dirs should not be put in global config18:09
← Michaela left18:10
→ Michaela joined18:12
→ jacobk joined18:13
→ dvopgy joined18:15
← MajorBiscuit left18:15
← alexherbo2 left18:16
← Wh0 left18:17
← fspax left18:18
dino82 → din018:19
← din0 left18:19
→ din0 joined18:19
→ blackhawk joined18:19
→ tulpa_ joined18:19
← rama left18:20
→ Misotauros joined18:20
← dvopgy left18:20
← taupiqueur left18:20
→ rama joined18:20
← rgrinberg left18:24
← john_johnk left18:25
← coot left18:27
→ zen_coder joined18:28
← terminalpusher left18:29
→ bywaterloo joined18:30
→ terminalpusher joined18:30
→ dvopgy joined18:32
→ alexherbo2 joined18:32
→ blahboybaz joined18:33
← geosmile left18:34
← tulpa_ left18:34
← igemnace left18:35
← iomari891 left18:35
→ rostero joined18:36
← dvopgy left18:37
← alexherbo2 left18:37
→ igemnace joined18:38
→ defjam joined18:38
alexia what are you doing that requires you to add so many safe dirs?18:39
→ geosmile joined18:39
← igemnace left18:39
← defjam left18:43
← blackhawk left18:44
→ taupiqueur joined18:45
→ alexherbo2 joined18:45
← srinidhi left18:45
→ lucasta joined18:46
← cdown left18:46
→ wavesong joined18:47
→ dvopgy joined18:48
← gast0n left18:49
→ elevenkb joined18:52
→ defjam joined18:52
ikke asking the real questions18:53
← dvopgy left18:53
← rama left18:57
← fuzzybear396540 left18:57
→ jazzy joined19:00
→ gas51627_ joined19:03
→ rgrinberg joined19:05
→ dvopgy joined19:05
roo- hey, a beginner here, I have a hobby JavaScript based project and I began reading about git. I want to have 2 versions of my project, one with all of its features and one minimalistic. Is this something that should be handled with git?19:06
← Sulky left19:07
← vdamewood left19:08
→ vdamewood joined19:09
→ ChmEarl joined19:09
← dvopgy left19:10
← lucasta left19:11
→ dvopgy joined19:13
→ lucasta joined19:13
→ blackhawk joined19:16
← dvopgy left19:18
→ rama joined19:19
OMGOMG yes19:19
no19:20
maybe19:20
it might make sense to have a "minimalistic" branch that you keep up to date with (maybe by rebasing onto) the fully featured branch19:21
← festive_kurbus left19:23
← rama left19:25
roo- OMGOMG, I'm guessing that the process of rebasing might require dealing with conflicts?19:25
→ dvopgy joined19:26
→ ELFrederich joined19:26
JumpinBanana roo-: This would be better handled by module desing of your software and building versions of it. While building you decide which modules (features) are in the build and which not.19:29
→ EvgenyK joined19:29
← dvopgy left19:29
← lucasta left19:30
→ lucasta joined19:31
OMGOMG roo-: usually it won't, and when it does it'll usually be obvious what to keep19:32
roo- JumpinBanana, Yes currently I just have a basic script for that, are there any common tools for such a thing that I might benefit from? Or a script is as good as it gets?19:32
OMGOMG roo-: JumpinBanana is correct, but if the intention is learning git, it might be a decent way to do it19:32
→ jb1277976 joined19:33
← raindrop777 left19:34
← EvgenyK left19:34
roo- OMGOMG, well sure I will learn git as I go along but I don't have to do everything with it if there might be more straightforward approaches19:34
→ Sulky joined19:37
OMGOMG hard to say without knowing more about the structure of the project19:38
← alexherbo2 left19:44
← Murr left19:44
← defjam left19:45
→ Murr joined19:45
→ festive_kurbus joined19:45
→ dvopgy joined19:45
← vladoski left19:46
← dfee left19:50
← dvopgy left19:51
→ MajorBiscuit joined19:56
→ defjam joined19:59
→ dvopgy joined20:05
← dvopgy left20:11
← weko left20:11
→ weko joined20:11
← madewokherd left20:14
← ELFrederich left20:20
festive_kurbus interesting idea: online game in git20:21
← blackhawk left20:22
→ blackhawk joined20:22
→ dvopgy joined20:23
festive_kurbus might be better under svn though20:24
something id never thought id say20:24
← lucasta left20:27
← dvopgy left20:28
← Coop left20:29
← festive_kurbus left20:36
← kkawg left20:36
→ feriman joined20:37
← blackhawk left20:37
→ dvopgy joined20:39
→ hamburgler joined20:40
→ fuzzybear396563 joined20:41
→ lucasta joined20:42
← dvopgy left20:44
← lucasta left20:48
→ lucasta joined20:50
← MajorBiscuit left20:55
→ dvopgy joined20:56
→ squirrel joined20:57
→ MajorBiscuit joined20:57
← jacobk left20:58
← dvopgy left21:01
→ ZacSharp joined21:02
→ dfee joined21:03
← ___nick___ left21:04
← lacrymology left21:07
← bgs left21:09
→ lacrymology joined21:09
← lucasta left21:09
← MajorBiscuit left21:11
← defjam left21:14
→ dvopgy joined21:15
drew how do I remove a stale remote branch from a local repo? I see remotes/origin/HEAD -> origin/main and remoets/origin/main but I can't delete remotes/origin/test21:17
test doesn't exist in the upstream anymroe21:18
→ MajorBiscuit joined21:18
ikke git fetch --prune origin21:18
drew thanks ikke21:19
← dvopgy left21:19
→ defjam joined21:20
→ lucasta joined21:21
→ structoha joined21:23
← defjam left21:25
← lucasta left21:25
← zeenk left21:28
← f_ left21:29
→ coot joined21:30
← magic_ninja left21:30
← forgotmynick left21:31
→ dvopgy joined21:33
→ ArtfulDodger joined21:33
← austincheney left21:33
structoha Hey everyone, sometimes i download source code [apps/dotfiles/...] in ~/src via git which i wanna use for myself [either by symlinking to my home folder or copying some of the files somewhere else] but at the same time, i wanna be able to get new updates from the repo, how would you go around this issue?21:33
→ austincheney joined21:34
← rostero left21:36
← vdamewood left21:37
← dvopgy left21:38
→ vdamewood joined21:38
→ lucasta joined21:38
JumpinBanana <structoha: Which issue exactly?21:39
← f451 left21:39
→ f451 joined21:41
ArtfulDodger Hey! My gitlab is only accessible via ssh with a proxyjump i.e. "ssh -A -J [email@hidden.address] [email@hidden.address] Is the syntax of the url= entry in .git/config able to record this proxyjump by itself without change of the client's SSH config?21:44
→ winter joined21:44
ztrawhcse no21:45
← Murr left21:45
→ Murr joined21:45
→ kkawg joined21:45
ajak why not? should work to confgiure core.sshCommand as necessary in that repo?21:45
or in such repos21:46
structoha JumpinBanana: i want to clone a dotfiles repo from the internet, then edit my own21:48
ch make a branch?21:49
→ dvopgy joined21:51
ztrawhcse ajak: that is certainly not the url= entry at minimum21:51
good enough reason? :D21:52
it would also probably break ssh to other remotes in the same repo, but that may or may not ever end up relevant.21:52
ArtfulDodger yes other remotes may not require the proxyjump21:54
Can core.sshCommand be specific to a [remote] entry then?21:54
→ defjam joined21:54
ztrawhcse no21:56
→ fillx joined21:56
ztrawhcse I guess you could set it in a shell script you invoke instead of git21:56
but really I think editing .ssh/config is the best approach here :D21:56
← dvopgy left21:57
← fillx left21:57
ztrawhcse (the shell script would detect what remote url you're using and do a bit of bash to choose when to set $GIT_SSH_COMMAND)21:57
← BlessJah left21:58
JumpinBanana structoha: as ch said. Create a own custom branch. Make your edits and update the origin master branch regulary to get the updates. After that do a merge into your custom branch. Any conflicts need to be addressed by our own21:59
← duxsco left22:00
→ BlessJah joined22:00
structoha Thank you22:01
← defjam left22:01
ajak ztrawhcse: ah sorry, misread the question, you're right22:02
← dfee left22:05
→ giu- joined22:06
→ Maxattax1997 joined22:06
← BlessJah left22:07
← bywaterloo left22:08
→ BlessJah joined22:09
← elevenkb left22:09
→ dfee joined22:09
→ dvopgy joined22:09
→ magic_ninja joined22:10
← cart_ left22:11
← Nixkernal left22:12
← MiguelX413 left22:12
→ Coop joined22:12
→ wootehfoot joined22:13
← Maxattax1997 left22:14
← dvopgy left22:14
→ MiguelX413 joined22:15
→ cdown joined22:16
→ ferdna joined22:18
→ dvopgy joined22:26
← MajorBiscuit left22:27
← dvopgy left22:31
→ defjam joined22:31
→ dionysus69 joined22:32
← defjam left22:36
→ dvopgy joined22:43
→ MajorBiscuit joined22:44
← causasui left22:44
→ lgc joined22:45
← lgc left22:45
← dvopgy left22:48
← feriman left22:50
→ hbautista joined22:52
← dfee left22:58
← MajorBiscuit left22:59
← coot left23:00
→ dvopgy joined23:00
→ Cleverness joined23:01
→ roadie` joined23:02
→ clime joined23:03
← roadie left23:04
→ defjam joined23:05
← dvopgy left23:06
← bertronika left23:07
← defjam left23:10
← lucasta left23:11
← kkawg left23:12
→ dfee joined23:15
← ZacSharp left23:16
← zen_coder left23:16
→ dvopgy joined23:16
← clime left23:19
← dvopgy left23:21
← hbautista left23:21
→ lucasta joined23:22
→ inversed joined23:23
← lucasta left23:30
→ elevenkb joined23:30
← derpydoo left23:33
→ dvopgy joined23:33
→ defjam joined23:37
→ madewokherd joined23:37
← dvopgy left23:38
→ llh joined23:40
← defjam left23:42
← Murr left23:44
← fuzzybear396563 left23:44
→ Murr joined23:45
← vqueiroz left23:45
→ Xenguy joined23:48
→ dvopgy joined23:50
← nyah left23:51
← _sa0sin_ left23:52
→ Xenguy_ joined23:55
← dvopgy left23:55
← Xenguy left23:57
→ hbautista joined23:59

Logs Search ←Prev date Next date→ Channels Documentation