IRCloggy #git 2022-06-13

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-06-13

→ nate4 joined00:02
→ rszarka joined00:04
← Soni left00:04
← Murr left00:04
→ Murr joined00:04
→ user9d joined00:05
← junebug left00:05
→ GNUmoon joined00:06
→ hamburgler2 joined00:06
user9d how do I do a 'git clone https://github.com/black-brain/graBing` and have it automatically FAIL/exit-immediately because I need to "login" in order to clone it?00:06
ajak $ curl -I https://github.com/black-brain/graBing00:07
← robszarka left00:07
ajak HTTP/2 40400:07
github does that when you try to clone something that doesn't exist00:07
← nate4 left00:07
user9d oh.00:08
← hamburgler left00:08
user9d xD00:08
I assumed it was a turned-private-from-public-repository xD00:12
→ junebug joined00:13
→ geosmile joined00:16
← littlebobeep left00:28
→ kaiseisei joined00:29
→ cixx joined00:34
← user9d left00:37
← cixx left00:38
← ferdna left00:39
→ ferdna joined00:40
→ littlebobeep joined00:40
← junebug left00:41
→ cixx joined00:50
← Lord_of_Life left00:50
→ Lord_of_Life joined00:52
← hamburgler2 left00:53
← cixx left00:55
→ nate4 joined01:00
← nate4 left01:05
→ jinsl joined01:06
→ cixx joined01:06
← Leonarbro left01:09
← littlebobeep left01:10
← cixx left01:11
← kaiseisei left01:14
→ littlebobeep joined01:15
← Visne left01:16
→ Visne joined01:16
→ kaiseisei joined01:16
← umbramalison left01:17
← hbautista left01:17
→ jjakob joined01:18
→ umbramalison joined01:18
← auk_ left01:20
→ Betal joined01:30
← dodobrain left01:37
→ dodobrain joined01:37
→ Leonarbro joined01:39
→ Soni joined01:43
← Yruama left01:44
→ xiongxin joined01:47
→ liberaider joined01:51
← thiago left01:56
→ thiago joined01:57
← pretty_dumm_guy left01:58
← EvilDMP left02:02
← lemonsnicks left02:03
→ rgrinberg joined02:04
← Murr left02:04
→ Murr joined02:04
← Leonarbro left02:05
→ justinf210 joined02:05
← justinf210 left02:05
aidalgol_ → aidalgol02:07
← zulutango left02:11
→ _xor joined02:16
← structoha1 left02:17
→ zulutango joined02:18
→ Leonarbro joined02:19
→ lemonsnicks joined02:20
← Leonarbro left02:25
← FFY00 left02:32
← junktext left02:32
→ MiguelX413 joined02:33
→ junktext joined02:33
← pulse left02:33
← FinnElija left02:41
→ FinnElija joined02:41
← terrorjack left02:43
→ cixx joined02:43
→ terrorjack joined02:44
← xiongxin left02:51
← kaiseisei left02:54
→ kaiseisei joined02:54
→ nate4 joined02:56
← to1ne left03:05
← bin101 left03:14
→ gurkenglas joined03:17
← ChmEarl left03:18
→ bin101 joined03:18
← gast0n left03:26
← tyson2 left03:30
→ tusko joined03:31
tusko Supposed we have a branch develop that we want to merge into main. Is the proper way to do that `git checkout main && git merge develop`?03:32
seems right to my eye03:33
→ SteveR joined03:35
← SteveR left03:35
→ SteveR44 joined03:35
SteveR44 Hi there03:35
instead of creating a local branch03:35
i directly made changes to the local master03:35
now i want to create the branch03:35
← Guest2 left03:35
SteveR44 is there a way to move the changes that are in the local master to a new branch in local03:36
← rgrinberg left03:36
← dodobrain left03:37
→ dodobrain joined03:37
→ rgrinberg joined03:39
← Anu left03:42
← nate4 left03:43
← Maxattax97 left03:47
tusko https://stackoverflow.com/questions/44162174/git-move-staged-changes-to-different-or-new-branch03:48
← jimm left03:48
→ jimm joined03:48
← rgrinberg left03:54
→ justinf210 joined04:03
← justinf210 left04:07
← mandeep left04:07
→ nate4 joined04:07
→ kaiseisei1 joined04:10
← kaiseisei left04:10
kaiseisei1 → kaiseisei04:10
← pmcnabb left04:10
→ vdamewood joined04:11
← bloody left04:11
→ xiongxin joined04:14
← ferdna left04:17
mackerman SteveR44: git switch --create <new-branch> master04:23
SteveR44 i did a a git stash and then git stash branch <new-branch> stash@{004:24
mackerman stash may not be needed in simple cases of uncommited changes that do not conflict.04:24
Also known as !float04:25
gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout existing_branch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.04:25
← xiongxin left04:27
→ xiongxin joined04:27
← nate4 left04:28
← littlebobeep left04:32
→ littlebobeep joined04:35
← geosmile left04:37
← Arsen left04:40
← SuperLag left04:41
→ stewie925 joined04:44
stewie925 hey guys, how do we stash an untracked file that is "git add"ed ?04:44
I want to stash it along with an updated file, not separate04:45
ikke stewie925: if it's staged, git stash should automatically include it04:47
stewie925 ikke: thanks04:48
let me try...04:48
I am using the latest git version 2.3504:48
→ Arsen joined04:48
ikke I just tested it04:49
stewie925 ikke: fantastic! thank you!04:50
I just tested it too (stash save AND stash apply)04:50
→ kaiseisei1 joined04:53
← kaiseisei left04:54
kaiseisei1 → kaiseisei04:54
← stewie925 left04:58
→ nate4 joined04:58
→ srinidhi joined04:58
← txtsd left05:00
→ txtsd joined05:02
→ theoceaniscool joined05:02
← thiago left05:02
← nate4 left05:04
dba I have added .idea to .gitignore but everytime I commit the .idea folder git pushed to the remote repo. what could be the problem?05:05
← littlebobeep left05:05
→ dsrt^ joined05:09
strk dba: does `git ls-tree HEAD` # show you the .idea folder ? Adding it to .gitignore doesn't mean it's not in the repository already05:10
→ coot joined05:11
→ littlebobeep joined05:12
^vanessa^ → vanessa05:14
ikke dba: .gitigore does not prevent git from pushing changes to a folder05:15
it only affects git status and git add05:15
← SteveR44 left05:16
← dsrt^ left05:34
→ madewokherd` joined05:36
← w0ng left05:37
← dodobrain left05:37
→ dodobrain joined05:37
← madewokherd left05:39
← littlebobeep left05:41
← xiongxin left05:42
→ magic_ninja joined05:45
→ w0ng joined05:45
→ nate4 joined05:48
→ littlebobeep joined05:48
← GNUmoon left05:49
→ dsrt^ joined05:50
→ GNUmoon joined05:51
← kaiseisei left05:52
← great_taste left05:52
→ kaiseisei joined05:52
→ derfflinger joined05:52
← derfflinger left05:54
dba ikke: how do I prevent it from getting pushed to the remote repo?05:54
→ derfflinger joined05:54
← konrados left05:54
dba I guess I figure out the issue when I do `git add .` it add the .idea folder, I think I should doo only `git add newfileadded` but sometime I add multiple file locally to the repo it is very inconvenient to add one by one05:55
I was wondering if there is something I can do in the config or setting to prevent adding `.idea` when I do `git add .`05:56
← nate4 left05:58
→ structoha1 joined05:58
→ xiongxin joined05:58
← Murr left06:04
→ Murr joined06:04
→ acebrianjuan joined06:06
← sudoforge left06:07
← lord| left06:09
→ jinsl00000 joined06:10
← dsrt^ left06:10
cixx gi06:11
hi06:11
git log -3 -S'card' --stat -p06:12
i am trying to search on last n commits06:12
but it found from previous commits with this06:12
← jinsl left06:13
osse cixx: the -3 limits git log to show three commits. so it searches backwards until it has three commits06:13
you can do git log -Scard --stat -p HEAD~3..06:13
→ kaiseisei1 joined06:14
← kaiseisei left06:15
kaiseisei1 → kaiseisei06:15
→ nate4 joined06:16
→ aliheym joined06:19
→ dionysus69 joined06:19
← aliheym left06:20
→ carl- joined06:22
← kaiseisei left06:23
→ konrados joined06:23
→ kaiseisei joined06:23
→ otisolsen70 joined06:24
cixx hmm06:28
thank you osse06:28
→ szkl joined06:29
→ mexen joined06:30
← nate4 left06:32
→ kaiseisei1 joined06:33
← kaiseisei left06:34
kaiseisei1 → kaiseisei06:34
→ saroy joined06:38
← dharrigan left06:42
→ dharrigan joined06:42
→ dsrt^ joined06:45
← littlebobeep left06:46
← xiongxin left06:46
→ littlebobeep joined06:48
→ nate4 joined06:49
← RiFo left06:50
→ palasso joined06:52
← jinsun left06:52
← toralf_ left06:58
_val__ → _val_06:58
→ toralf joined06:58
→ fxbrain joined07:00
← Celelibi left07:01
← nate4 left07:05
→ littlebo1eep joined07:06
→ Celelibi joined07:06
← littlebobeep left07:08
← unluckyshrubbery left07:09
→ Sulky__ joined07:10
→ feriman joined07:10
→ lord| joined07:12
← Sulky_ left07:12
→ xiongxin joined07:14
→ adlternative joined07:19
→ littlebobeep joined07:20
→ Leonarbro joined07:21
→ Masklin joined07:21
← littlebo1eep left07:24
← littlebobeep left07:25
← jimm left07:25
→ jimm joined07:25
→ littlebobeep joined07:26
← Sulky__ left07:30
adlternative hi, I find that git annotated tag can point to another tag, and than this tag can point to another tag... how can I find the last derefence object from first tag?07:30
→ drogas joined07:31
→ soman joined07:31
wynn → wolf07:34
→ enoq joined07:34
→ xiongxin1 joined07:34
→ EvilDMP joined07:34
← xiongxin left07:35
xiongxin1 → xiongxin07:35
osse adlternative: try git rev-parse 'tagname^{commit}'07:35
← skapata left07:36
← toralf left07:36
→ toralf joined07:36
← dodobrain left07:37
→ lgc joined07:37
→ dodobrain joined07:38
← lgc left07:40
← mat001 left07:47
adlternative osse: thanks! I get it07:47
← dsrt^ left07:56
→ RiFo joined08:00
← mbalmer left08:00
→ Sulky joined08:01
→ to1ne joined08:01
→ jinsl000000 joined08:06
→ phcerdan joined08:07
← jinsl00000 left08:09
← squirrel left08:11
→ zeenk joined08:12
→ dig joined08:14
← farzat left08:16
→ kenanmarasli joined08:24
→ bkircher joined08:24
← jimm left08:26
→ jimm joined08:26
→ csm3105 joined08:27
← xiongxin left08:28
→ G30RD13 joined08:28
→ mncheck joined08:36
→ farzat joined08:40
← Betal left08:42
→ unluckyshrubbery joined08:42
→ dsrt^ joined08:45
← indy left08:46
← littlebobeep left08:49
← coot left08:49
← csm3105 left08:53
→ csm3105 joined08:53
→ ___nick___ joined08:54
← G30RD13 left08:55
→ SteveR joined08:57
SteveR Hi there, i have committed some files to local08:57
how do i revert08:57
i want to go back to the state where things are not commited08:57
selckin git reset HEAD^ undos the last commit08:57
← dsrt^ left08:58
SteveR selckin thanks, one more question. im working on 2 branches in a same folder09:00
i want to switch to another branch and have the stash appear09:00
← SteveR left09:03
← bkircher left09:03
→ Anu joined09:03
← jinsl000000 left09:04
→ bkircher joined09:04
→ indy joined09:06
→ littlebobeep joined09:11
← indy left09:11
→ indy joined09:17
→ rsx joined09:18
← indy left09:22
→ indy joined09:22
← littlebobeep left09:22
→ nate4 joined09:22
→ littlebobeep joined09:23
→ pretty_dumm_guy joined09:24
→ Guest33 joined09:28
← nate4 left09:28
← Anu left09:28
→ Anu joined09:29
← rsx left09:30
→ onizu joined09:32
← Anu left09:35
→ Anu joined09:36
← dodobrain left09:37
→ dodobrain joined09:38
← phcerdan left09:39
← Guest33 left09:46
→ xiongxin joined09:46
← Masklin left09:47
→ Guest33 joined09:49
← gildasio1 left09:54
→ cdown joined09:56
← GNUmoon left09:57
→ cdown_ joined09:58
← cdown left10:01
← dionysus69 left10:01
cdown_ → cdown10:01
→ TheCatBehemoth joined10:06
→ cdown_ joined10:07
← soman left10:08
→ GNUmoon joined10:08
→ cdown__ joined10:09
← cdown left10:09
cdown__ → cdown10:09
→ rsx joined10:09
← cdown_ left10:11
→ xiongxin1 joined10:12
← xiongxin left10:12
xiongxin1 → xiongxin10:12
→ haritz joined10:14
← haritz left10:14
→ haritz joined10:14
← structoha1 left10:16
→ nyah joined10:18
← vishal left10:19
← EvilDMP left10:22
→ vishal joined10:23
← fxbrain left10:23
← adlternative left10:23
→ EvilDMP joined10:24
← Sulky left10:27
→ Sulky joined10:27
← drogas left10:30
← LuKaRo left10:35
← jazzy left10:36
← TheCatBehemoth left10:36
→ LuKaRo joined10:37
→ fxbrain joined10:37
→ structoha1 joined10:40
← kaiseisei left10:40
← Jong left10:42
→ dionysus69 joined10:46
→ KnoP joined10:48
→ john_johnk joined10:51
← RiFo left10:53
→ G30RD13 joined10:53
← OnkelTem left10:54
← G30RD13 left10:55
← xiongxin left10:56
← structoha1 left10:56
→ OnkelTem joined10:57
→ RiFo joined10:57
← KnoP left10:57
← dodobrain left10:59
← OnkelTem left11:03
→ OnkelTem joined11:04
← kenanmarasli left11:05
→ Murr- joined11:06
→ pretty_d1 joined11:08
← pretty_d1 left11:08
← Murr left11:08
Murr- → Murr11:08
← Guest33 left11:08
← pretty_dumm_guy left11:09
→ vitali64 joined11:10
vitali64 → meowtali6411:10
→ kalendermesrep joined11:12
→ Guest33 joined11:13
kalendermesrep join #github11:14
← kalendermesrep left11:14
→ KnoP joined11:15
→ geosmile joined11:16
← cation left11:18
← bremner left11:19
→ cousteau joined11:20
cousteau hint: core.useBuiltinFSMonitor=true is deprecated;please set core.fsmonitor=true instead11:20
I didn't set that option explicitly; it was the Windows installer11:21
Maybe the Windows installer needs to be changed so that it uses the new value?11:21
← GNUmoon left11:22
cousteau (are "bug reports via IRC" welcome?)11:22
→ dsrt^ joined11:25
→ pretty_dumm_guy joined11:25
osse cousteau: https://github.com/git-for-windows/git/issues/385311:27
← meowtali64 left11:28
cousteau Oh, so there it is... I was looking at git/git11:28
osse yeah git for windows is essentially a fork11:29
cousteau I see11:29
osse different project structure, different repo.11:29
not a separate repo, but a fork with lots of changes (mostly additions I think)11:30
→ GNUmoon joined11:30
→ MajorBiscuit joined11:30
cousteau What's a separate repo anyway?11:31
→ bremner joined11:31
cousteau (well, I guess it's "a git project with no commits in common")11:31
→ Rashad joined11:31
osse yeah with orphan branches and whatnot I guess the whole world is one big repo :p11:32
← cousteau left11:33
→ cousteau_ joined11:35
cousteau_ I suppose you meant that it was not created from scratch and that you can "mix" the two repos together11:35
Although maybe they've diverged so much that it's impossible to merge the changes from one into the other...11:36
ikke That there is a shared history11:36
cousteau_ <cousteau> (well, I guess it's "a git project with no commits in common")11:37
← GNUmoon left11:37
bookworm https://podcasts.google.com/feed/aHR0cHM6Ly9hcGkuc3Vic3RhY2suY29tL2ZlZWQvcG9kY2FzdC81NTcyNS5yc3M/episode/c3Vic3RhY2s6cG9zdDo0MjgzMTA4Ng?ep=14 for a nice background story from the maintainer11:37
cousteau_ I thought I had sent that message, but the damn thing disconnected11:37
osse as far as i can see, git for windows is a bunch of commits that are rebased on top of git itself11:40
cousteau_ Hm. Just wondering if putting together all git repos in the world into one big git repo would create hash collisions.11:40
osse: OK, so sort of what I discussed some time ago about the "two-track graph where one track is periodically merged into the second"11:41
which someone replied "that's called... a fork"11:41
bookworm is there a question somewhere?11:42
cousteau_ Nah, just a remark11:45
→ GNUmoon joined11:46
← dsrt^ left11:47
← runlevel_0 left11:48
cousteau_ Hm. __git_ps1 is horribly slow in Windows (1-2 seconds), so every time I enter a command on the "git bash" terminal it freezes for a couple of seconds just to print the next prompt11:48
BUT, it works fine (0.2-0.3 s) if I run it as admin11:49
← rkta left11:51
← Jck_true left11:51
geosmile I'd like to share .ssh/config file between machines and was wondering what a good way of doing that is - perhaps using git? Or dropbox? perhaps someone here already does that?11:54
cousteau_ Additionally, git bash starts in / rather than ~ when I open a new terminal window. This isn't the case if I run as admin; in that case it starts in ~ as expected.11:54
geosmile: I don't see how git can help there, unless you mean using GitHub or similar11:56
Are the machines in the same network?11:56
→ rkta joined11:56
geosmile cousteau_, not on the same network. Mac/linux boxes. Do people maintain their .bashrc in git? if yes, how do they install/use it per machine?11:57
gnoo some people do use git to track their dotfiles11:57
but gnu stow is better suited for that task, or so i heard11:57
cousteau_ I don't think people use git to track changes on their .bashrc, or individual files in general11:57
bookworm I do11:58
lot's of other people I run into on the various Linux chans as well11:58
why wouldn't you?11:58
cousteau_ Would be kind of complicated since git projects are directories, so you'd need to have it in a separate directory, with scripts to sync it with your ~/.bashrc11:59
geosmile bookworm, i'd like to auto sync it - any ideas?11:59
cousteau_ I mean, it can be done, but I didn't expect many people to do it12:00
I was wrong, apparently12:00
geosmile cousteau_, put the setup directory on a shared drive like dropbox, and run an install script that links those files to the shared directory?12:00
bookworm "git project" ?12:00
cousteau_ Er, repo12:00
← drew left12:00
bookworm I have a folder called dotfiles and link stuff from there. With the advent of xdg_config_dir just shove .config or whatever in a git repo and you're done12:01
most application use it nowdays or at least can be coerced to12:01
geosmile: depends on your definition of auto... systemd timer+ git pull, git push will work12:02
cousteau_ I'm not sure symlinking ~/.bashrc to a Dropbox drive is a good idea; it may be better to have a startup script that syncs them... Maybe I'm just being paranoid though.12:02
bookworm no need for dropbox if you track it in git12:03
git can sync just fine on its own12:03
cousteau_ geosmile was suggesting using Dropbox to host the files12:03
bookworm yes, I'm aware12:03
← Murr left12:03
→ Murr joined12:04
bookworm git has a faq not to do that somewhere though iirc as it's easy to corrupt a repo this way12:04
cousteau_ And well, symlinking ~/.bashrc to a file in a local git repo seems safer, since it's all local12:05
geosmile bookworm, i have 20 machines - and i'd want the dotfiles to sync automatically? I could write an ansible script from one machine to sync12:05
cousteau_ (then again, maybe so is a Dropbox shared folder, not sure)12:05
bookworm sure, whatever floats your boat12:05
cousteau_ Thing is, my understanding is that git's main purpose is for tracking changes, not deploying files12:06
So if you're going to be interested in tracking changes then it may be a good option, but if it's just for deploying the files to multiple computers it may be overkill12:07
bookworm you do realize that quite a bunch of websites thingies operate with markdown on top of git as a deployment strategy yes? So does jenkins / CI/CD12:07
cousteau_ Possibly, but not just git12:07
I remember there was a factoid advising against that12:08
bookworm I think you are overthinking it a bit12:08
keep it simple and stupid, if that's enough you're good, if not add a level on top12:08
cousteau_ That's good advice, yes12:09
→ cousteau joined12:10
← cousteau_ left12:10
cousteau That's good advice, yes12:10
(stupid irc client)12:10
Re: my various issues with git for windows, I don't remember having any of these with my previous work laptop, so it may be an issue with this one12:12
→ donofrio__ joined12:15
→ pulse joined12:16
→ EvilDMP_ joined12:17
← donofrio_ left12:19
← EvilDMP left12:21
← strk left12:31
→ bloody joined12:32
→ EvilDMP joined12:35
← EvilDMP_ left12:38
→ EvilDMP_ joined12:41
← dig left12:43
← cousteau left12:43
← EvilDMP left12:43
→ dig joined12:44
← srinidhi left12:45
→ arch-angel joined12:48
→ bongobrown joined12:48
← bongobrown left12:49
→ bongobrown joined12:49
← littlebobeep left12:51
← lord| left12:52
→ causasui joined12:52
→ TheCatBehemoth joined12:53
→ G30RD13 joined12:55
→ lord| joined12:55
← YuGiOhJCJ left12:55
← TheCatBehemoth left12:58
← csm3105 left13:01
→ unknowiiooo joined13:01
→ ferdna joined13:02
← lord| left13:02
← Rashad left13:02
← unknowiiooo left13:03
→ lord| joined13:04
→ loulou_ joined13:05
← loulou_ left13:05
→ loulou_ joined13:05
→ FFY00 joined13:05
→ drogas joined13:16
← G30RD13 left13:18
→ csm3105 joined13:20
→ reset joined13:23
→ sandipan joined13:25
← saroy left13:25
→ nate4 joined13:27
→ igemnace joined13:29
← sandipan left13:31
→ hstct joined13:32
→ G30RD13 joined13:32
← G30RD13 left13:32
→ rgrinberg joined13:35
← tusko left13:37
← crabbedhaloablut left13:37
← FinnElija left13:37
← ghost43 left13:37
→ crabbedhaloablut joined13:37
→ tusko joined13:37
→ ghost43 joined13:38
← Guest33 left13:38
→ pmcnabb joined13:39
← acebrianjuan left13:39
← nate4 left13:40
→ FinnElija joined13:41
← rgrinberg left13:43
→ gildasio1 joined13:43
← bongobrown left13:47
← vdamewood left13:48
← pcarphin left13:48
→ pcarphin joined13:48
← KnoP left13:49
→ KnoP joined13:49
← KnoP left13:49
→ Rashad joined13:50
→ littlebobeep joined13:53
→ bongobrown joined13:54
→ coot joined13:55
→ rgrinberg joined13:57
→ derpydoo joined13:58
← julian left14:01
→ gh34 joined14:02
→ tangy joined14:04
← littlebobeep left14:04
→ bynx joined14:05
→ great_taste joined14:05
→ TheCatBehemoth joined14:06
→ trafficjam joined14:07
← elastic_dog left14:12
tykling_ → tykling14:12
→ saroy joined14:12
→ vladoski joined14:12
→ elastic_dog joined14:14
→ ChmEarl joined14:15
← Tobbi_ left14:17
← trafficjam left14:17
→ Tobbi_ joined14:17
→ skapata joined14:17
← skapata left14:17
→ skapata joined14:17
← TheCatBehemoth left14:21
→ drbeco joined14:22
→ sudoforge joined14:23
← lemonsnicks left14:26
→ lemonsnicks joined14:27
→ vicfred joined14:28
← tangy left14:29
→ tangy joined14:29
→ vitali64 joined14:29
← SleePy left14:30
→ SleePy joined14:30
← derfflinger left14:32
→ dsrt^ joined14:32
← john_johnk left14:34
→ NightMonkey joined14:35
→ mat001 joined14:35
← ash_worksi left14:36
→ thiago joined14:36
← rsx left14:37
→ EvilDMP joined14:37
← FFY00 left14:37
→ ash_worksi joined14:37
← ash_worksi left14:38
← EvilDMP_ left14:40
vitali64 → meowtali6414:41
← tangy left14:42
→ tangy joined14:42
← cdown left14:43
→ cdown joined14:43
← ferdna left14:47
→ Noob1 joined14:47
← dig left14:49
→ laureee joined14:50
→ dig joined14:51
← dionysus69 left14:51
← vladoski left14:51
→ vladoski joined14:52
← enoq left14:53
← causasui left14:58
← toluene left14:59
→ clime joined15:00
→ Guest3345 joined15:01
← tangy left15:03
← ykrons left15:03
→ tangy joined15:03
← chexum left15:06
→ chexum joined15:06
← tangy left15:06
→ tangy joined15:06
← junktext left15:07
← Guest3345 left15:07
→ carl-- joined15:07
→ junktext joined15:08
← carl- left15:10
← gurkenglas left15:10
→ cation joined15:11
→ madewokherd joined15:13
← vladoski left15:13
→ vladoski joined15:13
← Xenguy left15:15
→ Guest3320 joined15:15
← madewokherd` left15:16
→ rsx joined15:26
→ gurkenglas joined15:27
→ zebrag joined15:28
→ srinidhi joined15:28
→ EvilDMP_ joined15:30
← EvilDMP left15:32
← vladoski left15:34
→ vladoski joined15:34
← dsrt^ left15:35
→ dsrt^ joined15:35
→ humanface joined15:35
← arch-angel left15:38
← Guest3320 left15:38
→ FFY00 joined15:38
→ kenanmarasli joined15:42
← EvilDMP_ left15:43
→ lbracher joined15:44
← csm3105 left15:46
→ EvilDMP joined15:46
lbracher Hello! I tried to push my code, but other dev changed something, so I pulled and merged code. I tried to `git rebase -i HEAD~2`, in order to `push --force` thereafter, but I'm not seeing the merged commit when I try to rebase, I see 2 older ones. How can I rebase just this merged commit and the one that comes last? Thanks in advance!15:47
bookworm if you rebase, the merge isn't needed anymore as you are linearizing the graph15:49
← Noob1 left15:51
→ EvilDMP_ joined15:52
→ masber joined15:52
← EvilDMP left15:52
lbracher bookworm, so I just need to push it?15:53
bookworm depends on what you did exactly15:53
as in, whether you reparented your changes or modified theirs15:54
← rsx left15:55
masber hi, I have a gitea server managed by a different person, I used to git push/pull just fine while working on a branch I was given. Now I have created a new branch in my local and trying to push, however git pull freezes https://dpaste.org/64oxV I can't see any meaning message in the output so I have no idea how to proceed, any advice?15:55
bookworm if what you have is a,b,c,e,f and a to c is their stuff then simply push, if you reordered / modified and have a' through to c',e,f you can't and need to force15:56
lbracher bookworm, ok! I'll force then. Thanks!15:57
← vladoski left15:58
→ TomyWork joined15:58
← FinnElija left15:58
→ FinnElija joined16:00
← saroy left16:00
← fxbrain left16:00
→ Jck_true joined16:00
← dsrt^ left16:05
← EvilDMP_ left16:05
→ Noob1 joined16:05
← mat001 left16:05
→ mat001 joined16:06
→ Swahili joined16:06
→ EvilDMP joined16:08
← liberaider left16:10
← cixx left16:10
← Sulky left16:10
← bn_work left16:11
→ ethrl joined16:13
← madewokherd left16:14
← palasso left16:14
→ dtux joined16:14
→ palasso joined16:14
→ cixx joined16:16
← TomyWork left16:17
← ethrl left16:19
→ TomyWork joined16:20
→ fxbrain joined16:20
→ ethrl joined16:21
← TomyWork left16:21
← ethrl left16:22
← Noob1 left16:25
→ cousteau_ joined16:25
← cousteau_ left16:25
← masber left16:27
← drogas left16:30
→ causasui joined16:30
← laureee left16:32
→ Sulky joined16:33
→ pyevery__ joined16:33
← mexen left16:34
← MajorBiscuit left16:35
→ forgotmynick joined16:36
← FinnElija left16:37
← cixx left16:37
→ FinnElija joined16:37
→ ethrl joined16:37
← ethrl left16:38
→ cixx joined16:42
→ timn joined16:45
← timn left16:47
← tusko left16:48
→ tusko joined16:48
→ dsrt^ joined16:50
→ squirrel joined16:51
← reillybrogan left16:55
→ qswz joined16:57
→ reillybrogan joined16:57
qswz Can I made git diff --check ignore trailing whitespace.16:57
→ nate4 joined17:00
← humanface left17:01
osse qswz: see the core.whitespace setting in man git-config17:02
gitinfo qswz: the git-config manpage is available at https://gitirc.eu/git-config.html17:02
osse I'm guessing that --ignore-space-at-eol also fixes it17:02
→ Sasazuka joined17:04
← gurkenglas left17:06
→ gurkenglas joined17:07
← great_taste left17:10
← ___nick___ left17:10
→ great_taste joined17:11
→ ___nick___ joined17:12
← ___nick___ left17:12
→ laureee joined17:14
← dig left17:14
→ ___nick___ joined17:14
→ ethrl joined17:16
→ Betal joined17:16
qswz thanks17:18
← ethrl left17:18
← zeenk left17:18
← Rashad left17:22
→ Sulky_ joined17:23
← bongobrown left17:25
← Sulky left17:26
→ humanface joined17:28
→ thekingofbandit joined17:29
← laureee left17:33
→ madewokherd joined17:33
→ sobkas joined17:34
← reset left17:36
qswz g diff --check --ignore-space-change works but [apply]\n ignoreWhitespace = change in ~/.gitconfig not, weird17:38
← fxbrain left17:39
→ vdamewood joined17:40
qswz whitespace = nowarn as well17:44
→ ethrl joined17:44
← ethrl left17:45
→ littlebobeep joined17:45
→ runlevel_0 joined17:46
→ vinleod joined17:46
← vdamewood left17:47
vinleod → vdamewood17:47
qswz hmm for some reason my alias was diff --cached --check17:48
→ Sasazuka__ joined17:52
← Sasazuka left17:55
← littlebobeep left17:56
← Swahili left17:56
→ littlebo1eep joined17:56
→ john_johnk joined17:57
→ fxbrain joined17:57
← sobkas left18:04
← littlebo1eep left18:05
→ ethrl joined18:06
→ littlebobeep joined18:06
← ethrl left18:07
→ node1 joined18:08
← nate4 left18:10
→ Sulky__ joined18:12
→ sobkas joined18:14
← Sulky_ left18:15
← Sulky__ left18:15
← littlebobeep left18:16
eqw_ → eqw18:17
→ littlebobeep joined18:26
← derpydoo left18:26
← KlungelSmurf left18:32
→ KlungelSmurf joined18:32
← dsrt^ left18:33
← cixx left18:34
← john_johnk left18:38
→ hex_ joined18:38
→ cixx joined18:39
← sobkas left18:39
← cloaker left18:41
← node1 left18:41
→ cloaker joined18:41
→ jonesiDev joined18:43
← vicfred left18:43
← Qudit left18:44
← qswz left18:44
← jonesiDev left18:45
→ sobkas joined18:45
→ zeenk joined18:45
→ vicfred joined18:46
← txtsd left18:49
← meowtali64 left18:51
← coot left18:53
→ meowtali64 joined18:53
← forgotmynick left18:56
← srinidhi left18:58
→ carl--- joined18:58
← gh34 left19:00
→ Guest33 joined19:00
→ dsrt^ joined19:00
→ txtsd joined19:00
← littlebobeep left19:01
← carl-- left19:01
→ structoha1 joined19:03
← meowtali64 left19:05
→ ferdna joined19:10
← sobkas left19:15
→ mexen joined19:18
→ sobkas joined19:18
← gurkenglas left19:18
← sobkas left19:18
→ Noisytoot_ joined19:18
← Noisytoot left19:19
→ sobkas joined19:20
→ lejocelyn joined19:22
← HelloShitty left19:22
← structoha1 left19:23
← ferdna left19:25
← causasui left19:28
← otisolsen70 left19:32
squirrel do you use the 50/72 character rule for git messages? i wonder if should continue to adhere to the rule, it feels a bit limiting, especially the rule for the title19:32
ikke squirrel: I use a soft limit of 50 for the subject19:32
→ littlebobeep joined19:32
ikke So I do go over it from time to time19:33
But in general, I try to still use that19:34
squirrel apparently “50” comes from linux kernel, if you group commits by title length then most of them will have around 50 characters19:35
which sounds to me a rather awful reason for a hard limit of 50 characters19:35
j416 squirrel: I use 50/72 for everything but automated message for things like merges and reversions, which sometimes exceed 50 for the subject.19:35
ikke Having concise titles makes them nicer to read19:35
j416 squirrel: but I make an effort to _always_ have the subject <= 50, and I have my editor wrap at 72 for the body.19:36
→ HelloShitty joined19:36
ikke squirrel: having a limit like that makes you really think about how to summarized the changes as succinct as possible19:36
j416 well, _always_, except for above special cases obviously.19:36
did I just say the same thing 2 times >.>19:36
ikke (or make people use subjects like 'fixes')19:36
j416 out of brain energy19:37
→ bongobrown joined19:37
squirrel ...i mean, if you hold linux kernel commits as an example, you shouldn't be using a limit of 50, since using it means your average commit title length will be less than that of linux kernel19:37
nedbat squirrel: the idea is that a commit is like an email message: a short subject, and a detailed body.19:37
ikke ^19:38
→ coot joined19:38
ikke And like I said, I use it as a soft limit19:38
mackerman Copy editors in various media would love to have all of 50 characters for headlines19:39
→ gas51627 joined19:39
squirrel nedbat: i write an get emails that have long descriptive titles and i get emails with long titles. was that ever a thing?19:41
Noisytoot_ → Noisytoot19:41
nedbat squirrel: none of this is carved in stone, or enforced.19:41
osse I think it ties into the 80 col terminal thing19:43
72 lets you quote a couple of times (> > ...)19:43
squirrel i mean, of course i try to keep my git commit titles brief, but often 50 characters is not enough, and the rule is rather arbitrary19:44
osse 50 leaves room for "Subject: " and "[PATCH 1/5]" before it19:44
squirrel 72 comes from 80 characters minus git log ident of 4 characters minus 4 characters from the right so that text appears centered, but... the 80 characters rule is itself a bit outdated19:45
← remedan left19:45
j416 think of it this way; it makes sense for there to be _some_ limit, and it happens to be 50. You don't _have_ to make it 50 chars, but make it at most that. If we say 50 is too short, let's make the subject 80, then people will say the same thing that 80 is too short, let's make it 10019:45
← hex_ left19:46
osse I think the 72 predates Git itself.19:46
But that works too, I guess19:46
squirrel 50 is just an arbitrary number19:46
ikke 72 = 80 - indentation19:46
→ node1 joined19:47
← cixx left19:47
→ srinidhi joined19:47
← dsrt^ left19:47
squirrel i'm thinking of a hard limit of 88 characters for both body and title. this is what Black uses and this is what i use even though i don't use Black. i sometimes put code into commit messages so that is going to work okay as well19:49
← node1 left19:49
squirrel is there any place where 88 characters wouldn't fit?19:50
osse Within the default size of gnome-terminal, for example19:51
Also punch cards from the 70s19:51
← littlebobeep left19:52
j416 why use something different19:52
osse xterm also defaults to 8019:52
← sobkas left19:52
mackerman Small commit viewers in editors (GitLens in VS Code for example)19:52
→ littlebobeep joined19:52
j416 narrow tmux panes19:53
osse Ancient limits and recommendations became today's defaults19:53
that sums it up quite nicely, I think19:53
squirrel do people really use those defaults?19:54
osse almost no terminal I use is 80 columns wide, if that's what you're asking19:55
→ sobkas joined19:55
ikke half a terminal on my screen is 120 characters19:55
osse The one I'm typing this in is 102, because of panes and display width versus font size19:55
squirrel I looked up screenshots of GitLens and it looks like it can fit more than 50 characters19:55
→ m0viefreak joined19:56
osse I just meant that if you open a plain gnome terminal of xterm today it'll default to being 80 cols wide. And the reasons for that are (I guess) just old habits19:57
Do whatever you want19:57
→ Sulky joined19:57
← Guest33 left19:58
squirrel or maybe i should use 76 characters, then it would fit all the old terminals but still gives enough room for a decent title19:58
mackerman The point of side bar views is to split screen, and where GitLens shows commit messages is usually not very wide https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#side-bar-views-20:00
ikke There is also an art part to it20:00
→ acebrianjuan joined20:01
→ abu joined20:01
← bkircher left20:02
osse It also seems to use a proportional font? So it'll be approx. anyway20:03
← Murr left20:03
→ Murr joined20:04
← ___nick___ left20:04
mackerman Feel free to go nuts in the rest of the commit message. I enjoy finding a thousand word short essay on why, what, and how the improvement was tested.20:06
← donofrio__ left20:06
← RiFo left20:07
→ nate4 joined20:08
→ donofrio joined20:10
← infogulch left20:10
squirrel well, i'm still going to use short titles, since more often than not you only need a few words. but the rule of 50 seems to be defeating its own purpose. but yeah sometimes i like to write a short essay in the body :)20:11
ikke squirrel: I see the 50 charachter limit as a challenge20:12
Can I summarize this change without 50 characters while still conveying what is happening20:12
← nate4 left20:13
← The_Blode left20:15
squirrel this challenge can be hard. right now, i'm cleaning up a branch, rewording commits after converting a file from java to kotlin. in this particular commit, i moved various methods and variables related to client certificate from a class to file level. i'm looking at “Refactor SSLHandler: client cert stuff to file level” and it's already 52 characters20:19
i guess i'm going to lose this time20:19
← Maxattax left20:19
→ hqdruxn08_ joined20:19
ikke I would make no issue out of 52 characters to be honest20:20
→ Maxattax joined20:21
← fxbrain left20:21
← hqdruxn08__ left20:23
→ geosmileus joined20:24
← geosmile left20:27
→ cousteau joined20:28
cousteau I don't know how much on-topic is "git bash for Windows" in this channel, but... it's damn slow!20:29
→ cixx joined20:29
← sobkas left20:30
ikke cousteau: if you have the option, try WSL220:30
cousteau Specifically, every single command has a ~0.5 s penalty. Example, `for i in {1..5}; do date +%s.%N; done`20:31
But... not if I run as admin, for some obscure reason20:31
→ sobkas joined20:31
cousteau ikke: hm, thanks a lot! I might try that, let me see if I can install it20:31
← pyevery__ left20:31
← sobkas left20:33
→ Qudit joined20:33
← cixx left20:35
cousteau ...then again, I seriously doubt my company would allow installing a virtual machine (WSL2 is pretty much a VM, right?)20:35
← Visor left20:35
bremner it's from Microsoft though.20:35
→ Visor joined20:35
bremner not sure if sarcastic...20:36
cousteau It's for my work PC, it's already tainted by MS products anyway20:36
ikke If you have / want to use a linux-like environment on windows, wsl2 is your best option20:36
← lejocelyn left20:37
cousteau Even more than a virtual machine?20:37
...come to think of it, probably yes20:37
cousteau uses Linux on the machines where he gets to decide which OS they run, such as my personal laptop, but for work PCs the story changes20:38
ikke Well, no, to me a VM is still better20:38
for some reason, ssh sessins in WSL2 randomly drop20:38
cousteau Oh20:39
← bynx left20:39
→ Xenguy joined20:39
cousteau git bash is based on Msys2, right? So maybe if I wanted to annoy someone it should be the #msys channel or whatever it's called20:40
→ fxbrain joined20:40
ikke It's msys indeed20:40
← hqdruxn08_ left20:40
→ sobkas joined20:40
cousteau Let me see if I'm able to find a standalone msys console that isn't burdened by anything git related (I guess there should be something like that installed somewhere)20:41
← rgrinberg left20:43
→ hqdruxn08 joined20:44
cousteau Oof... Running bash from the windows command line gives me a very very low latency. Could this be just a problem with the terminal?20:44
← fxbrain left20:45
← keypusher left20:46
← junktext left20:46
→ keypusher joined20:47
← thebombzen left20:47
→ cixx joined20:47
→ junktext joined20:47
← carl--- left20:49
cousteau Seriously, if all this turns out to be an issue with MinTTY, I swear...20:51
← hqdruxn08 left20:52
← cixx left20:52
cousteau Just reinstalled git for windows choosing the Windows cmd instead of MinTTY, that didn't work. I'm more and more confused.20:54
← onizu left20:54
→ derpydoo joined20:56
osse you can install a proper msys2 environment (which git for windows is based on) and install git into that20:59
not sure it helps with speed20:59
the admin thing sounds really suspicious. could it be windows defender? I've had to whitelist cygwin/msys stuff before20:59
cousteau I was looking for the installed Msys2 just to cross-check21:00
osse If you work on Windows on Windows products then I think WSL will be awkward to use, though I haven't actually tried it for real. Just my impressionm of tinkering with it a bit. It seems too VMy21:00
cousteau To see if the problem was with msys2 or with git bash21:00
Well, WSL1 was Wine-style, I would expect that to be less VM-y21:01
osse investigate the admin angle.21:02
it's not like the admin user can use more cpu. there must be some security crap causing it21:02
→ remedan joined21:03
bookworm antivirus can be problematic with executable stuff21:03
osse have you simplied the bash prompt while running these tests?21:03
cousteau So. If I run "C:\Program Files\Git\bin\bash" from a Windows command prompt, without admin rights, it works fine. Feels even faster than MinTTY/msys2 with admin rights.21:04
"the windows command prompt is somehow whitelisted by the antivirus" is a feasible explanation, yes...21:05
osse: one of the tests was a for loop; that shouldn't be affected by the prompt between loop iterations21:06
→ dionysus69 joined21:06
osse true21:06
← eroux left21:07
← coot left21:07
← great_taste left21:07
→ great_taste joined21:07
← humanface left21:07
→ eroux joined21:09
← sobkas left21:10
← abu left21:13
→ Thanzex joined21:13
→ bluekoopa joined21:16
→ cluelessperson joined21:17
cluelessperson is there anyway to ignore everything wiht *, but then specifically include a subdirectory like !/usr/share/some_dir ?21:17
cousteau OK, I created a shortcut that calls `cmd /C "C:\Program Files\Git\bin\bash.exe"` and has the Git icon, and pinned that to my taskbar. I'm calling it fixed.21:17
← littlebobeep left21:18
cousteau cluelessperson: ignore everything inside the dir, but not the dir itself21:18
cluelessperson cousteau, I mean, I'm doing git from the root, and I only want to repo certain files in the FS that I include21:19
cousteau /foo/bar/* !/foo/bar/baz21:19
cluelessperson cousteau, I'm not saying I want to ignore files in the subdirectory21:19
→ sobkas joined21:19
cluelessperson I saying I want to ignore EVERYTHING21:19
but the subdirectory21:19
cousteau Oh, uh... Not sure doing git from the root of your file system is a good idea21:19
cluelessperson * and !/usr/share/some_dir21:19
why?21:19
it's a system I don't otherwise control, but I want to moderate changes to files I care about.21:20
proprietary built embedded bs21:20
cousteau Wouldn't it be wiser to make that specific subdir a git repo?21:20
Oh OK, so it's not an everyday machine, like a PC or something... Still, it doesn't feel right to me, not sure if I'm just being paranoid.21:21
cluelessperson cousteau, no, because there's a handful of them across the system21:22
cousteau, it's fine21:22
I just need the ignore thing to work21:22
cousteau Anyway, /* !/usr /usr/* !/usr/share /usr/share/* !/usr/share/some_dir21:23
I think that's the way to do it21:23
cluelessperson yeah, that's what I'm doing so far21:24
cousteau If you ignore a directory, you can't selectively unignore files/subdirectories from it. So the trick is to not ignore the directory, but everything inside it.21:24
I don't think there's a shortcut to it.21:25
← feriman left21:26
mackerman sudo -u root git clean -fX # good bye system21:26
→ julian joined21:28
← cousteau left21:31
← cation left21:33
→ cation joined21:33
← loulou_ left21:37
← madewokherd left21:42
← sobkas left21:46
→ sobkas joined21:53
← _xor left21:54
← dionysus69 left21:57
← lbracher left22:00
→ pyevery__ joined22:03
← Murr left22:03
→ Murr joined22:03
← lord| left22:04
→ littlebobeep joined22:05
← konrados left22:05
→ konrados joined22:06
→ lord| joined22:09
→ madewokherd joined22:10
← bluekoopa left22:11
← littlebobeep left22:16
→ littlebobeep joined22:17
→ rgrinberg joined22:19
← sobkas left22:22
→ littlebo1eep joined22:25
→ gast0n joined22:25
→ sobkas joined22:27
← palasso left22:27
← littlebobeep left22:27
← bongobrown left22:28
bookworm only if you are in / and the thing is actually a repo22:29
else it would just nuke the cwd repo, same as if you run it as a normal user22:29
→ littlebobeep joined22:30
← littlebo1eep left22:33
← mexen left22:38
← m0viefreak left22:38
← gas51627 left22:39
cluelessperson mackerman, yeah but why would I do that22:43
:P22:43
→ littlebo1eep joined22:47
← littlebobeep left22:48
← rgrinberg left22:48
→ cixx joined22:48
→ rgrinberg joined22:49
← squirrel left22:51
← cixx left22:53
← rgrinberg left22:53
→ rgrinberg joined22:55
→ bluekoopa joined22:56
→ Koeniz joined22:56
← acebrianjuan left22:59
← sobkas left23:01
← lemonsnicks left23:02
← yuljk left23:02
→ MIsAn joined23:02
→ lemonsnicks joined23:03
→ cixx joined23:04
→ sobkas joined23:06
← Murr left23:06
→ Murr joined23:07
← cixx left23:09
→ Guest69 joined23:12
← srinidhi left23:13
→ howdoi joined23:13
← zeenk left23:20
→ cixx joined23:21
← vicfred left23:21
→ vicfred_ joined23:21
← cixx left23:26
← pretty_dumm_guy left23:27
→ Yruama joined23:27
← kenanmarasli left23:28
← vdamewood left23:30
← pyevery__ left23:30
→ nate4 joined23:30
← nyah left23:33
← nivag left23:34
← sobkas left23:35
→ xkoncek5 joined23:36
← xkoncek left23:37
xkoncek5 → xkoncek23:37
← glider left23:37
→ cixx joined23:38
← bloodElk left23:38
← littlebo1eep left23:38
→ nivag joined23:39
← Peng left23:39
← bartman left23:39
← ColdKeyboard left23:40
← eldritch left23:40
← dslegends_ left23:40
→ littlebobeep joined23:40
→ ferdna joined23:40
← fdisotto_ left23:41
← jelmer left23:41
← AsenMx left23:41
→ sobkas joined23:41
← sobkas left23:42
← ringo__ left23:43
← nate4 left23:45
← magic_ninja left23:45
→ bloodElk joined23:46
→ prime joined23:47
→ nedbat joined23:47
→ Peng joined23:47
→ magic_ninja joined23:47
← cixx left23:48
← clime left23:49
→ bambams joined23:51
→ ColdKeyboard joined23:51
→ dslegends joined23:51
← littlebobeep left23:52
→ bartman joined23:52
→ eldritch joined23:53
→ hernan joined23:55
→ jelmer joined23:56
→ robszarka joined23:56
→ littlebobeep joined23:57
→ hbautista joined23:58
← rszarka left23:59
← magic_ninja left23:59

Logs Search ←Prev date Next date→ Channels Documentation