IRCloggy #git 2018-06-29

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.

2018-06-29

→ shinnya joined00:00
← al-damiri left00:02
→ z|bandito joined00:06
osse arooni: The usual thing I think is to run the deploy script automatically when pushing, via a server side hook00:07
← gugit left00:13
→ nivag joined00:13
← moei left00:13
← orbyt_ left00:14
← cagomez left00:14
→ RealUnix3385 joined00:15
→ cagomez joined00:16
← RealUnix28200 left00:17
→ smallville7123 joined00:17
arooni a00:19
← cagomez left00:21
→ thiago joined00:24
→ gordonfish joined00:24
← smallville7123 left00:25
← baxx left00:25
→ andyhuzhill joined00:25
→ smallville7123 joined00:30
→ RealUnix28200 joined00:30
← RealUnix3385 left00:32
← FernandoBasso left00:34
→ pity joined00:34
← ali1234 left00:38
→ lanlink joined00:40
← kfoonamalik left00:40
→ orbyt_ joined00:45
← g00s left00:45
← unpythonic left00:47
← lanlink left00:47
→ durham_ joined00:48
→ BallChang-CN joined00:48
→ amirpro joined00:49
← amirpro left00:51
← durham left00:51
→ fission6 joined00:52
← BallChang-CN left00:52
← fission6 left00:52
→ dendazen joined00:52
← durham_ left00:52
→ BallChang-CN joined00:52
→ ali1234 joined00:53
→ amirpro joined00:53
← lainon left00:56
→ raulp joined00:59
← Mattiaslndstrm left01:02
→ Mattiaslndstrm joined01:02
→ jottr joined01:04
→ finalbeta joined01:07
← jottr left01:09
→ koz_ joined01:11
← koz_ left01:12
→ nicht joined01:13
← nicht left01:13
→ Wetmelon joined01:13
← Sasazuka left01:13
→ supernov2h joined01:13
← supernov2h left01:19
→ Persondude joined01:20
← tubaman left01:20
→ ATMunn joined01:22
← Bobguy left01:23
ATMunn noob question: so i have a folder with some code in it, and i just made a remote repository, how do i set up this folder to link to that remote and push this code to it01:24
→ tomfarr joined01:24
ATMunn the only thing in the remote is a LICENSE file01:24
parsnip ATMunn: i would move what you have locally to a backup folder, then clone your remote to a fresh folder.01:26
ATMunn ok01:26
parsnip otherwise, it sounds like you were headed for making two initial commits, one locally and one remotely, maybe.01:27
ATMunn ¯\_(ツ)_/¯01:27
parsnip this way, your remote commit can be the initial one, clone that, add your local folders to the cloned folder, then commit on top of that. assuming i understood.01:27
or, you can just commit locally, and force push to remote.01:28
if you want to make absolutely sure, maybe we can come up with clarifying questions.01:29
→ Soni joined01:29
→ RealUnix3385 joined01:30
← RealUnix28200 left01:30
← str left01:31
→ cagomez joined01:32
← RealUnix3385 left01:32
→ Lyqyd joined01:33
ATMunn nah i just copied files, cloned repo, put files back in, committed, and pushed01:33
i wasn't sure if there was a simpler way to do that01:33
but this works thanks :)01:33
← ATMunn left01:34
← tombusby left01:34
← cagomez left01:36
→ BustyLoli-Chan joined01:37
BustyLoli-Chan I'm looking at a stack overflow https://stackoverflow.com/questions/47929881/git-fatal-fsync-error-on-sha1-file-bad-file-descriptor which says "The proper solution is not to store your Git repositories on network drives. (I'm not trying to be snarky. This is explicitly not a supported scenario.)" Is that really true?01:38
← inovas left01:39
BustyLoli-Chan I actually get this error a lot when trying to checkout repos to a mapped network drive. I'm wondering if there's a way around this issue. I'd argue that 90% of the time things work great and the other 10% of the time I get this error for seemingly no reason01:39
→ jottr joined01:39
→ Vortex34 joined01:41
→ JrCs joined01:41
→ tombusby joined01:41
← Vortex35 left01:44
→ inovas joined01:44
← jottr left01:44
thiago BustyLoli-Chan: yes, it's true.01:45
don't operate on your repositories on a netowrk drive.01:45
Also, don't use a sharing tool like OneDrive or Dropbox on your repository01:46
← m0viefreak left01:47
→ moei joined01:47
→ tubaman joined01:48
BustyLoli-Chan so there's just no way to do it?01:49
or no way around it?01:49
parsnip i guess git init, remote add, fetch, could have lead to something idiomatic for ATMunn.01:50
didn't feel like a good teaching moment though.01:50
crisis averted^TM01:52
→ apoll0 joined02:02
← smallville7123 left02:02
← tmsmith left02:02
→ envex joined02:04
→ Trieste joined02:04
← apollo left02:04
→ supernov2h joined02:09
→ b1p joined02:12
→ jstimm joined02:13
← supernov2h left02:14
← dviola left02:15
← jstimm left02:17
→ lagothrix joined02:24
← xPucTu4 left02:25
→ kozy joined02:26
→ nicht joined02:34
← nicht left02:34
→ theseb joined02:39
→ BallChang-CN_ joined02:45
→ Puffball joined02:46
← BallChang-CN left02:47
→ bucketm0use joined02:56
→ rohitt joined02:59
← shinnya left03:03
→ dansan joined03:04
← dansan left03:07
→ dansan joined03:07
← m00sehead left03:10
→ red82 joined03:10
← red82 left03:11
← mellernoia left03:13
→ linuxmodder joined03:13
→ supernov2h joined03:14
→ Goplat joined03:17
← bolovanos_ left03:19
← supernov2h left03:19
→ linuxmodder- joined03:20
→ cp7781 joined03:23
← linuxmodder left03:25
← linuxmodder- left03:25
← tomfarr left03:28
→ linuxmodder joined03:28
→ tomfarr joined03:28
← Wetmelon left03:29
← boombatower left03:31
← raven-au left03:35
← RougeR left03:36
→ jottr joined03:40
← Mattiaslndstrm left03:41
← jottr left03:45
→ tangmou joined03:45
← BallChang-CN_ left03:49
→ raven-au joined03:49
← konsolebox left03:52
→ konsolebox joined03:54
← orbyt_ left03:57
→ Anaphylaxis joined03:58
← raven-au left04:01
→ raven-au joined04:03
→ orbyt_ joined04:03
→ ferdna joined04:03
← minionofgozer left04:06
→ minionofgozer joined04:07
→ supernov2h joined04:08
→ xPucTu4 joined04:10
← jmnk left04:12
← supernov2h left04:13
→ phinxy joined04:15
→ Arcatech joined04:15
← tangmou left04:15
← orbyt_ left04:19
jim I got a git project, it's got a submodule... when I pull down the main project as developer, the submodule comes down as developer too...04:25
thing is, I'd like to be able to choose per clone, which (if any) of the main module and the submodule, are pulled down "anon" or as developer04:27
should I put the submodule so it comes down anon off of github?04:27
is there a standard or a best practice for this?04:28
→ Tobbi joined04:29
← xPucTu4 left04:30
→ shinnya joined04:30
→ swalladge joined04:38
→ jmnk joined04:39
→ zulutango joined04:48
→ Mindi joined04:53
→ supernov2h joined04:57
parsnip maybe you can create an extra branch called devel-prod?04:59
and in that branch, you could go into the submodule, change the branch, then go back to your containing project, and commit that change to devel-prod?04:59
→ ivokh joined05:00
parsnip disclaimer: i have very little experience, just basing that off of skimming the docs for submodule.05:00
jim: ^05:00
doesn't the containing project only see which commit is chosen in submodule?05:00
and i don't think you want to commit a change to the submodule branch in your devel branch, but rather, some third branch you make for your own purposes.05:01
← pks left05:02
← shinnya left05:03
← supernov2h left05:03
→ pks joined05:04
→ acidjnk joined05:05
← theoceaniscool left05:06
→ _cyril_ joined05:06
→ jstimm joined05:09
← Lyqyd left05:10
→ Cthalupa joined05:12
→ regedit joined05:15
→ viksss joined05:18
← dendazen left05:18
→ dendazen joined05:19
→ sauvin joined05:21
← cp7781 left05:23
← dendazen left05:24
← dc13ff left05:26
← viksss left05:27
→ igemnace joined05:30
→ theoceaniscool joined05:30
jim parsnip, I didn't even consider the possibility of a different branch...05:31
yeah, right... the containing project gets to commit the commit hash of the contained project(s)05:32
which could be a commit along that branch, if not the latest commit along that branch05:33
← ferdna left05:37
→ BallChang-CN joined05:38
→ jottr joined05:41
← BallChang-CN left05:42
jim also there's a different problem... I want reg anon github users to be able to clone the whole thing including the submodule, but when a not-logged-in user clones the project right now, he has to "log in" in order to clone the submodule05:42
→ BallChang-CN joined05:42
jim would I alter the clone address for the submodule so that it comes in using https?05:43
I'll check back in a bit... please hilite me to respond (and thanks)05:45
← jottr left05:46
→ navidr joined05:48
parsnip jim: maybe config for submodule can use https for url?05:51
→ subhojit777 joined05:51
jim that's a thought... it might be good if a developer checks out both authed, and a nondev checks both out anon05:52
parsnip jim: there's a note, "Since the URL in the .gitmodules file is what other people will first try to clone/fetch from, make sure to use a URL that they can access if possible."...05:52
at https://git-scm.com/book/en/v2/Git-Tools-Submodules05:52
jim right now I'm the only dev05:52
parsnip looks like you can override the url locally.05:52
jim I'll check that out05:53
parsnip ah, you're thinking put the auth only on the dev branch?05:53
i mean, auth url05:53
jim or something like that05:53
← inovas left05:54
jim right now what I could do is adjust the submodule url so it only checks out anon with the surrounding project,,, but then if I want to work on it, I can clone it by itself05:54
← veegee left05:54
jim back in a few... irl stuff :)05:55
← linuxmodder left05:57
parsnip this _is_ real life :)05:57
but maybe you couldn't use afk either.05:57
← igemnace left05:58
→ inovas joined05:59
← Guest2049 left05:59
→ dege joined06:00
→ ShapeShifter499 joined06:00
→ freimatz joined06:01
→ supernov2h joined06:04
→ kindacheesy joined06:06
← kindacheesy left06:06
← flavius left06:08
→ chele joined06:10
← jhaenchen left06:11
→ tangmou joined06:16
← dansan left06:17
→ dansan joined06:17
→ chaosruler_ joined06:18
→ jhaenchen joined06:18
→ JeroenT joined06:23
← jhaenchen left06:23
→ MapMan joined06:25
→ speedmann joined06:26
→ bachler joined06:27
→ raymond__ joined06:28
← chaosruler_ left06:28
→ schleppel joined06:29
→ pfleck joined06:31
raymond__ → raymond06:32
→ dmc joined06:33
← speedmann left06:33
← MapMan left06:33
← supernov2h left06:34
← thiago left06:34
→ martinus__ joined06:35
← pfleck left06:36
→ jhaenchen joined06:36
← jmnk left06:38
→ cp7781 joined06:38
→ xPucTu4 joined06:41
← jhaenchen left06:41
← JeroenT left06:41
→ JeroenT joined06:42
→ jhaenchen joined06:42
→ speedmann joined06:42
← bachler left06:43
→ jmnk joined06:43
→ Dragon092 joined06:44
← theseb left06:44
→ bachler joined06:50
← cp7781 left06:51
→ MapMan joined06:51
← Cthalupa left06:51
→ Cthalupa- joined06:51
→ ekleog joined06:51
→ cp7781 joined06:55
→ supernov2h joined06:55
← jhaenchen left06:55
→ Someguy123 joined06:57
← tangmou left06:59
→ jhaenchen joined06:59
→ CountryNerd_ joined07:00
← Goplat left07:01
← supernov2h left07:01
← CountryNerd left07:02
← subhojit777 left07:03
→ leeN joined07:05
→ Repox joined07:05
→ rfuentess joined07:07
← jhaenchen left07:12
→ abba joined07:13
→ ExeciN joined07:14
← theoceaniscool left07:15
→ Tobbi_ joined07:17
← chele left07:17
→ chele joined07:17
→ gugit joined07:20
→ skisela joined07:21
→ TomyWork joined07:23
→ jhaenchen joined07:26
← chele left07:26
→ charolastra joined07:28
Chipzz is it possible to create a git repo where ppl can only access certain commits when cloning it? lets say I have repo with commits A -> B -> C, and I only wnat to make A available for cloning?07:28
← Arcatech left07:28
← dansan left07:29
→ dansan_ joined07:29
grawity no07:30
parsnip Chipzz: i expect a clone can reach any parent of A07:30
grawity well, kinda if you make a branch that only has A07:30
if A is the *root* commit07:30
parsnip Chipzz: but if B had another child, maybe you can avoid pushing that to repo.07:30
grawity but *not* if A is head and C is root07:30
Chipzz to explain why I want this: lets say I'm giving a presentation with examples; I want to public to be able to follow along, but I don't want them distracted07:30
so the idea is: have a git repo, but only allow them to clone up to A when I haven't explained B07:31
when I have explained B, I enter a command that modifies some state file07:31
grawity clarify 'up to A'07:31
parsnip oh, i'm used to arrows the other way.07:31
grawity do you mean from the oldest, or from the latest?07:31
Chipzz and B "unlocks"07:31
grawity: A is root commit, B depends on A, C on B, etc...07:31
parsnip Chipzz: let's flip arrows for our sake. so A <- B <- C, C is newest?07:32
grawity in that direction it's trivial: push A to the master branch, do the explanation, push B to the same branch07:32
Chipzz parsnip: yes07:32
grawity: except that I may want to give the presentation multiple times and not have to push while giving it07:32
grawity you still have to do *something* in order to "unlock"07:32
Chipzz so prepare git repo up front, have some git hook that limits what you can clone?07:32
grawity what difference does it make whether it's `git push` or something else?07:33
Chipzz a lot?07:33
grawity I don't really see any though07:33
Chipzz echo id_of_commit > unlock_stage07:33
git hook checks unlock_stage file07:33
grawity that's practically the same thing ._.07:33
Chipzz not it's not?07:33
not at all07:33
grawity it is, because updating a branch head does 'echo id_of_commit > refs/heads/master'07:34
Chipzz you can prepare up front by looking up the IDs07:34
and puttinhg these in a shell script07:34
grawity and you can do the same with updating the branch, yes07:34
Chipzz pushing to the branch would be much more intensive because you need to keep your local chckout uptodate?07:34
grawity uptodate in which sense07:35
generally if you already have all commits locally anyway, you can do `git push origin id_of_commit:refs/heads/master`07:35
and, if you have SSH access to the server,07:35
you can even do "echo id_of_commit > refs/heads/master"07:36
→ Puffball_ joined07:36
parsnip this is like hard reset and push?07:36
grawity kinda, except requiring fewer commands07:37
Chipzz grawity: but the initial git clone on the audience side would include clone commit B & C too, if I'm not mistaken?07:37
grawity no07:37
→ chele joined07:37
parsnip stick branch ref on A07:38
grawity if server says that master currently points to commit A, everybody cloning master will get commit A07:38
parsnip you can put a local place holder on C07:38
Chipzz doesn't git pull in *all* objects when you git clone?07:38
grawity no07:38
I'm assuming we're still talking about the case where A is oldest, B is newer, and C is newest07:38
Chipzz yes07:38
parsnip git pull refers to a branch ref, and all parents.07:38
git fetch even.07:38
grawity whether you're talking about pull, clone, or fetch, they always work with only the minimum required objects07:39
← Puffball left07:39
Chipzz parsnip: so why then can I do git checkout to any branch after I cloned the repo?07:39
grawity because a clone downloads all *branches*07:39
← Repox left07:39
grawity and those branches *include* all your commits07:39
don't want those commits? don't include them in any branch07:40
Chipzz k that makes sense07:40
grawity (you can make the server temporarily hide branches via some-or-other git config option, if it's reasonably recent)07:40
Chipzz "progressing" the master ref sounds like what I want, don't think branches would be needed :)07:42
grawity master is a branch.07:42
→ kurkale61 joined07:42
→ jottr joined07:42
Chipzz extra branches :)07:42
grawity you said your repo *has* extra branches, and you implied that you don't want clients to be able to clone them07:42
Chipzz I did? my bad07:42
(where?)07:43
← jhaenchen left07:43
grawity though of course if master is at A at clone time, users won't see those extra commits in master anyway – unless they (accidentally?) switch branches07:43
Chipzz I do assume I would need to configure my repo to disable GC, right? or commit B and C might get gc'ed?07:44
or am I mistaken on this?07:44
grawity well, yes, but an easier way is to point another ref at C07:44
a clone by default only downloads branch refs (refs/heads/*), and those tags which apply to the downloaded commits07:44
→ JeroenT_ joined07:45
grawity so if you have something like refs/backup/master, it won't be cloned by default, but it will still prevent GC07:45
← nowhere_man left07:46
Chipzz ah nice :)07:46
← jottr left07:47
← Praxi left07:48
← JeroenT left07:48
→ silverballz joined07:49
→ Krisostoomus joined07:51
→ xaa joined07:52
→ tarkus joined07:52
→ cdown joined07:54
← Krisostoomus left07:55
→ cdown_ joined07:57
← comps left07:57
→ deathwishdave joined07:58
← cdown left08:00
← hph^ left08:00
→ cur8or joined08:00
cdown_ → cdown08:00
→ hph^ joined08:00
← hph^ left08:00
← j7k6 left08:00
→ hph^ joined08:00
← hph^ left08:00
→ hph^ joined08:01
← hph^ left08:01
→ hph^ joined08:01
← hph^ left08:01
→ hph^ joined08:01
← hph^ left08:01
→ ruslangaripov joined08:02
← ruslangaripov left08:02
→ j7k6 joined08:02
→ komonsterko joined08:05
→ theoceaniscool joined08:08
← cdown left08:09
← _ADN_ left08:10
→ joe2 joined08:11
→ pfleck joined08:12
→ nowhere_man joined08:12
← deathwishdave left08:13
→ keepLearning512 joined08:14
→ comps joined08:14
→ cdown joined08:14
← keepLearning512 left08:15
→ keepLearning512 joined08:15
← \void left08:15
← venmx left08:16
← keepLearning512 left08:20
→ keepLearning512 joined08:21
← raulp left08:23
→ jsqkldhf joined08:30
jsqkldhf Hi, I'm using a git repo in command line on Windows08:30
Is there a tool that can display commits history *in the browser*08:31
with differences between commits, like github?08:31
but a local tool, not requiring a server?08:31
← pity left08:32
→ manuelschneid3r joined08:34
gurrkiin you could use a git tool like sourcetree or something08:37
← cdown left08:37
← dpyro left08:38
→ dpyro joined08:38
← pfleck left08:41
→ Darcidride joined08:45
→ Repox joined08:45
→ bolovanos_ joined08:47
jsqkldhf gurrkiin: is https://www.sourcetreeapp.com/ the most well known tool?08:47
gurrkiin i dunno, i do everything via terminal08:47
most people i work with use sourcetree though08:47
→ crem joined08:48
→ dmone joined08:49
→ pity joined08:52
→ pnepe6 joined08:52
→ jottr joined08:56
← keepLearning512 left08:56
→ g00s joined08:58
→ deathwishdave joined08:59
→ cdown joined09:00
← jottr left09:00
← crem left09:01
← jsqkldhf left09:03
→ crem joined09:04
← goweol left09:05
← apoll0 left09:08
← jmnk left09:08
→ apollo joined09:08
← cdown left09:09
← beerdrop left09:09
← BallChang-CN left09:10
← scarcry left09:11
qsx if jsqkldhf was still here: man git-instaweb09:13
gitinfo the git-instaweb manpage is available at https://gitirc.eu/git-instaweb.html09:13
→ jmnk joined09:13
qsx and there exists a git-instacgit somewhere on the internet for those who prefer cgit over gitweb09:13
→ jhaenchen joined09:16
→ _ADN_ joined09:17
← dansan_ left09:17
← catsup left09:18
→ dansan_ joined09:18
→ catsup joined09:18
→ XVar joined09:18
→ lanlink joined09:19
← catsup left09:19
← g00s left09:19
→ catsup joined09:19
→ z8z joined09:20
← jmnk left09:21
← kurkale61 left09:21
← jhaenchen left09:21
→ jmnk joined09:22
← j7k6 left09:22
→ beerdrop joined09:23
→ j7k6 joined09:23
→ RougeR joined09:25
osse git-instagram09:25
→ keepLearning512 joined09:25
→ pfleck joined09:26
→ neunon joined09:28
→ acetakwas joined09:28
← manuelschneid3r left09:29
← baako left09:30
→ klaidas joined09:30
→ jhaenchen joined09:32
→ kurkale61 joined09:32
← andyhuzhill left09:35
← jhaenchen left09:36
→ duderonomy joined09:37
← keepLearning512 left09:39
← apollo left09:43
→ keepLearning512 joined09:45
→ rfuentess_ joined09:46
→ jhaenchen joined09:46
→ cdown joined09:47
→ apollo joined09:47
→ BallChang-CN joined09:47
→ mofai joined09:49
→ jhaenche_ joined09:49
← keepLearning512 left09:50
← jhaenchen left09:50
← rfuentess_ left09:51
← jhaenche_ left09:54
← pandem left09:55
→ lukas1 joined09:59
← lanlink left10:00
→ lanlink joined10:00
← lankanmon left10:01
→ pandem joined10:03
→ lb joined10:06
→ keepLearning512 joined10:06
← lb left10:06
→ lb joined10:06
→ jhaenchen joined10:06
← DINOWILLIAM left10:07
← lanlink left10:07
← pity left10:09
← keepLearning512 left10:10
→ rafasc joined10:11
← jhaenchen left10:11
← shabius left10:11
→ nadley joined10:12
← lukas1 left10:13
← Kaisyu left10:13
← nowhere_man left10:13
← Repox left10:17
← deathwishdave left10:22
→ jhaenchen joined10:22
→ jottr joined10:24
← regedit left10:24
→ buyfn joined10:25
→ keepLearning512 joined10:26
← jhaenchen left10:29
← cur8or left10:30
← keepLearning512 left10:31
← pfleck left10:33
← ShapeShifter499 left10:39
→ ilyaigpetrov joined10:40
→ ShapeShifter499 joined10:40
→ lankanmon joined10:41
→ deathwishdave joined10:45
→ jhaenchen joined10:47
→ scarcry joined10:47
→ tvw joined10:51
← jhaenchen left10:52
→ dustinm joined10:53
→ supernov2h joined10:54
← dpyro left10:54
→ romanzolotarev joined10:54
_ikke_ put your snapshots on social media10:56
→ CodeSlingerPaul joined10:59
osse I imagine git-Instagram would start out with having beautiful visualizations of logs, obviously made by people who know what they're doing, albeit coming off as slightly hipster.10:59
→ RTZ0x859 joined10:59
davve git stash put-on-instagram10:59
→ kes joined10:59
osse Then after about five years of success gradual becomes overrun by memes and jokes11:00
davve im sure people would love reading out of context code on instagram :D11:00
but I suppose, generating an image from a snippet and posting it on instagram could be useful if you find something funny11:01
would make more sense to have it as an editor plugin rather than coupled to git11:01
perhaps11:01
→ nowhere_man joined11:02
← supernov2h left11:04
→ jhaenchen joined11:05
→ lanlink joined11:06
→ pity joined11:06
→ MarioBranco joined11:07
→ CountryNerd joined11:08
→ keepLearning512 joined11:09
← dansan_ left11:09
→ dansan_ joined11:09
← bolovanos_ left11:10
← jhaenchen left11:10
← CountryNerd_ left11:10
← inovas left11:12
← keepLearning512 left11:13
→ cur8or joined11:14
→ inovas joined11:14
→ BSaboia joined11:15
→ jhaenchen joined11:16
← pity left11:17
← SkyLeach left11:21
→ keepLearning512 joined11:21
→ tijensse joined11:22
→ crmaurei joined11:24
→ Kobaz joined11:24
← jhaenchen left11:26
→ m0viefreak joined11:30
→ str joined11:30
← kurkale61 left11:32
← buyfn left11:38
→ pfleck joined11:40
lb i'd vote for git-flickr ....stay classy11:43
→ brokenshakles joined11:43
← pfleck left11:44
→ plexigras joined11:45
→ kurkale61 joined11:48
→ joe3 joined11:48
→ igemnace joined11:49
← dansan_ left11:49
→ dansan joined11:49
← joe2 left11:50
→ gareppa joined11:52
← gareppa left11:53
→ gareppa joined11:54
← gareppa left11:59
→ discopatrick joined11:59
→ m00sehead joined12:00
→ argoneus joined12:01
← Tobbi_ left12:03
← jmnk left12:05
→ synthroid joined12:06
→ buyfn joined12:07
→ gschwind joined12:07
→ jmnk joined12:08
gschwind hello, what can explain a discrepancy between version ID, I have 3 repository: #1 #2 #3, #3 is remote, #1 and #2 are clone of #3 but #1 and #2 does not share the same head ID12:10
→ marlinc joined12:10
→ Gurkenglas joined12:12
→ chan201 joined12:13
← theoceaniscool left12:13
→ dcpc007 joined12:16
→ cagomez joined12:16
gschwind I think I found hint for my issue, it seems linked to server setup12:17
← jmnk left12:20
← Gurkenglas left12:21
← cagomez left12:21
→ eduardas_m joined12:21
→ jhaenchen joined12:22
→ nd_ joined12:25
→ Wetmelon joined12:25
→ jmnk joined12:26
→ matsaman joined12:27
← jhaenchen left12:28
← matsaman left12:28
→ Gurkenglas joined12:28
→ joe4 joined12:28
← nd left12:28
← CountryNerd left12:29
← chan201 left12:31
→ enhance joined12:32
← joe3 left12:32
gschwind I found that I looked to a diferent repository due to a typo in remote URLs12:32
← jmnk left12:32
→ theseb joined12:33
← nowhere_man left12:33
→ nowhere_man joined12:34
← apollo left12:34
→ jmnk joined12:34
theseb test12:35
← theseb left12:35
→ apollo joined12:37
← ali1234 left12:41
← kiltzman left12:45
→ jhaenchen joined12:49
→ manuelschneid3r joined12:49
← jmnk left12:50
→ kiltzman joined12:51
→ jmnk joined12:51
← jhaenchen left12:53
← kiltzman left12:53
← pnepe6 left12:56
→ linuxmodder joined12:56
→ jhaenchen joined12:59
→ dendazen joined13:00
← Khisanth left13:01
← klaidas left13:01
→ Bobguy joined13:01
→ TheRuckus joined13:04
← Persondude left13:05
← charolastra left13:07
→ sentriz joined13:07
→ Tobbi_ joined13:08
→ psprint joined13:09
→ stolee joined13:11
← plexigras left13:12
← cur8or left13:14
→ Khisanth joined13:14
→ plexigras joined13:14
rafasc TIL about rebase.abbreviateCommands13:16
← jhaenchen left13:16
→ TinkerT joined13:16
→ tangmou joined13:20
→ Case_Of joined13:21
→ jhaenchen joined13:25
→ AndresInSpace joined13:25
→ getSomethingGood joined13:26
← keepLearning512 left13:30
← fstd left13:31
→ fstd joined13:31
← xPucTu4 left13:31
← amirpro left13:32
→ amirpro joined13:33
→ vorpalblade77 joined13:34
← jottr left13:34
← enhance left13:35
← jhaenchen left13:35
→ jhaenchen joined13:35
→ ablackack joined13:36
← amirpro left13:36
→ amirpro joined13:36
← amirpro left13:37
→ amirpro joined13:37
← JeroenT_ left13:38
→ aananev joined13:39
← jhaenchen left13:40
← sentriz left13:41
→ baxx joined13:45
← amirpro left13:46
→ amirpro joined13:46
← j7k6 left13:47
← baxx left13:48
← igemnace left13:48
← brokenshakles left13:49
→ jhaenchen joined13:49
→ enhance joined13:50
→ j7k6 joined13:50
→ boombatower joined13:53
← guideline left13:55
← lanlink left13:57
→ permalac joined13:57
→ xnox joined13:57
← xnox left13:57
→ xnox joined13:57
← joe4 left13:58
← rfuentess left13:58
→ joe4 joined13:58
→ sentriz joined13:59
→ camsbury joined14:03
→ keepLearning512 joined14:03
← m00sehead left14:03
→ jottr joined14:04
→ rpage joined14:05
← plexigras left14:05
← abba left14:05
← jottr left14:09
→ jokoon joined14:10
← riemann left14:11
→ dc13ff joined14:11
← j7k6 left14:11
→ Raed|Laptop joined14:11
→ thiago joined14:12
_rgn osse: I have a bug with git blamediff where it's not showing commit sha for a line that was removed in working tree14:13
→ shinnya joined14:13
→ ferdna joined14:13
rafasc In the middle of a rebase, is there a way choose conflicts in favor of ours or theirs?14:16
→ borkr joined14:16
→ j7k6 joined14:17
rafasc checkout --ours/--theirs -- path; checks out the whole file, I was looking for something similar to how merge -Xours works.14:17
→ roygbiv joined14:18
← gugit left14:19
→ monk12 joined14:21
canton7 rafasc, rebase takes -m, -s and -X options. But no way to change your mind in the middle of a rebase14:22
→ Duailibe joined14:22
← xaa left14:23
→ bket joined14:23
rafasc canton7: yea, my problem is that I have a series well defined commits where some need ours, but others need theirs.14:23
canton7 a mergetool might be your best bet14:24
some of them have options for "take all ours", etc14:24
← acidjnk left14:25
rafasc kdiff3, which is the one I use most of the time has options like that.. I was trying to avoid opening guis.14:25
← jmnk left14:26
rafasc I guess one option is to manually call git-merge-file, with the files from each stage.14:26
→ jottr joined14:29
← apollo left14:29
→ acidjnk joined14:29
← eduardas_m left14:30
→ jmnk joined14:30
→ zmt01 joined14:31
→ apollo joined14:32
← xnox left14:33
← zmt00 left14:35
→ guideline joined14:38
← guideline left14:38
→ _aeris_ joined14:38
← roygbiv left14:42
← deathwishdave left14:42
← jhaenchen left14:42
→ jhaenchen joined14:42
← jhaenchen left14:43
→ jhaenchen joined14:43
← RougeR left14:44
← chele left14:44
← cp7781 left14:46
← str left14:47
← jhaenchen left14:48
← MarioBranco left14:48
→ mostlybadfly joined14:48
→ MarioBranco joined14:50
→ rishi joined14:52
→ guideline joined14:52
← pandem left14:53
→ hdqn joined14:58
hdqn hello, is there a way to use my github user/email for all github repos, without having to add them to every damn repo locally?14:59
→ pandem joined14:59
← skisela left14:59
bremner you can configure them globally15:00
← Duailibe left15:01
→ pfleck joined15:01
bremner see man git config --global15:01
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html15:01
bremner that will be for all repos though, not just github ones15:01
→ xnox joined15:01
← xnox left15:01
→ xnox joined15:01
hdqn yeah, hence the question.15:01
bremner probably not easily. You could write a script to clone from github and set up the repo15:02
hdqn also, `git config --global user.<name|email>` displays the right values for github atm, but git still asks on push15:02
bremner ah. that's about authentication / passwords15:02
hdqn ah, right.15:03
thanks15:03
→ ali1234 joined15:03
← nevodka_ left15:04
→ reu joined15:04
psprint Is it possible to clone recursively, but mute `--progress` for submodules ?15:04
← TomyWork left15:04
→ hiroki joined15:04
← hiroki left15:04
→ hiroki joined15:04
→ pagios joined15:05
← leeN left15:05
← borkr left15:05
← pfleck left15:05
→ nevodka joined15:05
→ Mattiaslndstrm joined15:08
hdqn still no luck :/ `ssh -T github` auths correctly, `git clone [email@hidden.address] clones fine; renaming ~/.ssh/config breaks the clone ability as expected15:10
and yet `git push` asks for a user name15:10
ah, my bad, I forked on gh after cloning, trying to push to the original repo :P15:11
← monk12 left15:12
→ Alystair joined15:13
← thiago left15:13
Alystair how do remove a folder I emptied from repo?15:13
← keepLearning512 left15:13
rafasc Alystair: git rm --cached <removed folder>15:13
hdqn wish the errors were more informative, even GIT_TRACE=2 isn't very helpful if you don't know what to look for15:13
← linuxmodder left15:13
Alystair fatal: pathspec 'json' did not match any files15:14
I guess the git mv command on sub items already got rid of it for upcoming commit? o_O15:14
gschanuel hey15:14
so, i had a huge repository and I want to split it. I did this https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/15:15
hdqn hmm... updated remote url to my fork, but git still asks for username15:15
→ jhaenchen joined15:15
gschanuel ok, now i want to do the same procedure again with another folder15:15
← j7k6 left15:15
← synthroid left15:15
← jhaenchen left15:16
gschanuel I must clone everything again or can i "revert" the files so I can --subdirectory-filter again?15:16
hdqn do I have to clone my fork to get rid of this? If so, how do I keep the commit I just made?15:16
→ jhaenchen joined15:16
← nowhere_man left15:16
grawity if it's not in .git/config, it doesn't exist15:17
rafasc Alystair: git doesn't record directories, So if you moved all files with git mv, and there's no files left, for git that directory doesn't exist.15:17
joe4 → revoltingPeasant15:18
revoltingPeasant I make a log of use of `git for-each-ref --sort=-commiterdate` Is there any way to display the time that the branch was commited at along with this information?15:19
← jokoon left15:19
rafasc hdqn: user.name/email is used for commits, if you want to automate authentication, with ssh you should configure your .ssh/config properly.15:19
hdqn rafasc: I have, `ssh -T github` auths correctly, as I said15:20
cloning my own repo via [email@hidden.address] works too15:20
rafasc hdqn: paste your logs/.ssh/config15:20
→ fmcgeough joined15:21
→ fstd_ joined15:21
→ orbyt_ joined15:21
rafasc hdqn: and be sure your got your remotes url with ssh:// instead of https://15:22
→ leeN joined15:22
rafasc gschanuel: do you have $git subtree available?15:22
→ plitter joined15:22
gschanuel after git filter-branch --prune-empty --subdirectory-filter the other folders were deleted15:24
even from git subtree15:24
← Raed|Laptop left15:24
← fstd left15:24
fstd_ → fstd15:24
gschanuel i'm cloning it again and will make a local copy so I can split it multiple times15:24
rafasc gschanuel: git subtree split -b <branch> --prefix=<directory> HEAD; will split the subdirectory to a new branch, which you can then push to another repo.15:24
gschanuel rafasc, it looks much more practical this way!15:25
rafasc gschanuel: it's slower though.15:25
← tangmou left15:25
→ minionofgozer_ joined15:26
→ tangmou joined15:26
gschanuel rafasc, will it keep the whole history and so on?15:26
← minionofgozer left15:26
rafasc gschanuel: git filter-branch operates on the branch you're on. So if you need to run it more than once, you can always make a new branch and filter it;15:26
gschanuel: git checkout -b <filtered_master> master; git filter-branch etc...15:27
gschanuel and then checkout again to master.. hum15:27
rafasc yeah, then you can push it to another repo using git push other filtered_master:master;15:28
← Gurkenglas left15:29
→ pity joined15:29
← rishi left15:29
→ j7k6 joined15:30
← dmone left15:30
→ rishi joined15:30
→ tangmou_ joined15:30
rafasc gschanuel: with subtree you can do it in one command: git subtree push --prefix <dir> other master;15:31
→ synthroid joined15:31
← floppydh left15:32
→ floppydh joined15:33
→ crose joined15:34
← orbyt_ left15:34
← pity left15:34
← tangmou left15:34
→ unpythonic joined15:38
← crose left15:39
→ orbyt_ joined15:39
← gschwind left15:39
→ mh_le joined15:40
→ cagomez joined15:40
hdqn rafasc: it was the wrong remote url. thanks. :)15:40
have a blast day folks15:40
rafasc hdqn: you too15:40
← hdqn left15:40
mh_le is there a way to for a repository to be on two servers at the same time such that a single push updates them both15:41
→ DINOWILLIAM joined15:42
mh_le ?*15:42
← njbair left15:43
→ njbair joined15:43
rafasc mh_le: git remote set-url --add15:44
mh_le: that isn't really recommended unless the two urls refer to the same repo.15:46
you can get weird behaviour if it manages to push to one, but not the other.15:46
→ gugit joined15:47
mh_le rafasc: I see - it's to have some redundancy backups for my repo15:47
← shinnya left15:51
→ crose joined15:54
→ thiago joined15:54
→ Gurkenglas joined15:55
← jmnk left15:55
← komonsterko left15:56
→ orangePea joined15:57
← dino82 left15:58
→ Murr- joined15:58
→ dino82 joined15:59
← dino82 left15:59
→ dino82 joined15:59
rafasc mh_le: I would say for redundancy, you could add a new remote (with --mirror maybe)15:59
→ pulec_ joined16:01
← argoneus left16:02
← amirpro left16:02
← BSaboia left16:02
→ jmnk joined16:02
← floppydh left16:02
← reu left16:02
→ durham joined16:02
→ reu joined16:03
→ beaky1 joined16:04
← tangmou_ left16:04
→ rory_ joined16:04
→ pasky joined16:05
← gugit left16:06
→ Redfoxmoon joined16:07
→ publio joined16:07
→ arand joined16:07
→ argoneus joined16:08
→ hanneso joined16:08
← plitter left16:08
→ JelmerD joined16:09
← pandem left16:09
← m0viefreak left16:09
← manithree[m] left16:09
→ tango_ joined16:09
→ osse joined16:09
← ExeciN left16:09
→ nyuszika7h_ joined16:11
→ M6HZ joined16:11
← inovas left16:11
→ floppydh joined16:12
→ dopplergange joined16:12
→ PasiFist joined16:14
→ pandem joined16:14
→ m0viefreak joined16:14
→ manithree[m] joined16:14
→ midnightmagic joined16:14
→ Furai joined16:14
→ Mrdoor joined16:14
→ beatzz joined16:14
→ kp__ joined16:14
→ axisys joined16:14
→ cttttt joined16:14
→ sostenuto joined16:14
→ rafalcpp joined16:14
→ sonOfRa joined16:14
→ Calinou joined16:14
→ Mikaela joined16:14
→ Cork joined16:14
→ thnee joined16:14
→ snits joined16:14
→ lhx joined16:14
→ aenesidemus joined16:14
→ batrick joined16:14
→ jiffe joined16:14
→ resoum joined16:14
→ indieross joined16:14
→ luckman212 joined16:14
→ cruxeternus joined16:14
→ muep_ joined16:14
→ Cougar joined16:14
→ quite joined16:14
→ devster joined16:14
→ Blkt joined16:14
→ Live joined16:14
→ danmackay joined16:14
→ sim590 joined16:14
← luckman212 left16:14
← danmackay left16:14
← kp__ left16:14
← axisys left16:14
← cruxeternus left16:14
← jiffe left16:14
← rafalcpp left16:14
→ luckman212 joined16:15
→ axisys joined16:15
→ inovas joined16:15
→ rafalcpp joined16:15
→ danmackay joined16:15
→ pity joined16:15
→ kp__ joined16:15
→ cruxeternus joined16:15
→ uso joined16:16
→ cp7781 joined16:16
mh_le rafalcpp: I haven't been able to dechiper what --mirror does16:16
← gordonfish left16:17
→ jiffe joined16:17
← waltervargas[m] left16:17
← primeos[m] left16:17
← RheaParekh[m] left16:17
← timokoesters[m] left16:17
← massimog[m] left16:17
← abreu[m] left16:17
← manithree[m] left16:17
→ gordonfish joined16:17
← anomie[m] left16:18
← fjorbit[m] left16:18
← KevinMGranger left16:18
← enckse left16:18
→ SleePy joined16:19
→ Polylith joined16:19
→ tterrag joined16:19
→ gugit joined16:20
← pity left16:20
rafasc mh_le: it has to do where/what refs are stored. When you add a remote, git creates a namespace under refs/remotes/<name of remote> .16:21
so when you fetch, the branches from that remote are stored under its own namespace. e.g origin/master16:22
→ enckse joined16:22
rafasc What mirror does is to ignore this namespacing, and copy the refs directly as they are in the remote.16:23
← revoltingPeasant left16:24
rafasc This is nice to mirror remotes from one place to another, as it doesn't make as much sense having one repo as remote of another.16:24
← z8z left16:25
← raymond left16:26
← synthroid left16:26
← TheRuckus left16:26
→ synthroid joined16:27
← jmnk left16:27
← troyt left16:28
← dopplergange left16:29
← crose left16:30
← gugit left16:30
→ TheRuckus joined16:30
← ShapeShifter499 left16:30
← NonParity left16:30
← dc13ff left16:30
← planigan left16:30
← |DM| left16:31
→ raulp joined16:31
→ RandomGuyOnIrc joined16:32
← stolee left16:32
→ ExeciN joined16:32
→ jmnk joined16:34
→ gugit joined16:35
← _ADN_ left16:35
→ plitter joined16:36
→ xPucTu4 joined16:38
→ rnsanchez joined16:38
→ Darcidride_ joined16:38
← kurkale61 left16:38
← buyfn left16:39
→ str joined16:39
→ stolee joined16:39
→ ephemer0l joined16:40
→ z8z joined16:41
← guideline left16:42
→ rsrx joined16:43
← gugit left16:44
→ Rashad joined16:46
→ nowhere_man joined16:47
← jmnk left16:47
→ jrnieder joined16:47
→ amirpro joined16:48
→ Dro joined16:48
Dro Hello16:48
git status, show all my project files to be commited, or I modified just about 8 files16:49
how can I fix this please?16:49
→ dc13ff joined16:49
← jottr left16:50
← synthroid left16:50
← floppydh left16:51
→ pr0ton joined16:53
← stolee left16:54
rafasc Dro: git status tells you how to undo things.16:55
mh_le rafasc: ah cool, thanks16:55
→ jmnk joined16:55
→ roygbiv joined16:55
rafasc mh_le: bit shitty of an explanation, but if you want really good ones, man pages are the way :)16:56
→ guideline joined16:56
→ [Brain] joined16:58
← freimatz left16:58
→ IanLiu joined16:58
← Dro left16:59
beaky1 → beaky17:00
→ mburke05 joined17:01
mburke05 hi guys; i have a branch that when i checkout on it, for some reason checks out on the not latest commit. is there a way to move to the current commit? i've tried `git checkout hash-of-commit` but that leaves me in a detached head state17:02
→ botalolo joined17:03
osse mburke05: if you check out a branch by name then it is the latest commit. there is no way it cannot be17:04
→ pity joined17:04
← ferdna left17:04
osse mburke05: maybe you're confused because the branch has changed upstream?17:04
← ephemer0l left17:04
← dansan left17:05
→ dansan joined17:05
← j7k6 left17:06
→ Miguelngel[m] joined17:06
← Tobbi_ left17:07
→ j7k6 joined17:08
← pity left17:08
mburke05 osse: hmm i may be misunderstanding?17:08
osse yes I think you are17:08
mburke05 osse: on checkout, it goes to a commit i made about a month ago, the first commit, not the latest commit (i think)17:08
→ Tobbi_ joined17:08
← Tobbi_ left17:09
osse mburke05: how do you know the hash of what you think is the latest commit?17:09
mburke05 i'm looking at the record of the commits on the github website17:10
for the branch17:10
osse mburke05: branches on github and branches on your computer are two different things. from your perspective the branch on github is naemd "origin/master" or something like that17:11
so in that case you want to update master to be equal to origin/master17:11
← Puffball_ left17:11
osse !remote_tr > mburke0517:12
gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'17:12
→ Regon joined17:14
→ bebbet joined17:14
→ applecrumble joined17:14
mburke05 so should i delete my local branch and re-fetch it?17:15
or i guess i'm unsure on what to do17:15
→ gugit joined17:15
→ Rashad_ joined17:15
← str left17:15
osse mburke05: if I am right you should git checkout foo; git merge origin/foo17:16
mburke05 i made a PR off of the 2nd commit that its not currently using, could that be why its behaving differently?17:16
osse PRs are irrelevant.17:16
← cdown left17:16
← Rashad left17:16
mburke05 your fix worked perfectly, thank you17:17
i suppose this happened because i made a commit from a different computer17:17
and didnt update my local branch17:17
ChanServ set mode: +o17:17
mburke05 thanks so much for the help17:17
← SipriusPT left17:18
osse de nada17:18
← botalolo left17:18
← xnox left17:18
← T_UNIX left17:19
→ ToBeCloud joined17:19
gitinfo set mode: +v17:20
→ jottr joined17:21
→ orglce joined17:25
← amirpro left17:26
orglce hey.. i have a quick noob question17:27
← jottr left17:27
← duderonomy left17:27
→ Xiti joined17:28
← pulec_ left17:28
→ SolidState_ joined17:29
→ str joined17:29
osse and I have a quick noob answer.17:30
→ amirpro joined17:30
osse perfect match17:30
orglce haha.. when you create a new branch.. should you commit to that branch right away17:31
← Xiti left17:31
osse mburke05: btw, understanding master vs origin/master etc. is imho pretty important to grasp git. I suggest you read the stuff above that the bot spit out and understand it, or ask questions about it17:31
orglce: there's no need for that. commit when you're ready to17:32
← solidstate left17:32
orglce but then master and newly created branch are identical17:32
osse yes17:33
they won't be as soon as you make a commit17:33
← jrnieder left17:33
orglce but master should stay untouched..17:33
osse but there's no rush in doing that17:33
master will stay untouched17:33
→ naoey joined17:33
← xPucTu4 left17:33
orglce ok so you create a branch and commit to it when you are ready?17:33
osse yep17:34
make sure you have that branch checked out when you git commit17:34
after that the branch has a new commit on it, but master will stay exactly as before17:34
orglce oh i see.. ok i get it.. thanks :)17:34
→ dpyro joined17:37
← cagomez left17:39
→ YuGiOhJCJ joined17:40
→ cagomez joined17:40
→ xPucTu4 joined17:44
→ cagomez_ joined17:44
← cagomez left17:45
← thiago left17:46
← IanLiu left17:46
→ buyfn joined17:46
← tvw left17:47
← roygbiv left17:48
Eugene changed the topic to: Welcome to #git, the place for starting the weekend on-time | First visit? Read: https://gitirc.eu | Current stable version: 2.18.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel is logged: https://gitirc.eu/log17:49
Eugene set mode: -o17:49
← cagomez_ left17:49
← comptroller left17:50
← jmnk left17:52
→ Xiti joined17:52
← orglce left17:55
→ cagomez joined17:55
← z8z left17:55
→ crose joined17:56
← RTZ0x859 left17:56
→ graphene joined17:58
← graphene left17:59
→ kqn joined17:59
→ jmnk joined17:59
→ graphene joined17:59
← graphene left18:01
← crose left18:01
→ graphene joined18:01
← graphene left18:02
→ ShapeShifter499 joined18:02
→ netj joined18:02
→ bitslip joined18:02
→ jcarpenter2 joined18:02
→ planigan joined18:02
→ choscura joined18:03
→ MACscr joined18:03
→ graphene joined18:03
← graphene left18:03
→ oojacoboo joined18:03
→ troyt joined18:03
→ jab416171 joined18:03
→ graphene joined18:03
→ anomie[m] joined18:03
→ reactormonk[m] joined18:03
→ manithree[m] joined18:03
→ olbat[m] joined18:03
→ lhunath joined18:03
→ equalunique[m] joined18:03
→ greentrophy[m] joined18:03
→ abreu[m] joined18:03
→ sho45[m] joined18:03
→ apurvapavaskar[m joined18:03
→ primeos[m] joined18:03
→ massimog[m] joined18:03
→ timokoesters[m] joined18:03
→ patrickr[m] joined18:03
→ flo[m] joined18:03
→ waltervargas[m] joined18:03
→ unclechu joined18:03
→ jothibasu[m] joined18:03
→ Demos[m] joined18:03
→ dyce[m] joined18:03
→ RheaParekh[m] joined18:03
→ lkurusa joined18:03
→ hgmnycrkt[m] joined18:03
→ fjorbit[m] joined18:03
→ aviraldg joined18:03
→ oftc_ftw joined18:03
→ marianab[m] joined18:03
→ UncleCJ joined18:03
→ KevinMGranger joined18:03
→ am2on joined18:03
→ Guest18568 joined18:03
→ sweatsuit joined18:03
→ Techie[m] joined18:04
← Rashad_ left18:04
→ cespare joined18:05
← graphene left18:05
→ StrangerVP joined18:05
→ graphene joined18:05
→ Random832 joined18:05
← graphene left18:06
→ graphene joined18:06
← graphene left18:06
→ dopplergange joined18:06
→ meLon joined18:07
← argoneus left18:07
→ zzz joined18:08
→ argoneus joined18:09
← jmnk left18:10
→ comptroller joined18:10
← kqn left18:11
← Xiti left18:14
← MarioBranco left18:17
→ pfleck joined18:17
← vorpalblade77 left18:18
→ thebope joined18:18
→ Sasazuka joined18:18
→ vorpalblade77 joined18:18
→ jmnk joined18:18
→ maiz joined18:20
← maiz left18:20
← buyfn left18:21
→ Xiti joined18:21
← vorpalblade77 left18:22
→ Eryn_1983_FL joined18:22
→ vorpalblade77 joined18:22
← acidjnk left18:22
→ buyfn joined18:23
→ sh3iny joined18:23
→ Arcatech joined18:23
← minionofgozer_ left18:23
← cagomez left18:25
→ jottr joined18:26
← sauvin left18:26
← mostlybadfly left18:27
→ minionofgozer joined18:27
← enckse left18:28
← tarkus left18:29
→ enckse joined18:30
→ thiago joined18:30
← jmnk left18:30
→ acidjnk joined18:30
← jottr left18:30
← njbair left18:34
← gugit left18:34
← Arcatech left18:35
→ jmnk joined18:35
→ Arcatech joined18:36
← buyfn left18:37
→ ok91 joined18:37
→ njbair joined18:37
← skered left18:39
→ cagomez joined18:41
← kes left18:41
→ pawle joined18:43
→ duderonomy joined18:43
← Arcatech left18:44
→ iNCoNFuN joined18:44
→ \void joined18:45
← cagomez left18:46
→ jnavila joined18:47
→ invisbl joined18:48
→ buyfn joined18:48
← duderonomy left18:48
← npgm left18:48
← invisbl left18:49
→ xnox joined18:50
← xnox left18:50
→ xnox joined18:50
← jmnk left18:50
← pfleck left18:51
→ crose joined18:52
LiftLeft2 → LiftLeft18:53
→ duderonomy joined18:54
→ pfleck joined18:55
→ duderono_ joined18:55
← ekleog left18:56
→ jmnk joined18:56
← pawle left18:56
← ExeciN left18:56
→ pawle joined18:57
→ cagomez joined18:57
← crose left18:57
← xnox left18:57
← Someguy123 left18:58
← duderonomy left18:59
← cagomez left18:59
← YuGiOhJCJ left18:59
← MapMan left19:00
→ cagomez joined19:00
← dendazen left19:00
← speedmann left19:00
→ ephemer0l_ joined19:01
→ shabius joined19:02
← duderono_ left19:02
← xcm left19:04
→ xcm joined19:04
→ Rashad joined19:05
→ mizu_no_oto joined19:05
→ xnox joined19:06
← xnox left19:06
→ xnox joined19:06
→ duderonomy joined19:07
← jmnk left19:07
← mizu_no_oto left19:09
← pawle left19:09
→ jmnk joined19:10
← duderonomy left19:12
→ iNCoNFuN_ joined19:14
← iNCoNFuN left19:14
→ iNCoNFuN joined19:15
→ Rashad_ joined19:15
→ Narrat joined19:17
→ duderonomy joined19:17
← Rashad left19:18
← iNCoNFuN_ left19:18
← dc13ff left19:20
← jnavila left19:23
← Eryn_1983_FL left19:23
← planigan left19:24
→ planigan joined19:25
← mofai left19:28
← nowhere_man left19:29
← duderonomy left19:29
→ justsurely joined19:30
→ mostlybadfly joined19:32
← staafl_ left19:32
→ pawle joined19:32
← justsurely left19:33
← ali1234 left19:34
→ fr33domlover joined19:34
→ speedmann joined19:35
← arecaceae left19:35
→ Someguy123 joined19:36
→ arecaceae joined19:36
→ endofexclusive joined19:36
→ duderonomy joined19:38
→ roygbiv joined19:38
→ ekleog joined19:38
→ MapMan joined19:40
HedgeMage Eugene: What is this on-time you speak of?19:40
→ kurkale61 joined19:41
← jmnk left19:42
← pawle left19:42
→ shinnya joined19:42
kurkale61 → kurkale6ka19:43
→ skered joined19:43
← iNCoNFuN left19:44
→ linuxmodder joined19:46
← duderonomy left19:47
→ Rashad joined19:48
← str left19:49
→ jmnk joined19:49
← Rashad_ left19:49
→ duderonomy joined19:50
← duderonomy left19:50
← kurkale6ka left19:51
→ kurkale6ka joined19:52
← roygbiv left19:52
→ plexigras joined19:53
← ToBeCloud left19:56
← cagomez left19:56
_ikke_ HedgeMage: Usually nothing serious, just some light fun in the topic20:00
← fmcgeough left20:01
← Rashad left20:01
→ str joined20:02
→ tonyj joined20:06
← jmnk left20:06
← buyfn left20:06
→ buyfn joined20:07
→ cagomez joined20:08
← amirpro left20:09
← Darcidride_ left20:10
← buyfn left20:11
→ ExeciN joined20:12
→ jmnk joined20:17
→ Eryn_1983_FL joined20:18
← pr0ton left20:18
→ ram_ joined20:20
← schleppel left20:24
→ hexagoxel joined20:24
← inovas left20:25
→ pr0ton joined20:26
← pr0ton left20:26
→ msh3iny joined20:26
→ jottr joined20:26
→ maryo joined20:26
← sh3iny left20:26
→ mikeric joined20:27
← str left20:27
maryo We are planning to migrate from CVS to GIT.. But not sure about the steps on how to perform the migration. Anyone here has done this migration?20:27
→ inovas joined20:30
← orangePea left20:30
← kurkale6ka left20:31
← jottr left20:31
→ nadare joined20:34
→ JanC joined20:36
← jcarpenter2 left20:38
← MACscr left20:39
→ jcarpenter2 joined20:39
cbreak maryo: do you want to keep history?20:40
if so, you might have to find a script somewhere that checks out every commit and commits it in git20:41
→ MACscr joined20:41
← navidr left20:42
maryo cbreak, yep we want to keep history. Some said us to migrate first to SVN and then SVN -> GIT.. Is that the case? Or we can directly migrate from CVS to GIT ?20:42
← TheRuckus left20:42
cbreak no idea if direct works20:42
but svn to git is somewhat trivial20:42
there are at least two ways20:43
cjohnson https://git-scm.com/docs/git-cvsimport20:43
osse i think this was originally written for this purpose: https://gitlab.com/esr/reposurgeon20:43
cbreak git-svn can do it, and there's a direct import script too20:43
cjohnson Doing a 2-step transition seems pretty risky20:43
cbreak not as risky as using cvs in the first place.20:43
← thebope left20:43
→ pr0ton joined20:43
→ str joined20:44
→ jrnieder joined20:44
← njbair left20:44
← ram_ left20:44
→ njbair joined20:44
cjohnson That isn't the comparison though20:44
the comparison is, a cvs->git transition, or cvs->svn->git20:44
and the latter is just inherently riskier20:45
more surface area for things to go wrong20:45
→ kerframil joined20:45
→ jhaenche_ joined20:45
cbreak it's not like the conversion to git will consume the cvs repo...20:45
← jhaenchen left20:45
cjohnson I don't recall saying it would?20:46
Not sure where these strawmen are coming from but I'll help you put the hat on if you like20:46
← jhaenche_ left20:47
→ jhaenchen joined20:47
→ Xiti` joined20:49
← jhaenchen left20:52
← Xiti left20:52
← pr0ton left20:57
→ jonasz joined20:58
← mikeric left20:59
gitinfo set mode: +v20:59
jonasz Hello guys, i currently have a commit where i accidentally pushed a large file, I removed it and recommitted, but for some reason when i push to git, it still blames that the repository is too large20:59
How can i fix this?20:59
→ pr0ton joined21:00
→ Skipp_OSX joined21:00
Skipp_OSX is there a way to switch branches and rebase in the same command?21:00
← cp7781 left21:00
Skipp_OSX problem is, I checkout an old branch, it touches a bunch of files, then I update, it touches some more, so then I go to compile and it looks at the modification times and a little change turns into a huge compile21:01
← dcpc007 left21:01
Skipp_OSX update meaning rebase onto master21:01
→ wootehfoot joined21:01
→ thebope joined21:02
Skipp_OSX even thought there are only a few net changes, it touches many more files depending on how old the branch is to go back in time then forward again so it makes the compile time go way up21:02
← camsbury left21:03
osse Skipp_OSX: there is a syntax for it: git rebase foo bar will be equivalent to git checkout bar; git rebase foo21:03
but I think it just literally does that21:03
← str left21:03
Skipp_OSX really... ok cool thx21:04
I didn't know that shortcut21:04
gxt jonasz: When you say "recommitted", do you mean created a new commit, or edited the commit that introduced the file?21:04
rafasc Skipp_OSX: Don't think it solves your issue though.21:04
jonasz created a new commit, so i have commit 1 wiht file, commit 2 without file, committ3 small change21:04
Skipp_OSX rafasc because it does a checkout followed by a rebase just the same huh21:04
→ pity joined21:04
← discopatrick left21:04
jonasz i just want to push commit 3 i think21:04
rafasc Skipp_OSX: consider checking out the old branch on a different worktree.21:05
tabakhase cherry-picking seems only way around, and thats some creepy way to say "rebase" ;D21:05
Skipp_OSX rafasc unfortunately that is not a great option considering the size of the repo21:05
rafasc git woktree add ... ;21:05
Skipp_OSX: worktrees don't duplicate the size of the repo.21:06
Skipp_OSX oooooh ok I didn't know about that21:06
I thought you just meant make a whole separate instance21:06
gxt jonasz: If you do not want commits 1 and 2 at all, just do `git rebase --interactive @~3` and delete the other two commits, else you could try squashing them the same way.21:06
osse not sure how worktree solves the timestamp problem. in the new worktree ALL files will have newer timestamps21:07
Skipp_OSX ok looking at the docs now this def could be the answer21:07
gxt jonasz: The interactive rebase opens your text editor and contains instructions on how to do that.21:07
rafasc Skipp_OSX: not sure if it hardlinks the files in the worktree, but it definetly doesn't copy the whole history of objects.21:07
it just references the original repo.21:08
jonasz ok let me google that, thanks21:08
gxt Skipp_OSX: If you just want to do some temporary stuff and have enough RAM, add a new worktree under /tmp.21:09
← pity left21:09
rafasc osse: I assumed his problem was something like this: working on feature A, need to check old feature 0.1, do something, go back to feature A, huge compile time because the files got touched by 0.121:09
gxt man git rebase @ jonasz21:09
gitinfo the git-rebase manpage is available at https://gitirc.eu/git-rebase.html21:09
← pfleck left21:10
jonasz thanks21:10
← cagomez left21:10
→ duderonomy joined21:11
← rpage left21:13
← martinus__ left21:15
← ShapeShifter499 left21:16
← getSomethingGood left21:17
← ilyaigpetrov left21:19
→ TheRuckus joined21:20
← Redfoxmoon left21:20
→ Redfoxmoon joined21:20
→ ferdna joined21:21
← boombatower left21:22
→ dendazen joined21:22
→ daquirk joined21:23
← xcm left21:24
→ xcm joined21:24
→ lainon joined21:27
← gschanuel left21:31
← dendazen left21:32
← wootehfoot left21:33
← yates left21:35
→ cfoch joined21:36
← mostlybadfly left21:37
→ cagomez joined21:42
← cagomez left21:42
→ cur8or joined21:43
→ cagomez joined21:43
← jonasz left21:43
← manuelschneid3r left21:45
← dege left21:46
← Salek left21:46
→ diginaut joined21:51
→ x1b4 joined21:52
→ noteness joined21:56
← Skipp_OSX left21:59
← LionsMane left21:59
← pagios left21:59
→ pagios joined21:59
← linuxmodder left21:59
→ qu4ku joined22:02
← dansan left22:03
← AndresInSpace left22:04
← applecrumble left22:06
→ jnavila joined22:07
← ferdna left22:07
→ paraxial joined22:08
Eugene HedgeMage - never sat on a clock eh?22:09
← nadare left22:09
→ FernandoBasso joined22:09
→ cp7781 joined22:10
← daquirk left22:12
→ Salek joined22:12
→ matlock joined22:13
← plexigras left22:15
rafasc Eugene: digital or analog?22:16
→ cathedral joined22:23
← Tobbi left22:24
→ nowhere_man joined22:24
→ jottr joined22:27
→ linuxmodder joined22:29
Eugene Solar22:31
→ m00sehead joined22:31
← jottr left22:32
← rsrx left22:33
← jnavila left22:34
rafasc Eugene: ok, you won.22:34
→ kus_ joined22:34
← thiago left22:36
→ applecrumble joined22:41
← duderonomy left22:42
→ d-fence joined22:42
→ graphene joined22:43
← graphene left22:43
← ok91 left22:45
→ jottr joined22:47
← TheRuckus left22:48
→ graphene joined22:48
← graphene left22:49
→ RougeR joined22:55
← RougeR left22:55
→ RougeR joined22:55
← cur8or left22:56
→ dre_ joined22:58
→ qu4ku_ joined22:58
← qu4ku left23:00
← finalbeta left23:04
← Narrat left23:05
← qu4ku_ left23:05
→ YuGiOhJCJ joined23:07
← netj left23:07
→ netj joined23:08
← SolidState_ left23:11
← Salek left23:11
← lainon left23:12
→ rneco joined23:13
← tubaman left23:15
→ tubaman joined23:15
→ solidstate joined23:15
→ pity joined23:16
→ lainon joined23:19
← pity left23:21
→ bolovanos_ joined23:23
← Xiti` left23:23
→ Xiti joined23:24
HedgeMage LOL23:24
→ nvh^ joined23:25
← ming left23:26
→ cdown joined23:28
← cp7781 left23:29
← bolovanos_ left23:30
← xcm left23:31
→ xcm joined23:31
← jrnieder left23:31
→ mikemcowie joined23:32
→ thiago joined23:32
← acidjnk left23:34
→ durham_ joined23:34
→ graphene joined23:34
axisys how do I find out when there was a file in git? I do not see it in master23:35
bremner git log -- the-file-name23:35
← graphene left23:37
→ graphene joined23:37
← durham left23:38
← unpythonic left23:38
axisys git log -- file-name did not find it .. I am testing with a file that is here23:39
← thebope left23:40
osse axisys: is it in a subdir?23:41
← j7k6 left23:41
axisys ah.. **/file-name worked ..23:42
osse: right23:42
→ j7k6 joined23:42
→ Salek joined23:43
→ pi__ joined23:43
← matlock left23:44
axisys so it also shows the hash/commit when the file appeared/disappeared.. correct?23:45
osse it will show the commit that changed it last23:46
so if it doesn't exist currently that necessarily has to be where it was removed, yes23:46
axisys cool!23:46
← leeN left23:47
axisys how do I find out when was the first commit started .. not for a specific file.. but "globally"23:49
osse axisys: you can use --diff-filter to get precisely what you're looking for23:49
git log --reverse, I suppose23:49
parsnip commit started? i thought a commit happens exactly once.23:51
axisys osse: that worked.. whats the usage for --diff-filter ?23:51
osse axisys: it's sort of in the name.23:52
you can use it to look only for additions or only deletion for example23:52
axisys $ git log --diff-filter23:52
fatal: Option '--diff-filter' requires a value23:52
← durham_ left23:53
axisys ah.. git log --diff-filter filename .. gotcha23:53
osse no23:53
--diff-filter=D or --diff-filter=AM or whatever23:53
← watabou_ left23:54
→ watabou_ joined23:54
← graphene left23:56
→ durham joined23:56
→ graphene joined23:56
← RougeR left23:57
axisys osse: git log --diff-filter=AM or D only shows commit hash .. not what changed.. I like the log -- **/filename23:58

Logs Search ←Prev date Next date→ Channels Documentation