IRCloggy #git 2018-04-01

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-04-01

← weez17 left00:00
→ weez17 joined00:00
→ watsonjar2 joined00:02
← theology left00:02
Sheilong tango_: Thank you a lot for your help00:02
tango_ Sheilong: yes, or cherry-pick00:03
Sheilong: you're welcome00:03
← watsonjar left00:05
← ephemer0l_ left00:06
Sheilong cherry-pick plus branchename?00:06
← \void left00:07
← mud left00:08
← g00s left00:09
← Sheilong left00:11
→ nowhereman_ joined00:12
← rafasc left00:15
→ rafasc joined00:16
← Fysicus left00:16
← tunekey left00:16
→ Fysicus joined00:16
→ czart_ joined00:17
→ PioneerAxon_ joined00:18
→ tunekey joined00:18
→ weijin joined00:20
← PioneerAxon left00:20
← czart__ left00:21
← weijin left00:21
→ ephemer0l_ joined00:23
← hays left00:23
→ weijin joined00:25
← mostlybadfly left00:26
→ g00s joined00:32
← fr33domlover left00:32
← Mattiasl_ left00:33
← Fysicus left00:33
→ fr33domlover joined00:33
→ Fysicus joined00:34
→ Sheilong joined00:35
← armyriad left00:35
← ecuanaso left00:38
← Kanyinsola left00:41
← Sheilong left00:41
← Fysicus left00:41
→ Fysicus joined00:41
→ jacekbogdanski joined00:42
← rafasc left00:47
→ rafasc joined00:48
→ ecuanaso joined00:48
← Fysicus left00:48
→ widp joined00:48
→ Fysicus joined00:48
← m0viefreak left00:51
→ Jahhein joined00:51
→ rf` joined00:51
← envex left00:52
← rf` left00:52
→ hays joined00:52
← hays left00:52
→ hays joined00:52
→ envex joined00:52
← jacekbogdanski left00:53
→ armyriad joined00:56
← armyriad left01:00
→ endiruna joined01:01
→ armyriad joined01:01
→ rocketmagnet_ joined01:04
← rosco_y left01:06
← rocketmagnet left01:07
→ ShockingIsntIt joined01:13
→ linuxmodder joined01:15
← ecuanaso left01:18
→ xaxxon joined01:19
→ finalbeta joined01:19
← xaa left01:23
← dermoth left01:24
→ dermoth joined01:25
→ ecuanaso joined01:26
← envex left01:26
→ envex joined01:27
← crtcji left01:28
→ crtcji joined01:29
← HuskyApo_ left01:31
← linuxmodder left01:33
→ Nizumzen joined01:33
→ linuxmodder joined01:33
← jready left01:35
← ecuanaso left01:35
→ jready joined01:36
← xaxxon left01:37
← jready left01:38
→ xaxxon joined01:38
← crtcji left01:43
andres_f → andres01:43
← ilbot3 left01:46
← weijin left01:49
← beuker left01:53
← Tobbi left01:54
→ weijin joined01:54
→ ilbot3 joined01:58
← blackwell_ left02:01
← rafasc left02:03
→ rafasc joined02:08
← joshbright left02:09
→ dreiss joined02:09
→ crtcji joined02:11
← Some_Person left02:12
→ HuskyApo_ joined02:16
→ Some_Person joined02:18
← Some_Person left02:18
→ Some_Person joined02:18
← rafasc left02:18
→ ismithers joined02:21
→ noobineer joined02:22
← phluks left02:23
← Nizumzen left02:23
← sentriz left02:30
← hays left02:32
← drodger left02:34
→ drodger joined02:36
→ max3 joined02:41
← ismithers left02:43
← boombatower left02:44
→ hays joined02:44
← piggah left02:48
← HuskyApo_ left02:48
← hays left02:49
→ hays joined02:49
← hays left02:49
→ hays joined02:49
← hays left02:53
← alexpainen left02:54
← crtcji left02:54
→ nuttingd joined02:55
→ lagothri1 joined02:55
→ crtcji joined02:56
← remote left02:58
← lagothrix left02:59
← endiruna left03:00
← noobineer left03:03
← crtcji left03:04
→ noobineer joined03:05
→ crtcji joined03:05
← polyrob left03:10
→ Lyqyd joined03:11
→ shakalaka joined03:13
→ polyrob joined03:13
← polyrob left03:13
→ polyrob joined03:13
← crtcji left03:13
→ crtcji joined03:14
← Some_Person left03:15
→ rafasc joined03:15
→ fstd_ joined03:17
→ Some_Person joined03:18
← Some_Person left03:18
→ Some_Person joined03:18
← Jahhein left03:19
← fstd left03:20
fstd_ → fstd03:20
← crtcji left03:21
→ piggah joined03:21
← energizer left03:24
← xaxxon left03:25
← pilcrow left03:27
→ jost__ joined03:29
→ hays joined03:30
→ xaxxon joined03:32
← jost_ left03:32
→ pilcrow joined03:36
→ crtcji joined03:42
← crtcji left03:43
← govg left03:44
→ checkItOut joined03:44
→ crtcji joined03:45
→ safe joined03:45
← heroux left03:46
→ govg joined03:46
→ heroux joined03:47
← checkItOut left03:48
→ checkItOut joined03:51
← govg left03:51
← crtcji left03:52
→ crtcji joined03:52
→ HuskyApo_ joined03:53
← crtcji left03:53
→ crtcji joined03:55
→ govg joined03:59
← rafasc left04:00
→ rafasc joined04:00
← rafasc left04:00
← RougeR left04:00
→ rafasc joined04:01
← nuttingd left04:03
← dviola left04:03
→ Raed|Laptop joined04:03
→ testnick123 joined04:03
← govg left04:03
→ m1n joined04:03
← noobineer left04:04
← crtcji left04:04
→ crtcji joined04:05
→ ciscobandit joined04:06
← ciscobandit left04:08
← dreiss left04:09
← mrBen2k2k2k_ left04:13
← mrBen2k2k2k left04:13
← UniFreak left04:14
→ UniFreak joined04:14
← checkItOut left04:18
→ pd2000 joined04:20
→ asphyxia joined04:20
← pd2000 left04:21
→ pd2000 joined04:21
→ boshhead joined04:21
→ dreiss joined04:25
← ptarp left04:26
→ Crypt0x_ joined04:33
← crtcji left04:36
← Crypt0x left04:36
Crypt0x_ → Crypt0x04:36
← piggah left04:36
→ crtcji joined04:37
→ IndianArya joined04:37
← crtcji left04:38
← IndianArya left04:39
← weijin left04:39
def_jam → eb0t04:40
→ shinnya joined04:54
← testnick123 left04:56
← pd2000 left04:56
→ asphyxia_ joined04:57
← asphyxia left04:57
→ weijin joined04:58
← hays left05:01
← lpapp__ left05:02
→ energizer joined05:03
→ piggah joined05:03
← pks left05:04
→ pd2000 joined05:05
→ pks joined05:05
← cybrNaut left05:07
→ CheckDavid joined05:18
← xaxxon left05:21
→ xaxxon joined05:23
← byte512 left05:24
→ agio joined05:25
← Some_Person left05:25
→ p_d joined05:25
→ Some_Person joined05:26
← Some_Person left05:26
→ Some_Person joined05:26
→ byte512 joined05:26
← p_d left05:26
→ p_d joined05:27
← p_d left05:27
← pd2000 left05:28
→ p_d joined05:29
← p_d left05:29
→ p_d joined05:30
→ cybrNaut joined05:30
← p_d left05:31
← weijin left05:31
→ p_d joined05:31
← p_d left05:32
→ IndianArya joined05:32
→ p_d joined05:32
← HuskyApo_ left05:32
← p_d left05:33
→ p_d joined05:34
agio hi, I just learned how to run `git diff' using different algorithms, patience, minimal, histogram etc . My question is: the `git diff` command only prints diffs, how do I use those same algorithm when actually staging? or if I want to stage using `add --patch' ?05:34
← p_d left05:35
dalias ?05:35
→ checkItOut joined05:35
→ p_d joined05:35
← p_d left05:36
→ p_d joined05:37
← p_d left05:37
← checkItOut left05:37
Peng_ I didn't know about that option. :O (I just found the doc.)05:38
← shakalaka left05:39
→ zefferno joined05:40
agio yeah its cool. and newer versions support a --anchor=... option to allow you to control how diff looks too05:40
→ checkItOut joined05:40
← h12o left05:41
→ HuskyApo_ joined05:42
→ shakalaka joined05:42
← ArcaTech left05:44
← zefferno left05:45
→ weijin joined05:47
→ clue joined05:48
← clue left05:48
← PioneerAxon_ left05:53
→ muelleme_ joined05:55
→ Bobdude joined05:56
→ jimmyrcom joined05:57
→ czart joined05:58
← czart_ left05:58
← IndianArya left05:59
← Raed|Laptop left06:00
→ Mattiaslndstrm joined06:00
→ Frogging101 joined06:03
← muelleme_ left06:05
→ zefferno joined06:05
← Mattiaslndstrm left06:05
→ pd2000 joined06:06
← pd2000 left06:06
→ rexan joined06:08
← shakalaka left06:08
← orbyt_ left06:11
← xaxxon left06:14
→ orbyt_ joined06:14
← asphyxia_ left06:15
→ asphyxia joined06:15
← Lyqyd left06:16
← thiago left06:16
→ shakalaka joined06:17
→ King_Hual joined06:18
← jimmyrcom left06:18
← checkItOut left06:19
→ Jahhein joined06:21
→ Mike11 joined06:22
← shakalaka left06:24
→ tkore joined06:27
→ shakalaka joined06:30
← ZyX-I left06:30
← dreiss left06:30
→ ZyX-I joined06:31
→ hays joined06:39
← rocketmagnet_ left06:39
← piggah left06:40
← hays left06:41
← HourGate_ left06:47
→ HourGate_ joined06:47
→ IndianArya joined06:48
→ phinxy joined06:50
← Crypt0x left06:53
← shakalaka left06:53
← LichtMacher left06:55
← nevodka left06:56
← rafasc left07:00
← bwn left07:01
← Goplat left07:01
← Oatmeal left07:02
→ h12o joined07:04
→ rokups joined07:05
→ dreiss joined07:06
← max3 left07:06
← Jahhein left07:08
← h12o left07:08
← diogenese left07:13
← IndianArya left07:16
← thallada left07:16
← rexan left07:17
→ jleclanche joined07:18
→ xaa joined07:19
→ rexan joined07:20
← Puffball left07:22
→ thallada joined07:22
→ shakalaka joined07:24
← Arokh left07:26
← Mike11 left07:26
← _aeris_ left07:26
→ kes joined07:26
← CheckDavid left07:27
→ _aeris_ joined07:29
→ chaosruler joined07:31
→ Arokh joined07:33
→ Gurkenglas joined07:34
← shakalaka left07:37
→ Kanyinsola joined07:39
→ ArcaTech joined07:39
← Kanyinsola left07:39
→ schleppel joined07:39
osse agio: Several commands accept the same options git diff does07:40
But I'm not sure add -p is one of them. It ignores some other settings too07:41
→ diogenese joined07:41
→ Wulf joined07:41
Wulf Good Morning07:41
Why does a "git fsck" take many gigabytes of memory?07:42
→ shakalaka joined07:42
Wulf repo is a copy of linux kernel07:42
_ikke_ Linux has a large history07:42
← sauvin left07:42
_ikke_ There is a recent thread on the mailing list where they try to do some optimizations07:43
← g00s left07:44
_ikke_ Wulf: https://public-inbox.org/git/20180228092722.GA25627@ash/07:44
But that's more about gc, not fsck07:44
← mniip left07:44
_ikke_ But they do have some overlap07:44
→ blackmesa joined07:46
Wulf hmm.. my machine needed about 10 gigabyte memory07:46
→ jacekbogdanski joined07:46
agio osse: ah ok, I wondered if something like that was the case, but when I run `git add --diff-algorithm patience .' git throws : error: unknown option `diff-algorithm'07:47
→ sauvin joined07:47
Wulf _ikke_: so reducing the usage by a measly 148 MB wouldn't help much :)07:47
→ RahulAN joined07:47
← RahulAN left07:48
widp So how are branches fore remotes etc.. represented.07:51
→ muelleme_ joined07:51
widp when I am doing operations with git, I see things remote-name/branch-name but for some commands it is also remote-name<space> branch-name.07:52
also, can I operate directly on remote branches?07:52
← arecaceae left07:53
→ arecaceae joined07:54
← orbyt_ left07:54
agio some commands like `git push <remote>' <branch> assume the remote branch as <branch>07:55
yes you can operate directly on remote branches using commands like `git push' or `git fetch'07:56
widp What I mean is, I have a remote repo which I want to undo a commit for.07:56
how do I go about doing this?07:56
barteks2x I ended up with a lot of empty directories accidentally, scattered all oiver my project. Git doesn't see them because they are empty. Any way to delete them?07:57
agio I would change the commit on your local branch to what you want - then `git push --force <remote> <branch>07:57
widp agio: so that makes it so that the remote history is re-written?07:58
agio widp: the `--force' option makes git override the history of the remote with your local branch07:58
widp I see, thank you agio07:58
agio yes it will re-write - but thats what you wanted, right?07:58
widp: Important to make sure you are checked out to the corresponding local branch07:59
otherwise you can git a refspec like:08:00
git push --force <remote> refs/heads/<local_branch>:refs/heads/<remote_branch>08:00
widp what's a respec?08:01
*refspec08:01
agio if you are not checked out to correct branch08:01
barteks2x For every .java file in my project, I accidentally made an empty directory with name "FileName.java;"08:01
← rexan left08:01
_ikke_ widp: It's the syntax that tells git how to map one set of refs to another set of refs (when pushing or fetching)08:01
agio widp: a way to reference any branch you want local, remote, remote tracking etc...08:02
→ tarkus joined08:02
widp so, one other thing that I was having trouble with was git pull.08:02
_ikke_ Wulf: right08:02
← safe left08:03
widp I thought I had to specify a branch everytime I did a pull, or it would only work with the current checked out branch.08:03
Surprisingly for a co-worker, the entire repository was changed on a git pull, instead of the currently checkout out branch.08:03
How could this have happened?08:03
agio widp: I think it depends on your config and whether your local branch is setup to track the local08:03
widp: not sure I follow - your coworker did a git pull - and what changed?08:04
widp all of his branches not just his currently checked out branch08:05
← polyzen left08:05
agio ah right08:05
→ piggah joined08:05
← dreiss left08:05
_ikke_ Wulf: You can try playing with config settings like core.packedGitLimit08:05
agio widp: do you know if it actually did the merge or did it just fetch all remote branches down to local remote tracking branches?08:08
without merging?08:08
widp It merged changes which didn't have conflicts.08:08
basically my-feature branch, which he wasn't working on.08:09
← blackmesa left08:10
← ArcaTech left08:13
→ sammyg joined08:13
→ TSS_ joined08:14
→ kgrimes joined08:16
→ coco joined08:19
agio widp: wow thats surprising. I can't remember the last time I used "pull" I only ever use "fetch" - then I review what I'm going to merge to avoid the very types of problems your co-worker had08:19
→ dmc joined08:20
→ IndianArya joined08:21
widp agio: yeah it had to do with some configuration he had I think08:24
→ MutantMahesh joined08:26
← MutantMahesh left08:27
→ opalepatrick joined08:27
→ MACscr_ joined08:29
→ m1dnight_ joined08:29
← dskull left08:29
← fcanela left08:30
← zizzfizzix left08:30
← jstein left08:30
→ fcanela joined08:31
← MACscr left08:31
→ zizzfizzix joined08:31
← zizzfizzix left08:31
→ zizzfizzix joined08:31
→ dskull joined08:32
→ __rob joined08:33
→ blackmesa joined08:33
← Bobdude left08:34
← __rob2 left08:35
← jacekbogdanski left08:36
← blackmesa left08:40
→ nowhere_man joined08:41
← martybr left08:42
→ martybr joined08:43
← nowhereman_ left08:45
→ jacekbogdanski joined08:45
← muelleme_ left08:47
→ p0s1x joined08:48
← drodger left08:50
← energizer left08:51
← cfoch__ left08:53
← martybr left08:55
→ martybr joined08:55
← kgrimes left08:55
← p0s1x left08:56
→ drodger joined08:56
→ phluks joined08:57
← tarkus left08:58
→ rominronin joined08:59
← luckman212 left09:00
→ luckman212 joined09:00
← phluks left09:01
→ h12o joined09:01
→ phluks_ joined09:01
→ escproxy joined09:01
← m1n left09:02
← escproxy left09:03
→ p0s1x joined09:04
→ sentriz joined09:05
← xaa left09:05
← p0s1x left09:06
← h12o left09:08
→ escproxy_ joined09:14
→ p0s1x joined09:14
← martybr left09:17
← staafl_ left09:17
→ m1n joined09:18
→ buyfn joined09:18
→ tarkus joined09:19
→ borkr joined09:19
← catsup left09:19
→ catsup joined09:19
← p0s1x left09:20
← kiltzman left09:20
← catsup left09:20
→ catsup joined09:20
← linuxmodder left09:21
← thxffo left09:21
← duderonomy left09:22
← Mrdoor left09:22
→ kiltzman joined09:22
→ tymczenko joined09:22
← jacekbogdanski left09:23
→ Mrdoor joined09:24
← Mrdoor left09:27
→ crtcji joined09:27
← escproxy_ left09:28
→ buyfn_ joined09:28
→ Mrdoor joined09:29
← buyfn left09:29
← m1dnight_ left09:30
← fr33domlover left09:30
← crtcji left09:30
← tombusby left09:30
→ tombusby joined09:31
→ martybr joined09:33
→ thxffo joined09:33
→ linuxmodder joined09:36
→ jay-m joined09:36
→ glebihan joined09:37
→ jacekbogdanski joined09:38
→ khisanth__ joined09:39
→ Phylock joined09:40
← m1n left09:41
← HuskyApo_ left09:41
→ h12o joined09:41
← jay-m left09:42
← khisanth_ left09:43
← linuxmodder left09:47
← asphyxia left09:51
← rokups left09:52
← rominronin left09:52
→ asphyxia joined09:53
→ Oatmeal joined09:53
→ rominronin joined10:00
→ jay-m joined10:01
→ ensbro joined10:06
→ wandering_vagran joined10:06
← h12o left10:06
garo Situation: Foo is working on a project, I decide to contribute, clone and make commits. Right before sending a pull request I notice Foobar also did some commits.10:07
← n0body left10:07
garo I notice it's trivial for me to merge Foo's commits in my rep, so i do this and after that i send the pull request10:07
Is this the correct way of doing this ? If Foo accepts, I assume his branch will contain the 'strange' commit: Merge remote-tracking branch 'Foo/master' ...10:07
← piggah left10:08
→ threenuc joined10:09
← rominronin left10:10
→ rominronin joined10:11
→ p0s1x joined10:11
→ Singmyr joined10:13
← rominronin left10:15
agio garo: rebase was prob better option10:15
garo don't know it but i'll look it up. Thanks !10:16
StephenS I disagree, I would always pull / merge before trying to send pull request10:16
agio I guess, but with the rebase you wont get the extra merge commit10:18
garo Results will be the same ?10:19
Results = code in the final commit10:19
← p0s1x left10:20
→ n0body joined10:20
→ staafl_ joined10:20
garo because in that case rebase sounds idd like a better option, are there disadvantages ?10:21
agio garo: I think the path you take to get to the final commit may be a little different because the order in which the commits were applied will change - but I think if ther are no conflicts the final code will be the same in either strategy10:22
← drodger left10:22
→ endiruna joined10:22
→ ok91 joined10:22
← weijin left10:23
agio garo: the big disadvantage - or more risk - with the rebase is that you are re-writing history10:23
← jay-m left10:23
← sleepingforest left10:24
agio so you generally will have to make sure you haven't pushed your original version out to other developers10:24
→ drodger joined10:24
→ escproxy joined10:26
→ threenuc_ joined10:27
→ HuskyApo_ joined10:27
→ jottr_ joined10:29
← sammyg left10:29
agio StephenS: are you thinking of the case where your branch hasn't diverged from the origin/servers? in that case a pull merge would work _and_ you would get a clean history but inthe case your branch has diverged you get the problem with messy history that garo is having10:30
← threenuc left10:30
→ Fernando-Basso joined10:31
→ threenuc joined10:31
← threenuc_ left10:32
agio to me thats another example of why I dont pull, I fetch first - then you can see if you have diverged, then you can chose a strategy - if you pull - I don't think you get the opportunity to choose10:32
→ threenuc_ joined10:33
← threenuc left10:36
→ Nizumzen joined10:38
→ p0s1x joined10:40
→ jay-m joined10:41
→ iNCoNFuN joined10:41
→ rominronin joined10:43
← IndianArya left10:43
→ IndianArya joined10:43
→ weijin joined10:48
← asphyxia left10:51
cbreak agio: you made your choice.10:52
← buyfn_ left10:52
← weijin left10:53
← jacekbogdanski left10:53
→ asphyxia joined10:53
→ weijin joined10:57
← rkta left10:58
← weijin left10:59
→ weijin joined10:59
← rominronin left10:59
→ rominronin joined11:00
← iNCoNFuN left11:02
→ rkta joined11:03
← rominronin left11:05
← Oatmeal left11:06
← neunon left11:08
← rkta left11:09
→ neunon joined11:10
→ Oatmeal joined11:13
← glebihan left11:17
← bket left11:19
→ glebihan joined11:20
→ venmx joined11:21
← Thominus left11:22
→ Thominus joined11:22
→ dermoth_ joined11:25
← dermoth left11:25
dermoth_ → dermoth11:25
← ok91 left11:25
← phluks_ left11:27
→ pfleck joined11:30
→ mkalfon_ joined11:36
← zefferno left11:36
→ Tobbi joined11:37
→ rkta joined11:40
← asphyxia left11:42
← p0s1x left11:43
→ jnavila joined11:43
← pfleck left11:44
← ensbro left11:45
← joekeilty left11:47
→ p0s1x joined11:51
→ Chetic joined11:55
← stoopkid left11:57
Chetic Why am I getting this error when I run git clone on my windows machine?: "fatal: 'cider' does not appear to be a git repository"11:57
sshd accepts the key fine and I can log in if I change the git user's shell11:57
StephenS Chetic, path is probably wrong, or cider is not a git repo11:58
so .../full/path/to/cider11:59
so usually you have protocol, hostname ...:/path/to/cider12:00
→ RougeR joined12:00
← RougeR left12:00
→ RougeR joined12:00
Chetic don't have to specify absolute paths when cloning from a linux machine - is this a windows thing?12:00
specifying absolute path did not work12:01
StephenS it's not a linux/windows way, it's just a way to be explicit and to ditch possible errors12:01
Chetic the same git clone line should work in windows as in linux I assume12:01
but it does not12:01
StephenS it's not the same git line then12:02
Chetic it is.12:02
StephenS login to your ssh server and navigate to the bare git repo12:03
← naoey left12:03
StephenS assuming you are using ssh protocol12:04
Chetic I am12:04
← Soni left12:04
StephenS now type git rev-parse --is-bare-repository12:04
what does it say?12:04
Chetic true12:05
like I said, I can clone fine from linux machines12:05
← venmx left12:07
→ Soni joined12:07
StephenS git --version ?12:08
Chetic git version 2.15.112:08
→ Discovery joined12:08
Chetic client says 2.12.2.windows.212:09
StephenS you shouldnt have any issues running git commands on any supported os12:09
← Discovery left12:09
← tarkus left12:10
← tunekey left12:10
→ tunekey joined12:10
StephenS Chetic, when you are in git bare repo, type pwd and re-apply exact match to your git clone ssh://user@host:/$PWD <- here12:11
if that doesnt work, it would require further debugging12:11
Chetic that doesn't work. how do I debug further?12:11
bremner Chetic: ooc, is there anything between you and git on the server, e.g. gitolite?12:12
StephenS maybe you have a weird setup, running some kind of proxy with two different sshd daemons with different server os's or what not12:12
Chetic bremner: not using gitolite12:12
I did configure /etc/passwd manually12:12
already had a git user, not sure how that was created12:13
hmm two ssh daemons I think I saw that in ps before12:13
StephenS if you can ssh as git user, that shouldnt be the issue, you are sshing fine according to the error12:14
you are just ssh-ing to some different machine which does not have cider directory12:14
or is not a bare repo12:14
are you missing cider.git maybe?12:14
Chetic never mind, only one instance of sshd running12:15
→ Cassiopaya joined12:15
← Cassiopaya left12:15
Chetic cider.git not missing12:16
→ ok91 joined12:16
← ok91 left12:16
StephenS are you using hostname or IP? behind the proxy?12:16
Chetic hostname12:17
StephenS switch to the server IP12:17
Chetic fatal: protocol error: bad line length character: git@12:17
bremner there's a lot of hits for that error message12:18
looks windows/ssh specific12:19
Chetic had to restart putty's key agent12:19
now it's cloning, wow12:20
StephenS how did you ssh-d in?12:20
Chetic git clone ssh://git@192.168.1.88:/home/git/cider.git12:20
StephenS I mean, with pure ssh user@host protocol, you didnt received any error?12:21
Chetic this works just as wel now: git clone [email@hidden.address]12:21
→ Es0teric joined12:22
Chetic yeah, seems my problem is I'm ending up at the wrong host12:24
when sshing from my windows machine12:24
really confused right now12:24
← wandering_vagran left12:28
← Raed left12:28
→ Raed joined12:29
← jottr_ left12:29
← p0s1x left12:30
Chetic so.. if using the same dns address which I can ssh with or clone from linux machines with just fine. If I use that in windows, git tells me it's not a valid repository12:30
and as far as I'm aware no other ssh daemons are active on this local network12:30
→ jonpetermatt joined12:32
← tunekey left12:33
← fahadash left12:33
Chetic is it just me or is this incredibly strange?12:34
bremner dunno. I'd just blame windows ;)12:34
and yell for a windows admin...12:34
so when you ssh in to the wrong machine, can you tell which wrong machine it is?12:35
Chetic good idea let me try that (because I don't think it's the wrong machine)12:36
nope it's the right machine12:36
this has to be a git for windows bug12:37
→ jacekbogdanski joined12:38
← Oatmeal left12:42
→ lipoly joined12:44
← UTAN_dev left12:44
gitinfo set mode: +v12:44
→ bigfondue joined12:45
Chetic could it be that I'm actually being man-in-the-middle attacked?12:45
← IndianArya left12:45
→ IndianArya joined12:46
← Fernando-Basso left12:48
← shinnya left12:48
jabular → jabular_12:51
→ nnull joined12:52
→ jottr_ joined12:56
→ muricantrump joined12:58
→ ShapeShifter499 joined12:59
→ h12o joined12:59
← HuskyApo_ left12:59
← jottr_ left13:01
← leah2 left13:02
← hlieberman_ left13:02
← IndianArya left13:03
← h12o left13:04
→ bket joined13:04
→ HuskyApo_ joined13:06
→ jabular joined13:06
→ leah2 joined13:06
← jabular_ left13:06
lipoly Hello all. I want to preface my question by saying that I'm new to Git. I was wondering if it is possible to have a "chain" of remote repositories. Lets say we have 3 repositories; A, B, C. A is my local repository, which has B as the remote. Can B also have a remote...C?13:06
_ikke_ sure13:07
lipoly Ok, thanks. It seemed like it should be supported.13:08
→ jottr_ joined13:09
→ pgupta joined13:09
lipoly My idea using a setup like this would be for testing switching from SVN to GIT. We would have a local git repo (A) which points to a remote (B). B is on our same server box as our svn repo (C). We'd use any normal git client or CLI for our local repo, and our remote (B) would be setup with SmartGit which can bridge a connection between a git repo and an SVN repo.13:09
So, we'd do normal commits from on our local (A) and push/pull to (B). We'd then occasionally go and do a push/pull on (B) to the SVN repo (C). Whenever we're fully switched, we'd just stop doing push/pulls to the SVN repo and we'd be fully switched.13:10
→ waldi joined13:10
lipoly This would keep our git remote repo up-to-date with any changes still being made in the SVN repo (C), and keep the SVN repo up-to-date with all the changes being made to the git repo (B). Does this sound reasonable?13:10
← jnavila left13:11
Zarthus i'm not sure why you can't just convert svn to git and be done with it?13:11
lipoly That would be my preferred option, but other people on the team are more hesitant.13:11
← kh31d4r left13:11
→ rebrec_ joined13:12
waldi how do i backup a git repo which may be written to at the same time? a naive approach would read objects before refs, so the backup could reference not yet existing objects13:12
← rebrec left13:12
Zarthus try it out on one project/repo, once everyone is convinced migrate the rest13:12
lipoly They want to be able to test things out while having an option to abort the plan and if we abort we'd have our SVN repo intact and with all changes made during the testing period.13:12
→ kh31d4r joined13:14
lipoly We also have an artist who we'd rather not bother with the whole situation until we have to...he could just keep using SVN like he normally does until we decide to switch.13:17
_ikke_ then decide to switch ;-)13:19
← doug16k left13:20
lipoly Haha, it's kinda scary switching to a new VCS. It's like switching to a new parachute from one that has kept you alive for so many years. Yeah, everyone tells you it will be ok, but still...13:22
← jleclanche left13:23
→ m0viefreak joined13:25
→ threenuc__ joined13:26
← threenuc_ left13:30
→ doug16k joined13:31
← tymczenko left13:34
→ pd2000 joined13:36
← pd2000 left13:36
← jottr_ left13:36
← jonpetermatt left13:37
→ jonpetermatt joined13:37
→ h12o joined13:40
← h12o left13:45
→ zeroed joined13:45
→ ecuanaso joined13:46
← weijin left13:48
← ZyX-I left13:49
→ ZyX-I joined13:49
← HuskyApo_ left13:50
← threenuc__ left13:54
→ threenuc__ joined13:54
→ HuskyApo_ joined14:02
→ jottr_ joined14:03
← waldi left14:04
← zeroed left14:04
→ weijin joined14:04
← HuskyApo_ left14:07
← zmt00 left14:07
→ h12o joined14:08
← jottr_ left14:08
← weijin left14:08
→ Karyon joined14:11
→ jottr_ joined14:11
→ vdamewood joined14:12
← h12o left14:12
→ NerdyPepper joined14:13
← jonpetermatt left14:15
← borkr left14:16
← mkalfon_ left14:18
→ weijin joined14:19
← weijin left14:23
← tombusby left14:25
→ tombusby joined14:25
→ bviktor_ joined14:27
bviktor_ how does one use $ProgramFiles(x86) on windows? i always get bad substitution or some other error.14:27
tried $ProgramFiles(x86), ${ProgramFiles(x86)}, $ProgramFiles\(x86\), etc, won't work14:28
← zulutango left14:28
bviktor_ (sorry didn't explain, git bash question)14:28
← jacekbogdanski left14:28
→ \void joined14:30
← Karyon left14:33
→ weijin joined14:33
← cybrNaut left14:34
→ cybrNaut joined14:34
← jottr_ left14:34
→ ibiam joined14:35
← weijin left14:37
→ gareppa joined14:38
← ibiam left14:39
→ weijin joined14:39
→ noobineer joined14:40
bviktor_ so () cannot be used in bash variables apparently. geirha's solution is: awk 'BEGIN{print(ENVIRON["ProgramFiles(x86)"])}'14:43
← weijin left14:44
→ ibiam joined14:44
← endiruna left14:44
← ecuanaso left14:45
→ rockhoundward joined14:48
← nnull left14:56
→ jnavila joined14:59
← noobineer left15:00
→ jottr_ joined15:01
← jottr_ left15:06
→ dsdeiz joined15:06
← dsdeiz left15:06
→ dsdeiz joined15:06
← NerdyPepper left15:06
→ NerdyPepper joined15:07
→ thebope joined15:08
→ venmx joined15:08
→ ibiam_ joined15:09
← ibiam left15:10
→ cpr joined15:10
→ jottr_ joined15:11
← SoniEx2 left15:11
← ibiam_ left15:11
← cpr left15:11
→ SoniEx2 joined15:12
→ ibiam joined15:14
← xPucTu4 left15:15
← threenuc__ left15:16
→ nd_ joined15:18
→ cpr joined15:19
→ weijin joined15:20
→ xPucTu4 joined15:21
← nd left15:21
← venmx left15:22
→ venmx joined15:23
← weijin left15:25
← cpr left15:26
→ piggah joined15:27
→ BenderRodriguez joined15:28
← tkore left15:29
← jottr_ left15:31
→ robotroll joined15:31
→ disruptivefour joined15:33
← gareppa left15:34
← dwmw2_gone left15:36
← Olipro left15:37
← lupine left15:37
→ lupine joined15:41
→ Crypt0x joined15:41
→ Olipro joined15:42
Olipro → Guest173815:42
→ dwmw2_gone joined15:43
→ weijin joined15:46
← disruptivefour left15:47
→ Bobdude joined15:47
← dwmw2_gone left15:48
← BenderRodriguez left15:50
→ kuka joined15:50
← felixsanz left15:50
→ felixsanz joined15:50
← weijin left15:51
→ sleepingforest joined15:52
→ kuka1 joined15:53
← kuka left15:54
→ orbyt_ joined15:54
→ reynierpm joined15:55
→ Achylles joined15:56
→ dwmw2_gone joined15:57
← Xiti left15:57
→ BenderRodriguez joined15:58
→ jottr_ joined15:58
→ Xiti joined15:59
→ weijin joined16:00
→ thiago joined16:01
← jottr_ left16:02
→ Mattiaslndstrm joined16:02
← dwmw2_gone left16:03
← Mattiaslndstrm left16:04
← weijin left16:04
← Es0teric left16:05
→ dwmw2_gone joined16:05
← BenderRodriguez left16:06
← ShapeShifter499 left16:08
→ ShapeShifter499 joined16:08
→ jottr_ joined16:09
← reynierpm left16:09
← NerdyPepper left16:09
→ NerdyPepper joined16:15
← VladGh left16:15
→ VladGh_ joined16:15
← venmx left16:16
→ dreiss joined16:19
← Phylock left16:21
← rockhoundward left16:21
← widp left16:22
→ rockhoundward joined16:23
→ weijin joined16:24
→ BenderRodriguez joined16:27
→ cagomez joined16:27
→ Es0teric joined16:28
← weijin left16:29
→ KeyJoo joined16:30
→ stoopkid joined16:32
← cagomez left16:34
← Es0teric left16:34
→ cagomez joined16:34
osse TIL there's such a variable16:34
← mr_sm1th__ left16:34
→ Es0teric joined16:34
← BenderRodriguez left16:35
→ weijin joined16:36
→ gareppa joined16:37
← kuka1 left16:37
← leah2 left16:38
→ leah2 joined16:39
← weijin left16:40
← jottr_ left16:42
Hello71 you mean printenv 'ProgramFiles(x86)'?16:44
← Es0teric left16:45
Hello71 can't you also do declare 'ProgramFiles(x86)'?16:45
→ h12o joined16:48
→ noobineer joined16:51
← h12o left16:53
← cagomez left16:56
→ BenderRodriguez joined16:57
→ cagomez joined16:59
← dreiss left16:59
→ joekeilty joined17:00
← joekeilty left17:00
← gareppa left17:01
→ rafasc joined17:05
← BenderRodriguez left17:05
→ mud joined17:06
← rockhoundward left17:07
← cagomez left17:08
→ h12o joined17:08
→ jottr_ joined17:08
→ weijin joined17:09
← mud left17:09
cbreak using ( and ) in env vars sounds idiotic17:09
→ Es0teric joined17:10
← justan0theruser left17:12
→ BenderRodriguez joined17:13
← jottr_ left17:13
← h12o left17:13
← weijin left17:13
→ manuelschneid3r joined17:13
→ justan0theruser joined17:14
→ Karyon joined17:14
→ harrymoreno joined17:15
→ jottr_ joined17:20
← sanscoeu_ left17:21
→ cagomez joined17:21
→ sanscoeur joined17:21
→ kuka1 joined17:22
← BenderRodriguez left17:22
→ duderonomy joined17:25
← kuka1 left17:27
← Nizumzen left17:29
← cagomez left17:30
→ SerialSmile joined17:30
→ energizer joined17:30
← SerialSmile left17:31
→ Nizumzen joined17:31
← rafasc left17:31
→ rafasc joined17:31
← rafasc left17:32
← noobineer left17:32
→ venmx joined17:33
→ weijin joined17:33
harrymoreno → morenoh14917:35
→ BenderRodriguez joined17:36
← Case_Of left17:36
→ Case_Of joined17:37
← weijin left17:38
← piggah left17:38
→ h12o joined17:38
← jnavila left17:38
→ linuxmodder joined17:39
→ muelleme_ joined17:40
← venmx left17:40
→ mr_sm1th joined17:40
← linuxmodder left17:41
→ IndianArya joined17:42
→ linuxmodder joined17:42
← h12o left17:43
← BenderRodriguez left17:43
→ noobineer joined17:46
← muelleme_ left17:47
→ naoey joined17:47
→ royal_screwup21 joined17:48
royal_screwup21 how do I check whether a file is untracked?17:49
→ weijin joined17:49
→ rafasc joined17:50
→ BenderRodriguez joined17:50
→ kuka1 joined17:52
cbreak royal_screwup21: git ls-files can list all untracked files17:52
it has options to show or not show ignored files too17:52
by default it shows only tracked files17:52
→ paul424 joined17:52
← mr_sm1th left17:53
← weijin left17:54
→ mr_sm1th joined17:55
thiago royal_screwup21: what are you trying to do?17:55
royal_screwup21 I have .classpath local to my system which I want untracked17:56
I think I already untracked it before, but I'm not sure if it worked17:57
bviktor_ Hello71, neat! that also works, thanks :)17:57
→ cagomez joined17:57
thiago royal_screwup21: git rm17:57
← BenderRodriguez left17:59
← mr_sm1th left18:01
← wolfshappen left18:02
→ mr_sm1th_ joined18:02
← jottr_ left18:03
→ jungsubk joined18:05
→ duckydan joined18:07
danmackay_ → danmackay18:07
→ h12o joined18:07
← nephyrin left18:09
→ ecuanaso joined18:09
← ecuanaso left18:10
← ravndal left18:12
← sleepingforest left18:12
→ weijin joined18:12
← h12o left18:12
→ jstein joined18:12
← linuxmodder left18:13
← mattcen left18:13
→ kuka2 joined18:14
→ BenderRodriguez joined18:15
← kuka1 left18:15
← weijin left18:17
→ mattcen joined18:17
→ linuxmodder joined18:18
← mr_sm1th_ left18:18
← energizer left18:18
→ ravndal joined18:20
gordonfish Happy Easter18:21
← King_Hual left18:22
ProfMac → ProfMac_18:22
→ Phylock joined18:23
← KeyJoo left18:24
← Guest1738 left18:24
→ Guest1738 joined18:24
Guest1738 → Olipro18:25
→ weijin joined18:25
← Sleepy63 left18:26
→ sword joined18:27
→ ocds joined18:27
→ dege joined18:28
→ crtcji joined18:29
→ jottr_ joined18:29
← weijin left18:29
← Achylles left18:31
← lipoly left18:31
→ kuka3 joined18:31
← Es0teric left18:31
← jungsubk left18:32
← kuka2 left18:32
← jottr_ left18:34
→ pfleck joined18:35
← luckman212 left18:36
← cagomez left18:36
→ jungsubk joined18:37
→ VoradorPT joined18:37
→ h12o joined18:37
→ jottr_ joined18:38
← Karyon left18:40
← h12o left18:42
← rafasc left18:42
→ rafasc joined18:44
→ testnick123 joined18:44
→ reprazent joined18:46
← pfleck left18:47
← rafasc left18:50
→ crabovwik joined18:50
← kes left18:51
→ rafasc joined18:52
→ navidr joined18:52
→ jnavila joined18:56
← jungsubk left18:57
← ocds left18:59
→ weijin joined19:02
→ Karyon joined19:03
← jottr_ left19:04
→ sammyg joined19:04
← kuka3 left19:05
← weijin left19:06
→ h12o joined19:07
← crtcji left19:07
→ pfleck joined19:09
← thiago left19:10
← h12o left19:12
← reprazent left19:16
← alyptik left19:17
→ wolfshappen joined19:17
→ reprazent joined19:18
← orbyt_ left19:18
→ weijin joined19:18
→ nevodka joined19:20
→ alyptik joined19:21
→ marcovanest joined19:23
← weijin left19:23
← reprazent left19:24
← IndianArya left19:24
← manuelschneid3r left19:28
← crabovwik left19:28
→ jottr_ joined19:30
→ piggah joined19:33
← jottr_ left19:35
→ weijin joined19:36
→ h12o joined19:36
→ jottr_ joined19:36
← SJr left19:39
← h12o left19:41
← weijin left19:41
← linuxmodder left19:44
→ Mattiaslndstrm joined19:44
← wolfshappen left19:44
← metts left19:46
→ luckman212 joined19:47
→ metts joined19:47
→ linuxmodder joined19:48
→ weijin joined19:50
← jost__ left19:51
→ Lyqyd joined19:54
← weijin left19:55
← testnick123 left19:56
→ testnick123 joined20:01
→ wolfshappen joined20:01
← Mattiaslndstrm left20:02
→ orbyt_ joined20:03
→ h12o joined20:06
← jottr_ left20:06
→ jacekbogdanski joined20:08
→ coderkun joined20:09
← h12o left20:11
→ question123 joined20:13
gitinfo set mode: +v20:17
question123 i have multiple repos, each contains some markdown files, id like to have another repo that gathers the markdown files from each of them, whats the best way to do it? am i looking for subtrees?20:17
→ SwiftMatt joined20:18
→ HoierM joined20:18
← Karyon left20:18
← bviktor_ left20:20
← jacekbogdanski left20:20
← noobineer left20:21
→ tunekey joined20:23
→ weijin joined20:23
← weijin left20:27
→ __rob2 joined20:30
← __rob left20:32
← rybak left20:32
→ jottr_ joined20:32
→ jacekbogdanski joined20:33
← royal_screwup21 left20:34
→ noobineer joined20:34
oprypin question123, you're looking for a way to put these all in one repo instead -_-20:35
→ h12o joined20:36
oprypin subproject could work but everyone gives up on those eventually20:36
← linuxmodder left20:38
← jottr_ left20:38
→ Sasazuka joined20:39
← Sasazuka left20:39
← schleppel left20:40
→ nowhereman_ joined20:41
← h12o left20:41
← marcovanest left20:41
→ jottr_ joined20:42
← nowhere_man left20:43
→ ArcaTech joined20:44
→ nul joined20:44
← Phylock left20:46
→ weijin joined20:47
← testnick123 left20:47
← coderkun left20:48
← jacekbogdanski left20:49
← weijin left20:52
→ Sleepy63 joined20:52
← ArcaTech left20:54
→ h12o joined20:55
→ ecuanaso joined20:56
→ weijin joined20:58
→ leeN joined21:00
← h12o left21:00
← rafasc left21:01
→ rafasc joined21:02
← bket left21:02
← navidr left21:02
← weijin left21:02
→ basiclaser joined21:03
← rafasc left21:03
→ rafasc joined21:04
→ ContessaTP joined21:04
→ ArcaTech joined21:05
→ h12o joined21:06
→ bket joined21:06
← jottr_ left21:06
→ testnick123 joined21:07
→ thiago joined21:08
← h12o left21:10
← HoierM left21:12
← Nizumzen left21:14
← surfist left21:15
→ h12o joined21:15
← paul424 left21:18
← h12o left21:20
→ manuelschneid3r joined21:23
→ menip joined21:24
→ igemnace joined21:24
→ weijin joined21:27
→ dreiss joined21:31
← weijin left21:31
→ energizer joined21:37
← energizer left21:38
→ Mattiaslndstrm joined21:40
← escproxy left21:42
→ h12o joined21:45
← h12o left21:50
← muricantrump left21:53
→ asphyxia joined21:53
→ tymczenko joined21:53
→ johnnyb joined21:57
← asphyxia left21:59
← Mattiaslndstrm left22:01
← mmattice left22:02
← jnavila left22:03
→ endiruna joined22:03
→ weijin joined22:04
→ asphyxia joined22:04
→ mud joined22:07
← Lyqyd left22:07
→ Mattiaslndstrm joined22:11
← weijin left22:12
← ArcaTech left22:12
→ __rob joined22:13
← SpeakerToMeat left22:13
← _aeris_ left22:14
→ _aeris_ joined22:15
← __rob2 left22:16
→ surfist joined22:21
← jay-m left22:22
← diogenese left22:24
← dwmw2_gone left22:25
→ dwmw2_gone joined22:28
← manuelschneid3r left22:29
← johnnyb left22:33
← Mattiaslndstrm left22:35
← dreiss left22:36
→ weijin joined22:36
← dege left22:36
→ Mattiaslndstrm joined22:39
← weijin left22:40
→ SpeakerToMeat joined22:40
→ weijin joined22:42
← leeN left22:42
← ecuanaso left22:43
← question123 left22:43
→ Puffball joined22:43
← weijin left22:46
← Fysicus left22:47
→ Fysicus joined22:47
→ shinnya joined22:51
→ linuxmodder joined22:53
→ kneeki joined22:53
← justan0theruser left22:55
→ Guest21 joined23:00
→ duderono_ joined23:02
← rafasc left23:02
→ diogenese joined23:02
← duderonomy left23:04
← finalbeta left23:04
→ rafasc joined23:05
← duderono_ left23:07
→ justan0theruser joined23:07
→ LichtMacher joined23:07
← _ikke_ left23:08
← LichtMacher left23:10
→ ecuanaso joined23:10
→ weijin joined23:11
→ phluks joined23:12
← weijin left23:16
← phinxy left23:16
← testnick123 left23:19
→ _ikke_ joined23:19
→ Kaisyu joined23:20
← sammyg left23:23
→ justanotheruser joined23:23
← tymczenko left23:24
→ YuGiOhJCJ joined23:24
→ Kaisyu7 joined23:25
← justan0theruser left23:25
→ dreiss joined23:25
→ LichtMacher joined23:26
← Guest21 left23:29
← chaosruler left23:30
→ Guest21 joined23:32
← _ikke_ left23:32
← kneeki left23:33
← morenoh149 left23:34
→ _ikke_ joined23:36
→ joshbright joined23:37
← Mattiaslndstrm left23:39
→ alhariel joined23:48
→ weijin joined23:48
→ mmattice joined23:49
← weijin left23:54
← Singmyr left23:56
→ weijin joined23:56
← rafasc left23:56
← ecuanaso left23:58
→ rafasc joined23:58
← jstein left23:59

Logs Search ←Prev date Next date→ Channels Documentation