| 2017-09-24 |
| ← kozy left | 00:00 |
| → kozy joined | 00:00 |
| → orbyt_ joined | 00:00 |
| → ArcaTech joined | 00:01 |
| ← cbreak left | 00:01 |
| ← Mattiaslndstrm left | 00:02 |
| ← rubenb left | 00:03 |
| → rubenb joined | 00:04 |
| ← Timvde left | 00:05 |
| ← netj left | 00:06 |
| → netj joined | 00:06 |
| ← ArcaTech left | 00:06 |
| → Timvde joined | 00:07 |
| ← Rodya_ left | 00:08 |
| → iliakan joined | 00:10 |
| → dreiss joined | 00:11 |
| → cdown joined | 00:12 |
| → Patriqu joined | 00:13 |
| → czart_ joined | 00:13 |
| → dre_ joined | 00:13 |
| ← Cabanossi left | 00:14 |
| ← iliakan left | 00:14 |
| ← linuxmodder left | 00:15 |
| → linuxmodder joined | 00:15 |
| → Cabanossi joined | 00:16 |
| ← czart__ left | 00:17 |
| ← tmsmith left | 00:19 |
| → tmsmith joined | 00:19 |
| ← dsdeiz left | 00:20 |
| → jeffreylevesque joined | 00:20 |
| ← endiruna left | 00:20 |
| → dsdeiz joined | 00:20 |
| ← dsdeiz left | 00:20 |
| → dsdeiz joined | 00:20 |
| → steeze joined | 00:21 |
| ← Timvde left | 00:23 |
| ← manuelschneid3r left | 00:24 |
| → Timvde joined | 00:24 |
| → buggaboosanchez joined | 00:26 |
| ← Hope_ left | 00:27 |
| ← tvw left | 00:28 |
| ← livingstn left | 00:30 |
| ← bruce_lee left | 00:31 |
| → stutter joined | 00:33 |
| → Munt joined | 00:36 |
| ← Timvde left | 00:37 |
| ← bseyer left | 00:37 |
| → Timvde joined | 00:38 |
| → livingstn joined | 00:43 |
| ← livingstn left | 00:45 |
| ← Timvde left | 00:45 |
| ← Cabanossi left | 00:45 |
| → livingstn joined | 00:46 |
| → Cabanossi joined | 00:46 |
| ← justanotheruser left | 00:47 |
| → Timvde joined | 00:47 |
| ← CheckDavid left | 00:48 |
| → acidjnk2 joined | 00:49 |
| ← mostlybadfly left | 00:50 |
| ← acidjnk left | 00:51 |
| → LeBlaaanc joined | 00:53 |
| → bronson joined | 00:53 |
| → Mattiaslndstrm joined | 00:53 |
| ← jottr left | 00:53 |
| → Gurkenglas joined | 00:53 |
| → acedia3 joined | 00:54 |
| → dave0x6d joined | 00:54 |
| → Lyqyd joined | 00:55 |
| ← tkore left | 00:56 |
| ← mikecmpbll left | 00:56 |
| → tkore joined | 00:56 |
| ← j08nY left | 00:56 |
| ← bronson left | 00:58 |
| → piraye joined | 01:00 |
| ← snowkidind left | 01:02 |
| ← Mattiaslndstrm left | 01:03 |
| ← realies left | 01:03 |
| ← linuxmodder left | 01:03 |
| → linuxmodder joined | 01:04 |
| ← Milijus left | 01:04 |
| ← piraye left | 01:05 |
| → cdg joined | 01:07 |
|
parsnip
| black_13: go to summary page and scroll to bottom | 01:08 |
| ← bc86 left | 01:09 |
| → iliakan joined | 01:10 |
| ← cdg left | 01:12 |
| → realies joined | 01:12 |
|
parsnip
| nikivi: how about --git-dir | 01:12 |
| ← dermoth left | 01:12 |
|
nikivi
| parsnip I figured it out | 01:12 |
|
| git -C "$path" rev-parse --is-inside-work-tree | 01:12 |
|
| is what I needed | 01:13 |
| → dermoth joined | 01:13 |
|
parsnip
| oh, nice | 01:13 |
| ← LeBlaaanc left | 01:14 |
| → fahadash joined | 01:14 |
| → justanotheruser joined | 01:14 |
| ← iliakan left | 01:14 |
| → finalbeta joined | 01:15 |
| ← realies left | 01:15 |
| ← acidjnk2 left | 01:16 |
| ← johnny56 left | 01:17 |
| ← sunri5e left | 01:19 |
| ← akushner___ left | 01:20 |
| → rahtgaz joined | 01:20 |
| → sunri5e joined | 01:20 |
| ← rahtgaz left | 01:20 |
| → dabura667 joined | 01:22 |
| ← njbair left | 01:23 |
|
parsnip
| how can i `git rm` anything that doesn't match `.*ee.*`? i would like to use this for filter-branch, to remove everything that does not have wee or bee. | 01:24 |
| → njbair joined | 01:25 |
| ← dermoth left | 01:26 |
| ← Murr left | 01:26 |
| → Murr joined | 01:26 |
| → dermoth joined | 01:26 |
|
parsnip
| actually, there's only a handful of files, so i'm not against just using filter-branch on what i _can_ match. like anything starting with a period would do more than half the job. | 01:27 |
| ← SleePy left | 01:29 |
| ← acme[m] left | 01:29 |
| ← Techie[m] left | 01:29 |
| ← hiq[m] left | 01:29 |
| ← stutter left | 01:32 |
| ← tmsmith left | 01:32 |
| → stutter_ joined | 01:32 |
| → SleePy joined | 01:33 |
| → azwieg103 joined | 01:33 |
| → ronc joined | 01:36 |
| ← ronc left | 01:38 |
| ← cdown left | 01:39 |
| ← QualityAddict left | 01:40 |
| ← dreiss left | 01:40 |
| ← orbyt_ left | 01:40 |
| → ronc joined | 01:41 |
| → Techie[m] joined | 01:41 |
| → acme[m] joined | 01:41 |
| → hiq[m] joined | 01:41 |
| → dreiss joined | 01:42 |
| ← hvxgr left | 01:42 |
| → awygle joined | 01:42 |
| → DIDAVISION joined | 01:44 |
| ← rorro left | 01:45 |
| → Keyoo joined | 01:45 |
| ← ilbot3 left | 01:46 |
| ← Nizumzen left | 01:46 |
| → hvxgr joined | 01:47 |
| ← hvxgr left | 01:48 |
| → hvxgr joined | 01:49 |
|
parsnip
| oh, filter-branch --prune-empty can still leave behind pointless merges | 01:51 |
| → toothe joined | 01:54 |
| ← steeze left | 01:54 |
|
toothe
| for a repository like this (https://git.savannah.gnu.org/cgit/gnulib.git) how would I submit a patch upstream? | 01:54 |
| ← marinin left | 01:55 |
| → ilbot3 joined | 01:56 |
|
bremner
| ask the maintainers? | 01:57 |
| → orbyt_ joined | 01:57 |
|
bremner
| probably start at https://www.gnu.org/software/gnulib/ | 01:57 |
| ← d^sh left | 02:00 |
| → d^sh joined | 02:00 |
| → marinin joined | 02:00 |
| ← ronc left | 02:02 |
| ← rocketmagnet left | 02:03 |
| ← dreiss left | 02:04 |
| → ronster joined | 02:09 |
| ← dermoth left | 02:11 |
| ← ronster left | 02:11 |
| → ronster joined | 02:12 |
|
black_13
| parsnip: still around | 02:15 |
|
parsnip
| yes | 02:15 |
| → dermoth joined | 02:16 |
|
parsnip
| black_13: did you solve your problem? | 02:16 |
| → dreiss joined | 02:16 |
|
black_13
| no sir i didn't i had to take a break got a a walkk | 02:17 |
|
| walk | 02:17 |
|
| i pull down the qt sources and the built but they are not the 4.2.1 version | 02:17 |
|
| pulled | 02:17 |
|
parsnip
| black_13: okay, use `git checkout` and specify the tag. | 02:17 |
|
black_13
| tag not branch ? | 02:18 |
|
parsnip
| that will take you to the right commit on the commit graph. each commit points to a different state of the project. | 02:18 |
|
| yes | 02:19 |
|
black_13
| what i did was not correct what i did was git clone -b 4.2 http://code.qt.io/qt-creator/qt-creator.git | 02:19 |
|
parsnip
| tags and branches are the two common types of refs. | 02:19 |
|
black_13
| i apologize i dont know what a tag is | 02:19 |
|
parsnip
| branches move around as the project develops, tags usually stay where they are, pointing to places in history for convenience. | 02:19 |
| ← c0d3d left | 02:20 |
| ← aca20031 left | 02:20 |
|
black_13
| i had used svn up to now | 02:20 |
|
| and simple git hub stuff | 02:20 |
|
parsnip
| black_13: what is a snapshot in svn? | 02:20 |
|
black_13
| a branch? | 02:21 |
|
| i wasnt that good at svn :) | 02:21 |
| → Vortex35 joined | 02:21 |
| → akushner___ joined | 02:21 |
|
black_13
| git checkout tags/<tag_name> ? | 02:22 |
| → aca20031 joined | 02:22 |
| → c0ded joined | 02:22 |
|
parsnip
| yes, i think <tag_name> is typically a shortcut for refs/tags/<tag_name> | 02:23 |
| → iliakan joined | 02:24 |
| ← Vortex34 left | 02:25 |
|
black_13
| this is what I am about to do >git clone -b tags/7071b61e02d6c90319435871533ea96a9e22f6b0 http://code.qt.io/qt-creator/qt-creator.git | 02:25 |
|
| nope that did not work | 02:25 |
| ← jgornick left | 02:25 |
|
parsnip
| black_13: that hash doesn't look like a tag | 02:25 |
|
| black_13: i realize it's quite !complex | 02:25 |
|
gitinfo
| black_13: [!simple] At its heart git is made up of many concepts that are individually simple. Getting the whole picture right is often tricky, and it is usually about breaking up the complex concept into its simple, individual parts and grokking those. Both !bottomup and !cs will help with that. | 02:25 |
|
parsnip
| black_13: refs point to commits, which are identified by their hash. | 02:26 |
|
black_13
| that long long id | 02:26 |
|
| 7071b61e02d6c90319435871533ea96a9e22f6b0 | 02:26 |
|
parsnip
| `git checkout` is really about the commit, so you should be able to simply pass it the hash. | 02:27 |
|
| the refs are just sort of aliases like. | 02:27 |
|
black_13
| git co "hash" | 02:27 |
|
parsnip
| more commonly written <hash> | 02:28 |
|
black_13
| what is the full command | 02:28 |
|
parsnip
| `git co <hash>` | 02:28 |
|
black_13
| but where you had previous done a clone | 02:28 |
|
parsnip
| what's the problem? | 02:28 |
|
| i mean, yes. | 02:29 |
|
| that is correct | 02:29 |
| ← Munt left | 02:29 |
|
black_13
| C:\temp>git clone 7071b61e02d6c90319435871533ea96a9e22f6b0 http://code.qt.io/qt-creator/qt-creator.git fatal: repository '7071b61e02d6c90319435871533ea96a9e22f6b0' does not exist | 02:29 |
| ← chachasmooth_ left | 02:30 |
| → chachasmooth joined | 02:30 |
| → jgornick joined | 02:31 |
| → lagothrix joined | 02:32 |
|
parsnip
| black_13: i don't understand why you're doing that. how did you come up with that command from documentation or our conversation. i strongly recommend you start reading about how git works, for example, !bottomup taught me a lot. there's more good resources if you search the links in the /topic. | 02:34 |
|
gitinfo
| black_13: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. https://jwiegley.github.io/git-from-the-bottom-up/ | 02:34 |
| ← lagothri1 left | 02:35 |
|
FrostyBytes
| https://xkcd.com/1597/ <-- all you need to know about git | 02:35 |
|
parsnip
| black_13: it's all about the working directory, the index, the commit graph and the refs. | 02:35 |
| ← dreiss left | 02:35 |
|
black_13
| sure that is great i but i want to pull down the sources and have them building | 02:35 |
|
| it takes 2 hours to build the thing and in that i can read | 02:36 |
|
| on this page is the tag name in yellow https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?h=v4.2.1&id=7071b61e02d6c90319435871533ea96a9e22f6b0 | 02:37 |
|
| 4.2.1 | 02:37 |
| ← bergice_ left | 02:37 |
|
parsnip
| black_13: when you clone or fetch, you already have the commit graph. | 02:38 |
|
| black_13: then use checkout to "check out" a commit on the graph. | 02:38 |
|
| i don't think you clone a commit via a hash, but if that's in the docs, please prove me wrong. | 02:39 |
| ← a3Dman left | 02:39 |
|
black_13
| then it would seem like it would be "4.2.1" | 02:39 |
|
parsnip
| why? | 02:39 |
|
kadoban
| It may work when there's also a ref that points at that commit. | 02:39 |
|
parsnip
| and what is "it" | 02:40 |
|
| do you realize how hard it is to respond to "then _it_ would seem like _it_ would be "4.2.1"" | 02:40 |
| ← akushner___ left | 02:41 |
|
parsnip
| kadoban: yeah, i had to reword it as i was typing. | 02:41 |
| ← m0viefreak left | 02:41 |
| ← justanotheruser left | 02:41 |
| ← Patriqu left | 02:41 |
|
parsnip
| maybe clone can't specify a tag, but maybe fetch can. | 02:42 |
| ← iliakan left | 02:42 |
|
parsnip
| nope, clone can take a tag | 02:43 |
|
| black_13: you want to clone a commit by referring to tag? check the man page at https://git-scm.com/docs/git-clone and search for the word tag, you'll find it. | 02:44 |
|
black_13
| thanks I will read up | 02:44 |
| ← marinin left | 02:45 |
|
parsnip
| git clone --branch 4.2.1 | 02:45 |
|
FrostyBytes
| the bottom-up guide to git is useless. I have used git for years without knowing almost anything in that guide. 95% of what is in that guide should be moved to an appendix or something | 02:45 |
|
parsnip
| but i would think when you cloned the project, it was already there. | 02:45 |
|
| FrostyBytes: everyone is different, i find that way of thinking very helpful. | 02:46 |
|
| FrostyBytes: once you know a thing by other means, you may not find a later resource useful at all. | 02:46 |
|
black_13
| its v4.2.1 not 4.2.1 | 02:47 |
|
| jesus | 02:47 |
|
parsnip
| a student needs context _somehow_, whether that's by practice, assistance, or good conceptualization. | 02:47 |
|
black_13
| was looking at me right in the face | 02:47 |
|
awygle
| hi all, i want to list the files of a remote repository (from a URL) - basically ls-tree HEAD but on a URL. is there a good way to do that? | 02:48 |
| → a3Dman joined | 02:49 |
|
awygle
| it seems like i could do it with https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols somehow, maybe... | 02:49 |
|
FrostyBytes
| awygle: just use git clone --depth 1 | 02:50 |
|
parsnip
| awygle: https://gitirc.eu/git.html links to git-ls-remote | 02:50 |
|
| oops, that just lists refs | 02:51 |
|
awygle
| FrostyBytes: i'd rather not create directories on a user's system if i can avoid it | 02:52 |
|
| parsnip: yep :) not sure how to go from refs to something useful | 02:52 |
| → steeze joined | 02:52 |
|
kadoban
| awygle: Probably something with 'git archive', which you can then pipe to some other command if you want | 02:53 |
| → bronson joined | 02:54 |
| → justanotheruser joined | 02:55 |
|
awygle
| kadoban: looks like git archive would do what i want but github has it turned off :( unless i'm doing it wrong | 02:57 |
| ← Elon_Satoshi left | 02:58 |
| → igemnace joined | 02:59 |
| ← bronson left | 02:59 |
| ← Cabanossi left | 02:59 |
| → Elon_Satoshi joined | 03:00 |
| → Cabanossi joined | 03:01 |
| ← pks left | 03:03 |
| ← cagmz_ left | 03:04 |
| → pks joined | 03:05 |
| ← daynaskully left | 03:07 |
| → fstd_ joined | 03:08 |
| ← fstd left | 03:08 |
| fstd_ → fstd | 03:08 |
| → jason237 joined | 03:09 |
| → daynaskully joined | 03:12 |
|
black_13
| https://pastebin.com/HkZV3gLJ | 03:12 |
| ← mod left | 03:16 |
| ← ronster left | 03:18 |
| → bambs joined | 03:18 |
| ← daynaskully left | 03:19 |
| → daynaskully joined | 03:20 |
| ← bambs left | 03:21 |
| ← DIDAVISION left | 03:22 |
| ← dre_ left | 03:23 |
| ← fahadash left | 03:24 |
| ← Murr left | 03:26 |
|
kadoban
| awygle: Naw, github doesn't support it. | 03:26 |
| → Murr joined | 03:26 |
| → Arnaud1965 joined | 03:27 |
| ← Cabanossi left | 03:29 |
| ← justanotheruser left | 03:30 |
| → Cabanossi joined | 03:30 |
| → BowBoy joined | 03:30 |
| → justanotheruser joined | 03:33 |
| ← m712 left | 03:36 |
| ← troyt left | 03:40 |
| ← justanotheruser left | 03:41 |
| → justanotheruser joined | 03:41 |
| ← Elon_Satoshi left | 03:42 |
| → SwiftMatt joined | 03:43 |
| → dreiss joined | 03:43 |
| ← dsdeiz left | 03:44 |
| → dsdeiz joined | 03:44 |
| ← dsdeiz left | 03:44 |
| → dsdeiz joined | 03:44 |
| ← Gustavo6046 left | 03:45 |
| → invisbl joined | 03:45 |
| ← Arnaud1965 left | 03:46 |
| ← invisbl left | 03:46 |
| → invisbl joined | 03:46 |
| ← livingstn left | 03:47 |
| ← webdev007 left | 03:49 |
| ← SwiftMatt left | 03:49 |
| ← Keyoo left | 03:52 |
| → Elon_Satoshi joined | 03:52 |
| → livingstn joined | 03:52 |
| → ShapeShifter499 joined | 03:52 |
| ← roygbiv left | 03:54 |
| ← steeze left | 03:55 |
| → menip joined | 03:56 |
| ← black_13 left | 03:57 |
| ← yn left | 03:58 |
| → yanome joined | 04:00 |
| → steeze joined | 04:01 |
| → piraye joined | 04:02 |
| → steven_a_s joined | 04:02 |
| ← justanotheruser left | 04:03 |
| → justanotheruser joined | 04:04 |
| ← igemnace left | 04:05 |
| ← steeze left | 04:06 |
| ← piraye left | 04:08 |
| → sushain joined | 04:09 |
| ← dabura667 left | 04:11 |
| ← kyan left | 04:11 |
| ← sushain left | 04:11 |
| ← noteness left | 04:15 |
| ← TikityTik left | 04:16 |
| ← beerdrop left | 04:16 |
| → ozette joined | 04:16 |
| ← dysfigured left | 04:17 |
| ← ShapeShifter499 left | 04:17 |
| ← justanotheruser left | 04:18 |
| → justanotheruser joined | 04:18 |
| ← BowBoy left | 04:21 |
| → mbrumbelow joined | 04:22 |
| → roygbiv joined | 04:23 |
| → ShapeShifter499 joined | 04:24 |
| ← dermoth left | 04:27 |
| → dermoth joined | 04:27 |
| → beerdrop joined | 04:29 |
| ← menip left | 04:29 |
| → troyt joined | 04:30 |
| ← beerdrop left | 04:35 |
| ← livingstn left | 04:37 |
| → iliakan joined | 04:39 |
| → freimatz joined | 04:44 |
| ← ShapeShifter499 left | 04:48 |
| → beerdrop joined | 04:49 |
| ← ozette left | 04:49 |
| ← Kazuto left | 04:52 |
| → bronson joined | 04:55 |
| → realies joined | 04:55 |
| ← iliakan left | 04:55 |
| → nickinick joined | 04:58 |
| → Kazuto joined | 04:58 |
| ← Kazuto left | 04:58 |
| → Kazuto joined | 04:58 |
| ← nickinick left | 04:59 |
| ← bronson left | 05:00 |
| ← dirtyroshi left | 05:00 |
| ← Kazuto left | 05:02 |
| ← steven_a_s left | 05:02 |
| → dirtyroshi joined | 05:02 |
| → Kazuto joined | 05:03 |
| ← Kazuto left | 05:03 |
| → Kazuto joined | 05:03 |
| ← dirtyroshi left | 05:04 |
| ← orbyt_ left | 05:06 |
| ← toothe left | 05:08 |
| → raynold joined | 05:09 |
| ← thallada left | 05:13 |
| ← beerdrop left | 05:16 |
| → BowBoy joined | 05:16 |
| ← leeN left | 05:18 |
| → shinnya joined | 05:20 |
| ← Khisanth left | 05:21 |
| → thallada joined | 05:22 |
| ← diogenese left | 05:25 |
| → dirtyroshi joined | 05:26 |
| ← Murr left | 05:26 |
| → Murr joined | 05:26 |
| ← acedia3 left | 05:28 |
| → beerdrop joined | 05:28 |
| ← stutter_ left | 05:29 |
| → lss8 joined | 05:29 |
| ← freimatz left | 05:29 |
| → zefferno joined | 05:30 |
| → diogenese joined | 05:31 |
| → menip joined | 05:31 |
| ← lss8_ left | 05:32 |
|
sorressean
| I have a pr waiting to get merged that has some code in it, and I want to do some more work that relies in that pr getting merged. is there a way to make a branch from a pr and work from there, or what's the best way to handle this? | 05:33 |
| → lowpy joined | 05:33 |
|
lowpy
| I used `git clone http://github.com/xyz dir_name` and when I `cd dir_name` it adds a (master) tag to my $ | 05:34 |
|
| is that git's doing or something else? | 05:34 |
| ← govg left | 05:34 |
| → Khisanth joined | 05:34 |
| ← dreiss left | 05:36 |
| → govg joined | 05:36 |
|
themill
| lowpy: you're running something within your shell's PS1 (probably a command like __git_ps1) | 05:37 |
|
kadoban
| sorressean: Sure, you can do that. But if you make a PR of the new work, it's going to show *everything* not just the stuff on top of the original PR. (until the original gets merged) | 05:37 |
|
lowpy
| themill, I'm using gitbash | 05:38 |
|
_ikke_
| It's automatically setup in git bash when you install git | 05:41 |
|
| in GitForWindows | 05:41 |
| ← govg left | 05:43 |
| → iliakan joined | 05:45 |
| ← iliakan left | 05:45 |
| → dminuoso_ joined | 05:47 |
| ← dviola left | 05:48 |
| ← buggaboosanchez left | 05:49 |
| ← menip left | 05:50 |
| → govg joined | 05:50 |
| ← dminuoso_ left | 05:53 |
|
sorressean
| kadoban: yeah. that's why I'm trying to find a way to do this | 05:56 |
| ← govg left | 05:56 |
| ← Cabanossi left | 05:58 |
| → Cabanossi joined | 06:00 |
| ← dsdeiz left | 06:00 |
| → dminuoso_ joined | 06:00 |
| → dsdeiz joined | 06:00 |
| ← dsdeiz left | 06:00 |
| → dsdeiz joined | 06:00 |
| → kfoonamalik joined | 06:00 |
| → _ng joined | 06:01 |
| → dre_ joined | 06:02 |
| ← BowBoy left | 06:06 |
| → dreiss joined | 06:08 |
| → lindaJ joined | 06:11 |
| → casano431 joined | 06:12 |
| → L810 joined | 06:12 |
| → lad|o819 joined | 06:12 |
| → machi140 joined | 06:12 |
| → derri466 joined | 06:12 |
| → tro573 joined | 06:12 |
| → ^_s4|v0[9408 joined | 06:12 |
| → natass243 joined | 06:12 |
| → stan549 joined | 06:12 |
| → c4tt515 joined | 06:12 |
| → tem400 joined | 06:12 |
| → [CFLe184 joined | 06:12 |
| → sto302 joined | 06:12 |
| → salvo658 joined | 06:12 |
| → dedicat243 joined | 06:12 |
| → rule498 joined | 06:12 |
| → ladyami159 joined | 06:12 |
| → vasco`ros238 joined | 06:12 |
| → guest673411 joined | 06:12 |
| → philem194 joined | 06:12 |
| → z3nz375 joined | 06:12 |
| → droga851 joined | 06:12 |
| → ando128 joined | 06:12 |
| → firesto723 joined | 06:12 |
| → marti554 joined | 06:12 |
| → charlot186 joined | 06:12 |
| ← marti554 left | 06:12 |
| ← salvo658 left | 06:12 |
| ← vasco`ros238 left | 06:12 |
| ← sto302 left | 06:12 |
| → catheri98 joined | 06:12 |
| → inet405 joined | 06:12 |
| ← inet405 left | 06:12 |
| ← rule498 left | 06:12 |
| ← ladyami159 left | 06:12 |
| ← dedicat243 left | 06:12 |
| ← casano431 left | 06:12 |
| → swedengir388 joined | 06:12 |
| → ][lorddra586 joined | 06:12 |
| → kristoph729 joined | 06:12 |
| → bajt542 joined | 06:12 |
| → funkn834 joined | 06:12 |
| → giulia829 joined | 06:12 |
| → shadey585 joined | 06:12 |
| → roxea310 joined | 06:12 |
| → snor291 joined | 06:12 |
| → slay777 joined | 06:12 |
| → beginn512 joined | 06:12 |
| → cocain290 joined | 06:12 |
| → owne245 joined | 06:12 |
| → ta577 joined | 06:12 |
| → drgot47 joined | 06:12 |
| → guest220495 joined | 06:12 |
| → strange610 joined | 06:12 |
| ← strange610 left | 06:13 |
| ← droga851 left | 06:13 |
| ← firesto723 left | 06:13 |
| ← swedengir388 left | 06:13 |
| ← z3nz375 left | 06:13 |
| ← philem194 left | 06:13 |
| ← guest220495 left | 06:13 |
| ← drgot47 left | 06:13 |
| ← cocain290 left | 06:13 |
| ← owne245 left | 06:13 |
| ← funkn834 left | 06:13 |
| ← shadey585 left | 06:13 |
| ← bajt542 left | 06:13 |
| ← kristoph729 left | 06:13 |
| ← slay777 left | 06:13 |
| ← beginn512 left | 06:13 |
| ← giulia829 left | 06:13 |
| ← roxea310 left | 06:13 |
| ← snor291 left | 06:13 |
| ← ando128 left | 06:13 |
| ← guest673411 left | 06:13 |
| ← ta577 left | 06:13 |
| ← catheri98 left | 06:13 |
| ← ][lorddra586 left | 06:13 |
| → zenirc369 joined | 06:13 |
| ← charlot186 left | 06:13 |
| ← _ng left | 06:14 |
| ← L810 left | 06:17 |
| ← lad|o819 left | 06:17 |
| ← machi140 left | 06:17 |
| ← derri466 left | 06:17 |
| ← tro573 left | 06:17 |
| ← ^_s4|v0[9408 left | 06:17 |
| ← natass243 left | 06:17 |
| ← stan549 left | 06:17 |
| ← c4tt515 left | 06:17 |
| ← tem400 left | 06:17 |
| ← [CFLe184 left | 06:17 |
| → govg joined | 06:19 |
| → nd joined | 06:20 |
| → ahr3n joined | 06:20 |
| ← dmj` left | 06:22 |
| ← nd- left | 06:22 |
| → dmj` joined | 06:23 |
| → ethidium joined | 06:28 |
|
ethidium
| hi everyone, running git on windows. getting a "bash: copy: command not found" error when trying to get a github repository | 06:29 |
|
| any suggestions? | 06:29 |
|
kadoban
| ethidium: From what command? How'd you install? | 06:31 |
|
dminuoso_
| Trying to "get a github repository" ? | 06:32 |
|
ethidium
| first did a "git clone" of a repository URL, cd'd to the directory, then ran "copy .gitmodules.github .gitmodules" . installed git on windows using um.. default parameters | 06:32 |
|
| yeah sorry everyone i'm a total newb to git. | 06:32 |
|
| actually following directions on here: https://github.com/altendky/st | 06:33 |
|
| for running from source on windows | 06:33 |
|
| actually don't need this all that much just using it as some practice for learning how to work with git... | 06:34 |
|
dminuoso_
| ethidium: So here's my take. If you are struggling with *that*, you might want to stop and pick up some very rudimentary book on... I dont know. | 06:34 |
|
| Windows? Programming? | 06:34 |
|
| Windows Prompt? | 06:34 |
|
| But that's just me. | 06:35 |
|
ethidium
| thanks for the condescension, that really helps | 06:35 |
| → _ng joined | 06:35 |
|
AndreasLutro
| the "copy" command expects that you're using the windows cmd.exe, which has different commands than bash | 06:35 |
|
ethidium
| thanks. that's far more helpful. i appreciate it andreaslutro | 06:35 |
|
AndreasLutro
| try just following the linux instructions - but you may have to improvise a bit | 06:36 |
|
dminuoso_
| ethidium: My point is, you are reading Windows instructions and wondering why they don't work on Linux (or whatever Unixoid you are on). | 06:37 |
| → tkore\work joined | 06:37 |
|
ethidium
| dminuoso: the instructions said to install git, then run these commands, I assumed based on the wording it implied running these commands in git, rather than the windows command prompt. but i at least hope you feel superior, because that's all that really matters | 06:38 |
|
dminuoso_
| ethidium: The instructions clearly have a section with a heading that says "Windows", and a section with a heading that says "Linux". If you consider the basic ability to just read superior, be my guest. | 06:39 |
| → jnavila joined | 06:40 |
|
ethidium
| dminuoso: yes, i have installed git on windows, which comes with a command prompt. i consider your attitude a false sense of superiority, rather than your ability to read | 06:40 |
|
themill
| ethidium: there are various flavours of git for windows and you could end up at a cmd prompt or a bash prompt depending on what you do. The instructions there are for cmd while you've got gitbash. | 06:41 |
| → wandering_vagran joined | 06:41 |
|
kadoban
| dminuoso_: Can you just ... not do whatever this is? | 06:41 |
|
ethidium
| themill: thanks for the clarification | 06:42 |
| ← wandering_vagran left | 06:42 |
| → wandering_vagran joined | 06:43 |
| ← beerdrop left | 06:46 |
|
ethidium
| themill , adreaslutro: thanks for answering my easy questions, got everything working. everyone started somewhere. this obviously isn't my primary field and if any of you came to ask about synthetic biology, i would treat you with as much patience and understanding as you treated me. | 06:48 |
| ← lkolstad left | 06:52 |
| ← whitby left | 06:52 |
| → whitby joined | 06:55 |
| → sat-aton joined | 06:55 |
| ← sat-aton left | 06:55 |
| → sat-aton joined | 06:55 |
| → bronson joined | 06:56 |
| ← satifant left | 06:57 |
| → beerdrop joined | 06:59 |
| → King_Hual joined | 07:00 |
| ← lindaJ left | 07:00 |
| ← bronson left | 07:00 |
| → xaxxon joined | 07:02 |
| ← jnavila left | 07:02 |
| ← ojdo left | 07:03 |
| ← EvilDMP left | 07:04 |
| → jhillky joined | 07:05 |
| → YuGiOhJCJ joined | 07:06 |
| → TomyLobo joined | 07:07 |
| → peterhdd joined | 07:08 |
| → ojdo joined | 07:10 |
| → overlord_tm joined | 07:10 |
| ← peterhdd left | 07:12 |
| ← Lyqyd left | 07:13 |
| → aw1 joined | 07:14 |
| ← wandering_vagran left | 07:15 |
| → piraye joined | 07:16 |
| → masuberu joined | 07:24 |
| ← safe left | 07:26 |
| ← Murr left | 07:26 |
| → jungsubk joined | 07:26 |
| ← xaxxon left | 07:26 |
| → Murr joined | 07:26 |
| ← jimInDevNull left | 07:27 |
| ← neunon left | 07:27 |
| → jimInDevNull joined | 07:28 |
| ← Cabanossi left | 07:29 |
| → Cabanossi joined | 07:30 |
| → ljc joined | 07:31 |
| → neunon joined | 07:31 |
| ← ljc left | 07:31 |
| ← webguynow left | 07:44 |
| → webguynow joined | 07:44 |
| → bc86 joined | 07:45 |
| → ljc joined | 07:55 |
| ← energizer left | 07:55 |
| ← jungsubk left | 07:56 |
| ← thiago left | 07:57 |
| ← Cabanossi left | 07:59 |
| → Cabanossi joined | 08:00 |
| → _main_ joined | 08:01 |
| ← _main_ left | 08:01 |
| → VladGh_ joined | 08:01 |
| → _main_ joined | 08:02 |
| ← __main__ left | 08:02 |
| ← VladGh left | 08:03 |
| ← nicolai86 left | 08:03 |
| ← fatalhalt left | 08:04 |
| → __main__ joined | 08:04 |
| ← _main_ left | 08:04 |
| → ZyX-I joined | 08:06 |
| → nicolai86 joined | 08:10 |
| ← ljc left | 08:13 |
| → narendraj9 joined | 08:15 |
| ← lowpy left | 08:17 |
| → opalepatrick joined | 08:17 |
| ← bc86 left | 08:18 |
| ← opalepatrick left | 08:19 |
| → j08nY joined | 08:24 |
| ← Solvaring left | 08:25 |
| → jkadaver joined | 08:25 |
| → mkali joined | 08:25 |
| → schleppel joined | 08:27 |
| → MalcomX830 joined | 08:27 |
| ← MalcomX830 left | 08:27 |
| → Tobbi joined | 08:29 |
| ← Cabanossi left | 08:29 |
| → Cabanossi joined | 08:30 |
| → robinb joined | 08:30 |
|
robinb
| join ##aws | 08:31 |
| → ozette joined | 08:32 |
| ← dreiss left | 08:33 |
| → _kk22kk_ joined | 08:36 |
| ← kfoonamalik left | 08:37 |
| → InfoTest joined | 08:42 |
| → wandering_vagran joined | 08:44 |
| ← overlord_tm left | 08:45 |
| ← ahr3n left | 08:47 |
| → robotroll joined | 08:47 |
| → cbreak joined | 08:49 |
| ← mbrumbelow left | 08:54 |
| → ArcaTech joined | 08:56 |
| → jameser joined | 08:56 |
| → bronson joined | 08:57 |
| → clas1c joined | 08:58 |
| ← thomasross left | 09:01 |
| → thomasross joined | 09:01 |
| ← jameser left | 09:01 |
| ← bronson left | 09:02 |
| ← robinb left | 09:02 |
| ← cbreak left | 09:03 |
| → h12o joined | 09:03 |
| ← dhollinger left | 09:04 |
| ← h12o left | 09:08 |
| → marianina8 joined | 09:09 |
| ← ozette left | 09:11 |
| ← marianina8 left | 09:14 |
| → Munt joined | 09:15 |
| ← narendraj9 left | 09:16 |
| → marianina8 joined | 09:16 |
| → ivo_ joined | 09:16 |
| → narendraj9 joined | 09:17 |
| ← marianina8 left | 09:17 |
| ← mkali left | 09:20 |
| → ozette joined | 09:21 |
| → cbreak joined | 09:22 |
| → acidjnk joined | 09:23 |
| ← Munt left | 09:23 |
| ← dave0x6d left | 09:24 |
| ← narendraj9 left | 09:24 |
| ← Murr left | 09:26 |
| → Murr joined | 09:26 |
| ← ozette left | 09:28 |
| ← Tobbi left | 09:29 |
| → Yakusaji joined | 09:30 |
| → xaa joined | 09:32 |
| → dhollinger joined | 09:32 |
| ← dre_ left | 09:33 |
| ← robotroll left | 09:34 |
| ← Yakusaji left | 09:37 |
| ← catsup left | 09:37 |
| → catsup joined | 09:37 |
| → CheckDavid joined | 09:38 |
| ← catsup left | 09:38 |
| → Tobbi joined | 09:38 |
| → catsup joined | 09:39 |
| → k999k joined | 09:39 |
| ← k999k left | 09:40 |
| ← _kk22kk_ left | 09:40 |
| → _kk22kk_ joined | 09:40 |
| → robinb joined | 09:44 |
| → leeN joined | 09:47 |
| ← YuGiOhJCJ left | 09:47 |
| → manuelschneid3r joined | 09:54 |
| → BouncyKnightMike joined | 09:56 |
| ← Cabanossi left | 09:58 |
| → Cabanossi joined | 10:00 |
| → freimatz joined | 10:01 |
| ← Guest76857 left | 10:04 |
| → hyperair joined | 10:04 |
| ← robinb left | 10:06 |
| → nuckt joined | 10:07 |
| ← Guest82821 left | 10:07 |
| gitinfo set mode: +v | 10:08 |
|
nuckt
| hello, I configured vagrant on windows to use an ubuntu machine. I have an issue with git bash when I do "vagrant ssh". it connects me to the machine but I can't use stuff like MC and the terminal looks really bad | 10:08 |
|
| when I try to launch mc it says "Cannot get terminal settings: Inappropriate ioctl for device (25) Your terminal lacks the ability to clear the screen or position the cursor." | 10:08 |
|
| does anyone know how to fix this? | 10:08 |
| → tarkus joined | 10:09 |
| → debian joined | 10:12 |
| debian → Guest11339 | 10:13 |
| → DIDAVISION joined | 10:16 |
| → jungsubk joined | 10:19 |
| ← aw1 left | 10:19 |
| → narendraj9 joined | 10:20 |
| ← Anja left | 10:25 |
| → Anja joined | 10:28 |
|
Seveas
| nuckt: sounds like ssh is not allocating a pty | 10:30 |
| ← autrilla left | 10:30 |
|
Seveas
| ssh -t will help you | 10:30 |
| → mikecmpbll joined | 10:31 |
| → gloomy joined | 10:31 |
| → autrilla joined | 10:31 |
| → aw1 joined | 10:32 |
| → ozette joined | 10:33 |
| parsnip → parsnip1 | 10:34 |
| ← jkadaver left | 10:35 |
| ← BouncyKnightMike left | 10:35 |
| ← aw1 left | 10:35 |
| → parsnip joined | 10:35 |
| ← nuckt left | 10:40 |
| ← MeltedLux left | 10:46 |
| → jstein_ joined | 10:51 |
| jstein_ → jstein | 10:51 |
|
royal_screwup21
| is there a way to check if the repo on my terminal belongs to heroku or to github? I have a heroku repo and a github repo but I don't know which one's which :( | 10:52 |
| ← venmx left | 10:54 |
| → rorro joined | 10:54 |
|
heftig
| royal_screwup21: repos don't belong to remotes; repos have remotes (you could set up either repository to have both heroku and github as remotes) | 10:55 |
|
| royal_screwup21: anyway, take a look at "git remote -v" | 10:55 |
| ← venmx_ left | 10:55 |
| ← mikecmpbll left | 10:55 |
| ← ahrs left | 10:55 |
|
royal_screwup21
| thank you! | 10:56 |
| → mikecmpbll joined | 10:56 |
|
royal_screwup21
| yeah I really should sync them both so I have just ONE repo wtih 2 remotes - heroku and github | 10:56 |
| → ahrs joined | 10:57 |
| → venmx joined | 10:57 |
| → venmx_ joined | 10:58 |
| → bronson joined | 10:58 |
| → robertparkerx joined | 10:58 |
| ← mikecmpbll left | 11:01 |
| ← bronson left | 11:03 |
| → phluks joined | 11:03 |
| → h12o joined | 11:04 |
| → jameser joined | 11:05 |
| → armin joined | 11:06 |
| ← Tobbi left | 11:08 |
|
deepy
| royal_screwup21: you can have two pushurls on a remote | 11:09 |
|
royal_screwup21
| oh | 11:10 |
|
| by that you mean, I could sync both heroku and gituhb to the same repo? | 11:10 |
|
deepy
| I mean you could make it so that when you git push origin master you push master to both heroku and github | 11:11 |
|
royal_screwup21
| ah okay | 11:11 |
| → jceb joined | 11:11 |
|
royal_screwup21
| I'm not sure if I'm totally on-board with that; what if I want to make changes to the heroku repo and noth the github repo? | 11:12 |
|
| not* | 11:12 |
|
deepy
| when would that ever happen? | 11:12 |
|
| I never ever want to have an app deployed where the source-code is not in my *actual* repo | 11:13 |
| ← gloomy left | 11:13 |
| ← Cabanossi left | 11:13 |
|
deepy
| Although I get that hte other way around would work, you'd want it on github but not on heroku | 11:13 |
|
royal_screwup21
| the problem is, I've done a lot of dumb commits on my heroku repo, just because I wanted to test things out, and I don't want those commits to be reflected on my github repo | 11:14 |
|
deepy
| In that case I'd set up two remotes, heroku+github and github, have master track heroku+github and develop github | 11:14 |
| ← j08nY left | 11:14 |
|
deepy
| hmm | 11:14 |
|
| Well you could clean up the history and force-push to heroku | 11:15 |
|
royal_screwup21
| moral of the story: sync heroku + github and don't do stupid shit haha | 11:15 |
|
| yeah I guess I could do that | 11:15 |
|
deepy
| You live and you learn, you got the code, app is not broken, nothing lost :-) | 11:15 |
| → Cabanossi joined | 11:15 |
| ← jameser left | 11:16 |
| → jb__ joined | 11:19 |
| ← robertparkerx left | 11:20 |
| ← InfoTest left | 11:25 |
| → axs221 joined | 11:26 |
| ← venmx left | 11:29 |
| ← venmx_ left | 11:29 |
| → InfoTest joined | 11:30 |
| ← InfoTest left | 11:30 |
| ← askb left | 11:30 |
| → MeltedLux joined | 11:31 |
| → jameser joined | 11:33 |
| → NwS joined | 11:38 |
| ← beerdrop left | 11:41 |
| → BouncyKnightMike joined | 11:41 |
| ← xaa left | 11:44 |
| → k999k joined | 11:44 |
| → kostur86 joined | 11:44 |
| ← k999k left | 11:44 |
| ← _kk22kk_ left | 11:44 |
| → _kk22kk_ joined | 11:45 |
| → xaa joined | 11:45 |
| ← wandering_vagran left | 11:47 |
| ← iamtakingiteasy left | 11:47 |
| → aax joined | 11:49 |
| ← AfroThundr left | 11:50 |
| → dre_ joined | 11:51 |
| ← cagedwisdom left | 11:52 |
| ← xaa left | 11:53 |
| ← _kk22kk_ left | 11:53 |
| → beerdrop joined | 11:53 |
| → xaa__ joined | 11:54 |
| ← jameser left | 11:54 |
| ← jungsubk left | 11:55 |
| ← tarkus left | 11:57 |
| ← aax left | 11:57 |
|
kent\n
| If I'm reimplementing some of gits pluming to create my own commit objects, what's the specific steps git-itself does after forging those? I know I need to do something with refs somehow but the internals documentation is not clear how to to clear the index and stuff the same as git does. | 12:00 |
| → jungsubk joined | 12:00 |
|
| bremner backs away slowly | 12:00 |
|
| kent\n basically needed the ability to add new parents while committing and git commit doesn't really expose it properly :/ | 12:00 |
|
nedbat
| kent\n: sounds like an unusual project: why make your own commit objects? | 12:00 |
|
kent\n
| I'm just using git write-tree, git commit-tree, but I need "git commit-tree -p A -p B" , and I couldn't see how I was supposed to do that from just `git commit` | 12:01 |
| ← DIDAVISION left | 12:02 |
|
_ikke_
| so you're not reimplementing git plumbing | 12:02 |
|
| but git porcelain? | 12:02 |
|
kent\n
| er, I guess. | 12:02 |
|
_ikke_
| plumbing is the hidden part | 12:02 |
| → FernandoBasso joined | 12:02 |
|
kent\n
| right, to an extent, the plumbing of "git commit" is , itself, hidden, and implemented by combining porcelain, ... to my unusual way of thinking at least. | 12:03 |
|
_ikke_
| The other way around | 12:03 |
| → bobrosswins joined | 12:04 |
|
_ikke_
| git commit is porcelain | 12:04 |
|
kent\n
| as in: I know (some of) tools "git commit" uses, but I don't know how it uses them. | 12:04 |
| ← berndj left | 12:04 |
|
_ikke_
| git write-tree, commit-tree etc are plumbing | 12:04 |
|
| kent\n: Well, git commit does not necessarily use those tools | 12:04 |
|
| It uses the same internal libs those tools use | 12:04 |
|
kent\n
| Ok. So, can we move past the semantics lesson then :p | 12:04 |
|
_ikke_
| right | 12:05 |
|
| the index does not need to be cleared | 12:05 |
|
| the index looks 'clean' when it matches HEAD | 12:05 |
| ← narendraj9 left | 12:06 |
|
kent\n
| oh. So just `git symbolic-ref HEAD <NEWSHA1>` should be sufficient? | 12:06 |
|
| will that repoint branches too? | 12:06 |
|
_ikke_
| no, that would make HEAD detached | 12:06 |
|
| You need to move the branch that HEAD points to | 12:07 |
| → narendraj9 joined | 12:07 |
|
_ikke_
| or HEAD itself iif it's detached already | 12:07 |
|
kent\n
| so `git update-ref $(git rev-parse --symbolic-full-name) $SHA1` first? | 12:08 |
| ← ozette left | 12:08 |
|
_ikke_
| +HEAD, but something like that | 12:08 |
| ← a3Dman left | 12:08 |
|
_ikke_
| I'm thinking about the proper way to do it | 12:09 |
|
grawity
| `git update-ref` supports dereferencing HEAD | 12:09 |
|
_ikke_
| ah, great :) | 12:09 |
|
kent\n
| oh. sweet. that helps. | 12:09 |
| → seebyr joined | 12:11 |
| → a3Dman joined | 12:11 |
|
kent\n
| sweet, that does all I need :) | 12:11 |
| → aard__ joined | 12:12 |
| → ozette joined | 12:12 |
| ← pijiu2 left | 12:14 |
| ← kostur86 left | 12:18 |
| → berndj joined | 12:18 |
| ← jb__ left | 12:18 |
| ← manuelschneid3r left | 12:19 |
| ← jungsubk left | 12:22 |
| ← Soni left | 12:22 |
| ← berndj left | 12:22 |
| → mikecmpbll joined | 12:22 |
| → aua joined | 12:23 |
| → JanC_ joined | 12:24 |
| → berndj joined | 12:24 |
| JanC → Guest52516 | 12:25 |
| ← Guest52516 left | 12:25 |
| JanC_ → JanC | 12:25 |
| ← seebyr left | 12:26 |
| → bseyer joined | 12:26 |
| ← ozette left | 12:27 |
| ← Cabanossi left | 12:28 |
| → Cabanossi joined | 12:30 |
| ← leeN left | 12:30 |
| → Nizumzen joined | 12:30 |
| → Milijus joined | 12:34 |
| ← Guest11339 left | 12:35 |
| → Soni joined | 12:37 |
| → mbrumbelow joined | 12:37 |
| ← axs221 left | 12:37 |
| → axs221 joined | 12:37 |
| → acidjnk2 joined | 12:37 |
| ← Milijus left | 12:38 |
| ← acidjnk left | 12:39 |
| → Milijus joined | 12:39 |
| ← narendraj9 left | 12:39 |
| → debian joined | 12:40 |
| → leeN joined | 12:40 |
| debian → Guest65754 | 12:40 |
| ← dre_ left | 12:41 |
| ← dermoth left | 12:43 |
| ← immae left | 12:44 |
| → sushain joined | 12:44 |
| ← acidjnk2 left | 12:46 |
| → Alucard4200 joined | 12:47 |
| ← Alucard4200 left | 12:48 |
| ← phluks left | 12:50 |
| ← govg left | 12:50 |
| → manuelschneid3r joined | 12:51 |
| → timofonic joined | 12:55 |
|
timofonic
| Hello | 12:55 |
|
_ikke_
| hey | 12:55 |
|
timofonic
| I'm the worst git user in the world, I only know to make a "hello world" in C and not so much more. But I like to use git to archive ancient software and package maintaining.I want to use it more. | 12:56 |
|
| Right now I would like to set up a local git mirror of certain projects | 12:56 |
| → mr_sm1th joined | 12:57 |
| ← Milijus left | 12:57 |
|
grawity
| well great, apparently my repo crashes github | 12:57 |
|
timofonic
| How can I do that? I mean having a systemd daemon and put the URLs in some file or whatever, then specify a location for it (preferably ~/src/git | 12:58 |
|
| grawity: I remeber your nickname. Do you use Archlinux too? | 12:58 |
|
| grawity: Have you submitted a report to GitHub? | 12:58 |
| ← jceb left | 12:58 |
|
rudi_s
| timofonic: git clone --mirror if you want a copy of the repository itself (without a working tree). Or just git clone if you want to work with the source stored in the repository. | 12:58 |
|
grawity
| timofonic: if you want to serve git://, use git-daemon (service); for http:// or https://, use git-http-backend (via apache/nginx); for SSH or local clones, nothing special | 12:59 |
|
rudi_s
| Btw. if you want to learn the (advanced) basics of Git, have a look at !progit | 12:59 |
|
gitinfo
| [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 12:59 |
| → Milijus joined | 12:59 |
| → bronson joined | 12:59 |
|
rudi_s
| Ah, mirror as in "provide the repos to others"? | 12:59 |
|
timofonic
| rudi_s: I know that, I just want a daemonized solution that automates the mirror updaing process and stores them on a specific location | 12:59 |
|
| grawity: Oh | 13:00 |
|
rudi_s
| timofonic: So no "provide the repos to others" but just a local copy for yourselves? | 13:00 |
| ← parsnip1 left | 13:00 |
|
grawity
| for dir in ~/src/*.git; do (cd "$dir" && git fetch --prune); done | 13:01 |
|
| crontab it and you're done | 13:01 |
| → slazer joined | 13:02 |
|
rudi_s
| (Depending on what kind of archive you want, with or without --prune.) | 13:02 |
|
timofonic
| grawity: I want local clones only right now (it might change in the future when I setup my own NAS, but it will probably be only used in intranet), but make updating automated. Does git-daemon works for that? | 13:02 |
| → robinb joined | 13:03 |
| ← bronson left | 13:03 |
|
grawity
| git-daemon has absolutely nothing to do with updating | 13:03 |
|
| it's for serving repositories over git:// for other people to clone | 13:04 |
|
timofonic
| grawity: If I didn't say it clear enough... Yes, only local but a rellatively list big list of repos all the ones I have in my GitHub account and replace some of them by upstream ones (and now I think of it, I would also like to update my forked github repos to make them more or less up-to-date mirrors most of the time | 13:04 |
| → jottr joined | 13:05 |
| → aax joined | 13:05 |
|
slazer
| Hi, I've made a commit in my fork which has been rejected in the pull request. Is it a good idea to somehow "delete" the commit, make another one and create a pull request? Otherwise the original repo would have an extra useless commit, right? | 13:05 |
|
parsnip
| slazer: you already pushed it to public? might not be a good idea to delete it. | 13:07 |
| → narendraj9 joined | 13:07 |
|
parsnip
| are they going to except the pull request in a different form? | 13:07 |
|
slazer
| parsnip: I pushed it only to my personal repository, which is forked frome the original one I make a pull request into. | 13:07 |
| ← Milijus left | 13:08 |
| ← robinb left | 13:08 |
| ← xaa__ left | 13:08 |
|
parsnip
| do you just need the commit in your code for your own use, or do you expect them to take a similar pull request soon. | 13:09 |
| → Diaoer joined | 13:09 |
|
slazer
| nobody will ever use the code of the commit, it was a wrong idea.. | 13:10 |
| → ozette joined | 13:10 |
|
parsnip
| perhaps you can just leave it there and ignore it. | 13:10 |
|
slazer
| so I thought something like "git push origin HEAD --force" would be an option | 13:10 |
|
grawity
| if you worked on master, yeah, you can push --force or do whatever | 13:11 |
|
| but it'd be a good idea to start using branches for future PRs | 13:11 |
|
slazer
| grawity: it is a branch | 13:11 |
|
grawity
| just delete the branch? | 13:12 |
|
slazer
| grawity: no, I need to delete the one (and only) commit in that branch, make another one and then make a pull request | 13:12 |
|
| grawity: oh, you mean to delete the branch and make a new one with the same name? | 13:13 |
|
grawity
| use `git rebase -i` to edit the history | 13:13 |
|
| see !postproduction, or !remove_commit | 13:14 |
|
gitinfo
| So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this. | 13:14 |
|
| You can use rebase to remove commits: git rebase --onto <commit>~1 <commit> <branch>. Note this will !rewrite history. | 13:14 |
|
grawity
| if the maintainers didn't close the original PR yet, then just push --force the same branch, and it'll update the PR | 13:14 |
| ← Gurkenglas left | 13:14 |
| ← zulutango left | 13:14 |
| → shtrb joined | 13:16 |
| → kfoonamalik joined | 13:17 |
| ← aua left | 13:17 |
| → aua joined | 13:18 |
|
shtrb
| I'm sorry to ask such a thing, but does anyone have hints about the correct flow from when you using git-cvsimport and preparing patches for cvs. | 13:18 |
|
timofonic
| rudi_s: Oh yes. I'm right now solving a few issues with linux and my laptop (it seem to be related to linux gfx drivers and some obscure thing in my MSI GE62 2QD Apache Pro laptop that has the evil Nvidia Optimus thing). After that, I'll learn Git. I did some tries converting snapshots to a more or less versioned repo. I did a naive and maybe incomplete try of converting a cvs repo to git ( | 13:18 |
|
| https://www.github.com/timofonic/GoldEdPlus from https://sourceforge.net/p/golded-plus ) and made a hard fetch by using "rsync -av rsync://a.cvs.sourceforge.net/cvsroot/golded-plus/\* golded-plus-cvs" before my crappy try to convert CVS to Git, I'll figure how convert "patches" to github "pull requests" and issues to github issues. I'm lobbying their developers to switch to GitHub and showing a complete Github | 13:18 |
|
| conversion might attract them to go for it. | 13:18 |
|
shtrb
| timofonic was the comment targated at me ? | 13:19 |
| → marinin joined | 13:19 |
|
timofonic
| So how to automatically mirror git repos locally and update their mirrors in GitHub at same time? | 13:20 |
| ← piraye left | 13:23 |
| ← upperdeck left | 13:24 |
|
timofonic
| shtrb: No but I accidentally mentioned a similar item. It's not a priority task, I just want to mirror and backup projects in CVS repos and Golded+ is one of them. I used svn2github, but it has issues like unable to accept SVN repos with guest passwords (guest, anonymous, "project name"... I don't understand why people do that) and is unable to mirror non-repo stuff like feature requests and "patches" in | 13:24 |
|
| sourceforge, plus obviously no CVS support (I know CVS to Git conversion is quite problematic...) | 13:24 |
| ← Murr left | 13:26 |
| → Murr joined | 13:26 |
| → Milijus joined | 13:26 |
|
shtrb
| timofonic , thanks | 13:27 |
| → upperdeck joined | 13:28 |
|
timofonic
| shtrb: I used cvs2svn from tigris SVN (a bit more updated) but not sure if the results are okay ( https://www.github.com/timofonic/GoldEdPlus ). Some people recommend to use ESR's cvs-fast-export, I'll try it because I'm bored waiting for help to improve my adopted Arch User Repository package (https://aur.archlinux.org/packages/linux-drm-tip-git and I think https://www.github.com/timofonic/linux-drm-tip-git | 13:28 |
|
| too) | 13:28 |
|
| Despite the cvs2svn name, it supports git and other formats. There's reposurgeon too. ESR has a howto about migrating to DVCS, but it seems too techie for me :P | 13:29 |
|
shtrb
| I have access to a cvs repo , and I like git , adding svn in the loop sound too much for me | 13:29 |
|
| in my case the original repo will continue working in cvs (git only for me as a dev ) | 13:30 |
| ← ozette left | 13:30 |
|
timofonic
| aESR = Eric S. Raymond, the author of "The Cathedral and the Bazaar" and somewhat quite controversial. He's Aspie too :P | 13:30 |
| ← sushain left | 13:30 |
|
timofonic
| shtrb: No, the "cvs2svn" name is very confusing. When you install it, different commands appear and one of them is cvs2git. | 13:31 |
|
| (sorry, he has... I myself have ADHD :P ) | 13:34 |
|
shtrb
| what's an aspie ? | 13:35 |
|
_ikke_
| Person with Aspergers syndrome | 13:35 |
| → xaa joined | 13:37 |
|
shtrb
| oh thanks , does it make any influence on person coding skills (why is that an important point ) ? | 13:37 |
|
timofonic
| shtrb: It's a slang for someone having Asperger, it can be used pejoratively but I use it in a friendly and funny way the same as I say "negro" to african friends. There's no slang for ADHD I'm aware of :P | 13:37 |
| → mkali joined | 13:37 |
| ← aax left | 13:40 |
| ← h12o left | 13:42 |
|
timofonic
| shtrb: Asperger people are quite special, their defficit in natural social skills and such might compensated by hypertrofiated (I mean a lot more developed than ususal, not sure if using a valid English word, I'm not native English) logic skills. But many of them finally develop social skills with proper environment stimulation. Anyway, ESR has cerebral paralysis and maybe got confused with someone other, of | 13:43 |
|
| maybe he has both things. But he has a black belt in some martial arts and is crazy enough to do risky sports. Despite his controversies, he's an interesting person and he has lots of expertise converting CVS repos to Git and developed a very interesting tool named "reposurgeon" | 13:43 |
| ← marinin left | 13:46 |
| → YuGiOhJCJ joined | 13:49 |
| → Rodya_ joined | 13:50 |
|
shtrb
| I like how you put risky sports and converting cvs in the same context :) | 13:50 |
|
timofonic
| shtrb: Look at http://catb.org/~esr/reposurgeon/dvcs-migration-guide.html | 13:51 |
|
| shtrb: converting cvs to git might be a risky sport too, that's why he developed tools such as reposurgeon :P | 13:51 |
|
slazer
| could sb explain what does 'git push origin HEAD --force' do? | 13:51 |
| → denimsoft joined | 13:52 |
|
shtrb
| I think you overrite the data | 13:52 |
| → lkolstad joined | 13:52 |
|
dminuoso_
| !force | 13:52 |
|
gitinfo
| [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push --force-with-lease`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards. | 13:52 |
|
shtrb
| slazer ^ that or to make your coleagues start crying | 13:53 |
| → overlord_tm joined | 13:53 |
|
dminuoso_
| slazer: And the 'HEAD' is unnecessary, as its implied when left out. | 13:53 |
|
slazer
| !rewrite | 13:54 |
|
gitinfo
| Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 13:54 |
|
shtrb
| slazer , that is why I said you are going to make the other people cry | 13:54 |
|
slazer
| shtrb: "will have to do work" ...what work? | 13:55 |
| → Keyoo joined | 13:56 |
| → Noldorin joined | 13:56 |
| ← CheckDavid left | 13:56 |
|
shtrb
| I think they would need to pull & reset and reapply their local changes on top of that | 13:57 |
| → Tobbi joined | 13:58 |
| → tarkus joined | 14:00 |
| → marinin joined | 14:01 |
| → Achylles joined | 14:01 |
| → acidjnk joined | 14:03 |
| ← SpeakerToMeat left | 14:04 |
| → hw_ joined | 14:05 |
| ← a3Dman left | 14:06 |
| → dreiss joined | 14:07 |
| → lucasem_ joined | 14:07 |
| ← lucasem left | 14:08 |
| ← lucasem_ left | 14:08 |
| → lucasem joined | 14:08 |
| ← slazer left | 14:10 |
| → ShalokShalom_ joined | 14:10 |
| ← denimsoft left | 14:10 |
| → Sound joined | 14:12 |
| → a3Dman joined | 14:12 |
| ← ShalokShalom left | 14:13 |
| → h12o joined | 14:13 |
|
aua
| Hi, regarding server-side 'git gc', I've found much discussion | 14:13 |
|
| with some saying 'don't care, will (eventually) happen automatically' | 14:13 |
|
| and some saying 'should (occasionally) be triggered manually'. OK. | 14:13 |
|
| What I didn't find an answer for is: for my local git-over-ssh server, | 14:13 |
|
| is there any(serverside)body at all that can trigger 'git gc' eventually | 14:13 |
|
| automatically? I'd guess, no. That is, gc needs to be run manually. | 14:13 |
|
| Am I missing something? | 14:14 |
|
| | 14:14 |
| ← mbrumbelow left | 14:16 |
| → mbrumbelow joined | 14:17 |
| → bongozig joined | 14:18 |
| ← upperdeck left | 14:18 |
|
_ikke_
| aua: processes like send-pack and receive-pack can trigger GC | 14:19 |
|
aua
| _ikke_: They trigger something like 'ssh <server> git gc'? | 14:21 |
| ← nicolai86 left | 14:21 |
| → denimsoft joined | 14:21 |
|
_ikke_
| aua: not the command git gc, but they can trigger garbage collection | 14:22 |
|
| aua: note that git over ssh runs git processes | 14:22 |
|
| aua: it's not just sending files | 14:22 |
| → upperdeck joined | 14:23 |
|
aua
| _ikke_: OK. Didn't know that. Thanks! | 14:23 |
| ← narendraj9 left | 14:25 |
| → ertes joined | 14:26 |
| → usm4n joined | 14:26 |
| → narendraj9 joined | 14:26 |
| ← narendraj9 left | 14:27 |
| ← usm4n left | 14:27 |
| → nicolai86 joined | 14:27 |
| → bongozig_ joined | 14:29 |
| ← bongozig left | 14:31 |
| ← upperdeck left | 14:32 |
| → livingstn joined | 14:33 |
| ← nicolai86 left | 14:33 |
| ← Elon_Satoshi left | 14:35 |
| → Elon_Satoshi joined | 14:36 |
| → upperdeck joined | 14:36 |
| ← Nizumzen left | 14:38 |
| ← in1t3r left | 14:38 |
| → in1t3r joined | 14:39 |
| → Patriqu joined | 14:39 |
| → nicolai86 joined | 14:40 |
| ← livingstn left | 14:41 |
| ← Keyoo left | 14:44 |
| → Gurkenglas joined | 14:45 |
| ← nicolai86 left | 14:45 |
| → highkix joined | 14:46 |
| → nicolai86_ joined | 14:46 |
| ← marinin left | 14:47 |
| ← upperdeck left | 14:49 |
| ← in1t3r left | 14:50 |
| → in1t3r joined | 14:51 |
| ← clas1c left | 14:52 |
| ← _ng left | 14:53 |
| → tmsmith joined | 14:53 |
| ← denimsoft left | 14:54 |
| → upperdeck joined | 14:54 |
| → simka joined | 14:54 |
| → denimsoft joined | 14:55 |
| ← denimsoft left | 14:55 |
| → denimsoft joined | 14:56 |
| ← YuGiOhJCJ left | 14:56 |
| → _ng joined | 14:57 |
| ← CyberShadow left | 14:57 |
| ← upperdeck left | 14:59 |
| → bronson joined | 15:00 |
| → wootehfoot joined | 15:00 |
| ← simka left | 15:03 |
| → simka joined | 15:03 |
| → upperdeck joined | 15:03 |
| ← bronson left | 15:05 |
| → SpeakerToMeat joined | 15:07 |
| ← aua left | 15:09 |
| ← masuberu left | 15:09 |
|
zxd
| any idea why git is downloading new tags even though I specified /usr/bin/git fetch --no-tags ... | 15:11 |
| ← tkore\work left | 15:12 |
|
kadoban
| zxd: What's in your fetch spec maybe? | 15:13 |
|
zxd
| also I set in config file fetch = +refs/heads/*:refs/remotes/repository/* and it dosen't create the directory repository if I do /usr/bin/git fetch --no-tags refs/heads/master only if I leave out "refs/heads/master" | 15:14 |
|
| kadoban: tagopt = --no-tags | 15:14 |
|
| AH | 15:15 |
|
| I know why | 15:15 |
|
| I have fetch = +refs/tags/*:refs/tags/repository/* | 15:15 |
|
| I guess it's using that in config file | 15:15 |
|
kadoban
| Yep | 15:15 |
|
zxd
| fI thought if I had explicit told what to fetch it wouldn't try to fetch anything else | 15:16 |
| → Gustavo6046 joined | 15:17 |
|
kadoban
| --no-tags just affects the automatic tag fetching behavior (where it gets any tags that point at commits you're fetching otherwise) | 15:17 |
| ← zefferno left | 15:18 |
| ← denimsoft left | 15:19 |
| ← linuxmodder left | 15:19 |
|
xaviergmail
| Hey, whenever I git lfs pull, everything appears modified in git status. Is this normal? | 15:20 |
| → linuxmodder joined | 15:20 |
| → denimsoft joined | 15:20 |
| ← denimsoft left | 15:20 |
|
kadoban
| Doesn't sound normal. Nobody ever seems to know anything about lfs here though | 15:20 |
| ← upperdeck left | 15:21 |
| → denimsoft joined | 15:21 |
| ← denimsoft left | 15:21 |
|
zxd
| kadoban: also why isn't it creating the directory refs/remotes/repository/ with git fetch refs/heads/master my refspec has fetch = +refs/heads/*:refs/remotes/repository/* | 15:21 |
| ← raynold left | 15:21 |
| → orbyt_ joined | 15:21 |
| → denimsoft joined | 15:21 |
|
zxd
| it does create the directory and fetch master along others I don't need if I leave out refs/heads/master from git fetch | 15:21 |
| ← denimsoft left | 15:22 |
|
kadoban
| I assume you're specifying a remote somewhere in there? Otherwise the command doesn't even make sense AFAIK. | 15:22 |
| ← simka left | 15:22 |
| → denimsoft joined | 15:22 |
| → Nizumzen joined | 15:22 |
| → piraye joined | 15:22 |
|
xaviergmail
| kadoban: Where could I get more info about lfs? | 15:23 |
| ← denimsoft left | 15:23 |
|
kadoban
| But assuming that, probably because you're specifying a refspec, that's what the refs/head/master thing is. I don't know the exact behavior of that one, it probably just changes FETCH_HEAD or something useless. | 15:23 |
|
| xaviergmail: Not sure personally. It's kinda-sorta a github thing, you could try #github . I mean you're free to try here too of course, it's just I've yet to see a LFS question get any kind of decent answer. The regulars don't seem to know it. | 15:24 |
| ← roygbiv left | 15:24 |
| → jesst joined | 15:24 |
|
zxd
| kadoban: yes ofcourse | 15:24 |
|
xaviergmail
| Oh, I didn't know it was a github tthing | 15:25 |
|
| Thought it had been standardized :s | 15:25 |
|
| Not sure whether I should bother with it at this point then lol | 15:25 |
| ← Sound left | 15:25 |
|
kadoban
| I think it maybe has been, or at least spread a bit. For a while they had the only implementation that anyone seemed to talk about. I thought it was github-only for quite a while, but then someone from bitbucket yelled at me once, heh. | 15:25 |
| → upperdeck joined | 15:26 |
|
xaviergmail
| hehe | 15:26 |
| ← Murr left | 15:26 |
|
xaviergmail
| gitlab has support for it as well | 15:26 |
| → Murr joined | 15:26 |
| ← dreiss left | 15:27 |
| → Milijus_ joined | 15:28 |
| ← Milijus left | 15:28 |
| → stutter joined | 15:29 |
| → ShapeShifter499 joined | 15:31 |
| ← _ng left | 15:32 |
|
zxd
| kadoban: it's because I missed the + in git fetch remote refs/heads/master I guess it won't create the directory without + | 15:36 |
| ← tarkus left | 15:37 |
| ← mbrumbelow left | 15:43 |
| ← shinnya left | 15:47 |
| ← Milijus_ left | 15:48 |
| ← Diaoer left | 15:49 |
| → Milijus_ joined | 15:49 |
| → YuGiOhJCJ joined | 15:49 |
| → _kk22kk_ joined | 15:50 |
| ← eb0t left | 15:51 |
| → eb0t joined | 15:51 |
| → rominron_ joined | 15:52 |
| ← grumble left | 15:54 |
| → rumble joined | 15:55 |
| rumble → grumble | 15:55 |
| → paul424 joined | 15:55 |
| → sq-one joined | 15:56 |
| → marinin joined | 15:57 |
| ← Cabanossi left | 15:59 |
| ← Furai left | 15:59 |
| → Cabanossi joined | 16:00 |
| ← ertes left | 16:00 |
| → Furai joined | 16:00 |
| → ertes joined | 16:01 |
| → dave0x6d joined | 16:01 |
| ← Tobbi left | 16:01 |
| → jnavila joined | 16:02 |
| → ok91 joined | 16:03 |
| ← in1t3r left | 16:04 |
| → in1t3r joined | 16:04 |
| ← in1t3r left | 16:04 |
| → Tobbi joined | 16:05 |
| → menip joined | 16:05 |
| ← _kk22kk_ left | 16:06 |
| → gugah joined | 16:09 |
| ← marinin left | 16:09 |
| ← kfoonamalik left | 16:10 |
| → flavius joined | 16:12 |
| → coco joined | 16:12 |
| → dreiss joined | 16:15 |
| → kfoonamalik joined | 16:16 |
| ← Soni left | 16:19 |
| ← jottr left | 16:22 |
| → Soni joined | 16:22 |
| ← highkix left | 16:25 |
| → LeBlaaanc joined | 16:26 |
| ← Cabanossi left | 16:27 |
| → Gustavo6046_ joined | 16:28 |
| → neightchan joined | 16:29 |
| ← Gustavo6046_ left | 16:29 |
| ← kfoonamalik left | 16:30 |
| → Cabanossi joined | 16:30 |
| ← Gustavo6046 left | 16:31 |
| ← Rodya_ left | 16:33 |
| → dviola joined | 16:34 |
| → Rodya_ joined | 16:35 |
| ← Nizumzen left | 16:36 |
| ← whitby left | 16:36 |
| → jottr joined | 16:37 |
| → Gustavo6046 joined | 16:37 |
| → whitby joined | 16:38 |
| ← jesst left | 16:39 |
| ← neightchan left | 16:40 |
| → jungsubk joined | 16:41 |
| ← ShapeShifter499 left | 16:42 |
| → ShapeShifter499 joined | 16:43 |
| ← Achylles left | 16:43 |
| → venmx joined | 16:43 |
| → venmx_ joined | 16:43 |
| ← ShapeShifter499 left | 16:43 |
| → immae joined | 16:51 |
| ← FernandoBasso left | 16:52 |
| ← Gustavo6046 left | 16:53 |
| ← dreiss left | 16:53 |
| ← Rodya_ left | 16:54 |
| → bergice_ joined | 16:55 |
| → jimi_ joined | 16:57 |
| → Gustavo6046 joined | 16:57 |
| → hseg joined | 16:58 |
|
hseg
| Hi. How do I limit testing for WIP commits on branches not matching *-wip? | 16:59 |
| ← hipster_stalin left | 16:59 |
| ← diogenese left | 16:59 |
|
hseg
| (Idea is that *-wip branches on a server serve as backups for people's wip, but such commits shouldn't infect mainline code) | 17:00 |
| ← bongozig_ left | 17:00 |
| ← Tobbi left | 17:01 |
| → bronson joined | 17:01 |
|
_ikke_
| That might be tricky | 17:02 |
|
hseg
| If I'm reading correctly, this should be as easy as testing whether the third field matches *-wip, no? | 17:02 |
| → _ng joined | 17:02 |
|
_ikke_
| ah, you mean in a pre-receive hook | 17:02 |
| ← h12o left | 17:03 |
| → robinb joined | 17:03 |
|
hseg
| Sure. But am constrained ATM to adding hooks to the clients. | 17:04 |
|
| No worries of people bypassing the hooks. | 17:04 |
| → thiago joined | 17:04 |
|
_ikke_
| what hook are you using? | 17:05 |
|
hseg
| pre-push | 17:05 |
|
| Trying to avoid pushing bad commits to good branches. | 17:05 |
|
_ikke_
| right | 17:05 |
|
| then indeed, you can check $3 | 17:06 |
|
hseg
| Makes sense to move this over to pre-receive whenever I get access to the server-side hooks later. | 17:06 |
| ← bronson left | 17:06 |
|
hseg
| So just test [[ $3 =~ "*-wip" ]] ? | 17:07 |
| ← shtrb left | 17:07 |
| ← robinb left | 17:08 |
| ← bket left | 17:08 |
|
hseg
| ... That should be [[ "$3" =~ ^.*-wip$ ]] | 17:08 |
|
_ikke_
| and if the commits include a wip commit of course | 17:09 |
|
hseg
| Ofc | 17:09 |
| → MattMaker joined | 17:09 |
|
_ikke_
| I think the format you get is refs/heads/wip-bar for example | 17:09 |
|
hseg
| Right. | 17:09 |
|
| ... My format is branch-wip | 17:10 |
|
_ikke_
| right, but you are getting a fully qualified ref name | 17:10 |
|
hseg
| Point | 17:11 |
| ← drodger left | 17:12 |
| → Darcidride joined | 17:12 |
| ← Cabanossi left | 17:12 |
|
hseg
| OK, it works, thanks! | 17:14 |
| → Tobbi joined | 17:14 |
|
_ikke_
| yw! | 17:14 |
| ← Gurkenglas left | 17:15 |
| → Cabanossi joined | 17:15 |
| → jceb joined | 17:15 |
|
hseg
| I keep forgetting which channels have karma tracking. IIRC, this is one of them, no? | 17:15 |
|
bremner
| hseg++ | 17:16 |
| → Solvaring joined | 17:16 |
|
bremner
| err. | 17:16 |
|
| thanks hseg | 17:16 |
|
| bremner glares at the bot | 17:16 |
|
_ikke_
| bremner: the bot does not give feedback about that | 17:16 |
| ← jungsubk left | 17:17 |
|
_ikke_
| hseg: it has, it works by highlighting someone | 17:17 |
|
| !karma | 17:17 |
|
gitinfo
| This channel is equipped with karma measuring devices. If you want to help someone to karmic nirvana, please mention their name when thanking them ("thank you", "thanks", "thx", etc.). Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Karma is not for those seeking instant gratification. | 17:17 |
|
hseg
| Ah. | 17:17 |
|
| Thanks _ikke_ | 17:17 |
| → diogenese joined | 17:18 |
| → bket joined | 17:19 |
| → jungsubk joined | 17:21 |
| ← flavius left | 17:22 |
| → drodger joined | 17:23 |
| ← xaviergmail left | 17:23 |
| → flavius joined | 17:24 |
| ← CalimeroTeknik left | 17:24 |
| → Lyqyd joined | 17:24 |
| → in1t3r joined | 17:25 |
| ← manuelschneid3r left | 17:25 |
| ← Murr left | 17:26 |
| → Murr joined | 17:26 |
| → CalimeroTeknik joined | 17:27 |
| → Nizumzen joined | 17:28 |
| ← jungsubk left | 17:31 |
| → h12o joined | 17:31 |
| → kasual joined | 17:33 |
| → snowkidind joined | 17:34 |
| ← coco left | 17:37 |
| → dreiss joined | 17:39 |
| → TikityTik joined | 17:39 |
| ← Tobbi left | 17:42 |
| ← dreiss left | 17:46 |
| ← YuGiOhJCJ left | 17:47 |
| → Tobbi joined | 17:47 |
| → CyberShadow joined | 17:50 |
| ← jimi_ left | 17:51 |
| ← jceb left | 17:52 |
| ← timofonic left | 17:52 |
| → dreiss joined | 17:53 |
| → j08nY joined | 17:57 |
| → manuelschneid3r joined | 17:58 |
| → glebihan_ joined | 17:58 |
|
zxd
| does git push repository , cause a fetch command to be executed on repository aswell? | 18:01 |
|
_ikke_
| nope | 18:01 |
| ← hoangtg left | 18:01 |
|
_ikke_
| push only pushes, fetch only fetches | 18:01 |
| ← ahrs left | 18:03 |
| ← Shakeel_ left | 18:03 |
| → ahrs joined | 18:04 |
| → Milijus joined | 18:04 |
|
zxd
| weird | 18:05 |
|
_ikke_
| what is weird? | 18:05 |
| ← Milijus_ left | 18:06 |
| → marshmn joined | 18:06 |
| → marinin joined | 18:07 |
| → Shakeel_ joined | 18:08 |
| ← LeBlaaanc left | 18:09 |
|
zxd
| I set up a a bare repository with a bunch of remotes configured in it, half are I just fetch from them and the other half I push to them, | 18:11 |
|
| https://paste.fedoraproject.org/paste/ItZn75XhRMv8l~BtRrmQUw | 18:11 |
|
| I fetch from repo-bar and push to repo-foo | 18:11 |
|
| but refs/remotes/repo-foo/master gets created when I do that | 18:11 |
| → Satsuki joined | 18:11 |
| ← Satsuki left | 18:11 |
| → simka joined | 18:12 |
|
_ikke_
| zxd: yes, pushing also creates / updates remote tracking branches | 18:12 |
|
zxd
| what is / ? | 18:13 |
|
_ikke_
| or | 18:14 |
|
zxd
| that's good :) | 18:15 |
|
_ikke_
| right | 18:16 |
|
| So what's unexpected then? | 18:16 |
| → SwiftMatt joined | 18:16 |
|
zxd
| was just confirming if that what it was doing, wasn't 100% sure | 18:16 |
|
_ikke_
| alright | 18:17 |
| ← SwiftMatt left | 18:17 |
| ← piraye left | 18:17 |
| ← MattMaker left | 18:18 |
| → MattMaker joined | 18:20 |
| → jimi_ joined | 18:20 |
| → SwiftMatt joined | 18:20 |
| ← marshmn left | 18:28 |
|
zxd
| I was going to use submodules for some other problem, but got discouraged after reading and testing what they describe in 'Merging Submodule Changes' https://git-scm.com/book/en/v2/Git-Tools-Submodules | 18:30 |
| → obacht-heiss joined | 18:30 |
|
zxd
| if I commit changes to submodule and dont push and someone elses commits changes to submodule and pushes, and I do git pull from superproject it will always print that conflict message | 18:31 |
| ← obacht-heiss left | 18:31 |
| ← SwiftMatt left | 18:32 |
|
_ikke_
| zxd: it's about the same when 2 branches add the same file or one touches a file and the other removes it | 18:32 |
|
| (it's a tree conflict) | 18:32 |
|
zxd
| from the superproject stand of view? 1600 entry of the submodule (gitlink) is the conflict ? | 18:33 |
| ← realies left | 18:33 |
|
zxd
| 160000 | 18:33 |
| → Milijus_ joined | 18:33 |
| ← Milijus_ left | 18:34 |
| ← CyberShadow left | 18:34 |
| → wrkrcoop joined | 18:34 |
| → Milijus_ joined | 18:35 |
| ← marinin left | 18:35 |
|
wrkrcoop
| hi, i just cloned a repo called Common into my directory and when i git add, commit, and push it shows up on github as a file … but its a folder … can someone tell me why? | 18:35 |
|
_ikke_
| zxd: You have to choose what commit of the submodule should be tracked | 18:35 |
|
thiago
| what is "it" that shows up as a file but is a folder? | 18:36 |
| → marinin joined | 18:36 |
| → Guest90177 joined | 18:36 |
|
_ikke_
| a git module | 18:36 |
| ← Milijus left | 18:36 |
|
zxd
| _ikke_: to fix the conflict it's a bit awkawrd | 18:36 |
|
wrkrcoop
| thiago: its called Common and it has a bunch of tools in it | 18:36 |
|
thiago
| oh, he cloned a repository into an existing repository | 18:36 |
|
| wrkrcoop: correct? | 18:36 |
|
| wrkrcoop: clone a repository into a repository? | 18:36 |
|
wrkrcoop
| thiago: yeah but i have other repos with a cloned repoistory and its fine | 18:36 |
|
| yeah | 18:36 |
|
thiago
| wrkrcoop: ok, you created a submodule | 18:36 |
|
wrkrcoop
| thiago: ok so how do i commit that? | 18:37 |
|
thiago
| wrkrcoop: you have committed that | 18:37 |
|
wrkrcoop
| i mean how do i get it to show up on github as a folder and not a file? | 18:37 |
|
thiago
| wrkrcoop: don't care about github | 18:37 |
|
| wrkrcoop: the git part is done and working | 18:37 |
|
| wrkrcoop: but maybe you want to use git submodule | 18:38 |
|
wrkrcoop
| thiago: but it saves it as a file and not a folder, like when i cloned it and typed git status it only showed one file | 18:38 |
|
thiago
| wrkrcoop: git ls-tree @ | grep Common | 18:38 |
|
| what does that say? | 18:38 |
|
wrkrcoop
| thiago: 160000 commit e9603eafce00bb885af67f1d7794be433df2ced6 Common | 18:38 |
|
thiago
| wrkrcoop: so it's correct | 18:38 |
|
| wrkrcoop: it's saved neither as a folder or as a file. It's a commit. | 18:39 |
|
wrkrcoop
| ok what does git submodule do | 18:39 |
|
thiago
| a git submodule link | 18:39 |
|
| did you want to track that content as part of a separate repository? | 18:39 |
|
| wrkrcoop: you probably want this: undo this commit you've made, rm -rf Common/.git, git add Common | 18:40 |
| → bdbaddog joined | 18:41 |
|
bdbaddog
| Greetings. Will git reflog expire —expire=now —all lose any history? | 18:42 |
|
thiago
| no, just the reflog | 18:42 |
|
| history is never pruned | 18:42 |
|
wrkrcoop
| thanaks thiago | 18:42 |
| → buggaboosanchez joined | 18:42 |
| ← jimi_ left | 18:43 |
| → jimi_ joined | 18:44 |
|
bdbaddog
| thiago - I'm a noob to git. Is there any reason to care about prunig the reflog? As I read from the man page the reflog records where the tips of branches were in the past. will I lose the ability to do anything by running such command? | 18:46 |
|
thiago
| bdbaddog: you shouldn't have to worry about it | 18:47 |
|
| I haven't explicitly expired the reflog in a decade | 18:47 |
|
_ikke_
| The only reason people do that is because they want to get rid of commits locally | 18:47 |
| ← guardian left | 18:48 |
|
bdbaddog
| I manage scons project, we just converted from hg to git, and the repo's ballooned to 110MB, some experienced git users in the comunity are sugguesting git reflog expire to shrink the repo. | 18:48 |
|
_ikke_
| I would not do that for a 110MB repo | 18:48 |
|
bdbaddog
| according to the community members we'll srhink from 110mb to 12.26 mb | 18:48 |
|
_ikke_
| The reflog will expire eventually | 18:48 |
|
thiago
| bdbaddog: as I said, you shouldn't care | 18:49 |
|
_ikke_
| You can use --expire-unreachable | 18:49 |
|
thiago
| bdbaddog: how did you convert? | 18:49 |
|
_ikke_
| The reflog is usefull | 18:49 |
|
thiago
| it's probably not the reflog | 18:49 |
|
bdbaddog
| initially used github's conversion, but that dropped history so switch to hg-fast-import and that kept the history. | 18:50 |
| → fatalhalt joined | 18:50 |
| ← marinin left | 18:50 |
|
thiago
| ah, there you go | 18:50 |
|
| git fast-import produces really poorly-compressed repositories | 18:50 |
|
| you should do git repack -a -d -f after you've finished the import | 18:51 |
| → marinin joined | 18:51 |
|
bdbaddog
| hmm. already pushed to github, if I do that (or the reflog expire), will that shrink the size of the repo for users cloning from github, or do I need to create a new repo on github? | 18:51 |
|
_ikke_
| thiago: why -f? | 18:51 |
|
| thiago: because the existing delta is poor? | 18:52 |
|
thiago
| because I always use that | 18:52 |
|
| thiago checks what it does | 18:52 |
|
thiago
| yes, indeed, force repacking in full with better compression | 18:52 |
|
_ikke_
| right | 18:53 |
| → Milijus__ joined | 18:54 |
|
bdbaddog
| git repack brings it down to 14.06 MB from 110.59MB. | 18:54 |
|
thiago
| :-) | 18:55 |
|
bdbaddog
| will the reflogs expire at some point and shrink it even more? | 18:55 |
|
thiago
| yes, no | 18:55 |
|
| reflog expires all the time and newly unreachable objects get pruned some time later | 18:56 |
|
| it won't shrink more because you *don't* have a reflog right after import | 18:56 |
|
_ikke_
| reflog entries remain for 90 days by default | 18:56 |
| ← Milijus_ left | 18:57 |
| → justan0theruser joined | 18:57 |
| ← rominron_ left | 18:57 |
|
bdbaddog
| will git push (back to github repo) shrink the size on github? or do I need to create a new repo on github? | 18:58 |
|
| looks like "git gc --prune=now --aggressive" pull the repo down to 12.43MB | 18:58 |
|
thiago
| unknown | 18:59 |
|
| that depends on github servers | 18:59 |
|
| --aggressive might make it slower for you | 18:59 |
|
bdbaddog
| o.k. look like it won't push back up to github with the decreased size. | 18:59 |
|
thiago
| are you even having a problem? if you clone from github, how much do you get? | 19:00 |
| ← justanotheruser left | 19:00 |
|
bdbaddog
| if I do a du -h it's 153MB | 19:00 |
|
thiago
| is that on a cloned repository? | 19:00 |
|
bdbaddog
| yes | 19:00 |
|
thiago
| ok | 19:00 |
|
| then either: | 19:00 |
|
| 1) github will compress later | 19:00 |
|
| 2) github will not compress | 19:00 |
|
| which one it is, I can't tell you | 19:01 |
|
| you may try to delete the repository and recreate it, by pushing your compressed version | 19:01 |
| ← justan0theruser left | 19:01 |
| → justanotheruser joined | 19:01 |
|
bdbaddog
| o.k. I guess third times the charm. (First was Github conversion.. which I'm going to not recommend for anyone coming from mercurial if you've used multiple heads due to loss of history) | 19:02 |
| → bronson joined | 19:02 |
|
bdbaddog
| Thanks for your help! | 19:02 |
| → Murr- joined | 19:02 |
| → SkyPatrol joined | 19:04 |
| ← Murr left | 19:05 |
| ← SkyPatrol_ left | 19:07 |
| ← bronson left | 19:07 |
|
bdbaddog
| arg.. looks like the above dropped all my branches and tags | 19:08 |
| → SkyPatrol_ joined | 19:08 |
| → energizer joined | 19:08 |
| ← SkyPatrol left | 19:09 |
| ← dave0x6d left | 19:10 |
| ← BouncyKnightMike left | 19:12 |
| McKraken → McKraken_zzzzz | 19:12 |
| ← TikityTik left | 19:15 |
| ← theoceaniscool left | 19:15 |
| ← SkyPatrol_ left | 19:16 |
| ← orbyt_ left | 19:18 |
| → SkyPatrol_ joined | 19:18 |
| → marshmn joined | 19:18 |
| ← buggaboosanchez left | 19:20 |
| → hipster_stalin joined | 19:23 |
| → theoceaniscool joined | 19:25 |
| ← Murr- left | 19:26 |
| → Murr joined | 19:27 |
| ← manuelschneid3r left | 19:30 |
| → jungsubk joined | 19:31 |
| ← Milijus__ left | 19:33 |
| → Milijus joined | 19:33 |
| → raynold joined | 19:38 |
| ← wootehfoot left | 19:38 |
| ← mkali left | 19:39 |
| ← dminuoso_ left | 19:42 |
| ← jhillky left | 19:44 |
| → m0viefreak joined | 19:45 |
| → SkyPatrol joined | 19:45 |
| ← stutter left | 19:46 |
| ← SkyPatrol_ left | 19:47 |
| ← jstein left | 19:48 |
| → QualityAddict joined | 19:52 |
| ← oojacoboo left | 19:53 |
| → Quetzal2 joined | 19:53 |
| ← zenirc369 left | 19:55 |
| ← Quetzal2 left | 19:57 |
| ← theoceaniscool left | 19:58 |
| → steven_a_s joined | 19:58 |
| → clickjack joined | 19:58 |
| → kfoonamalik joined | 19:58 |
| → stutter joined | 19:58 |
| → oojacoboo joined | 19:58 |
| → orbyt_ joined | 19:59 |
| → cagedwisdom joined | 19:59 |
| ← Raed_ left | 20:00 |
| → Raed joined | 20:00 |
| ← jungsubk left | 20:01 |
| → jungsubk joined | 20:02 |
| → rmbeer joined | 20:02 |
|
rmbeer
| hello | 20:02 |
| ← freimatz left | 20:03 |
| → Milijus_ joined | 20:04 |
|
rmbeer
| i can with git take a complete list of sha for register in the copyright patents? | 20:04 |
|
Toba
| what? | 20:06 |
| ← Milijus left | 20:06 |
|
Toba
| Do you mean putting the commit IDs in the patent applications? | 20:06 |
|
| Copyright Patents is not a thing I've heard of.. what exactly do you mean? | 20:06 |
|
| Also, <soapbox>software patents are an immorral cancer and if you are applying for one, you are my eternal enemy, good day.</soapbox> | 20:07 |
|
thiago
| there's copyright and there are patents | 20:07 |
|
| copyright patents don t exist | 20:07 |
|
rmbeer
| Toba, i want use the sha instead of source code for the registers of patents | 20:07 |
|
Toba
| good day, sir. | 20:07 |
|
thiago
| rmbeer: what do you want to get a list of? | 20:08 |
| ← jnavila left | 20:08 |
|
rmbeer
| thiago, list of sha from the any project for the register | 20:08 |
|
rewt
| no, the thing you're patenting has to be in the patent | 20:08 |
| ← overlord_tm left | 20:09 |
|
rewt
| saying "here's a number that's unique to my thing" is not sufficient | 20:09 |
|
| but this is a question for a lawyer, not #git | 20:09 |
| ← kfoonamalik left | 20:10 |
|
rewt
| and usually patents describe your invention; you shouldn't have any source code in there | 20:11 |
|
thiago
| rmbeer: list of sha of what? | 20:11 |
|
| rmbeer: all files? all tres and files? all commits? | 20:11 |
|
| rmbeer: tags too? | 20:11 |
|
rmbeer
| thiago, all commits | 20:11 |
|
thiago
| rmbeer: git rev-list --all | 20:12 |
|
rmbeer
| thinking that is sufficient for to prove that your source code is real. | 20:12 |
|
thiago
| correct | 20:13 |
| ← Sleepy63 left | 20:13 |
|
rmbeer
| thiago, thanks | 20:13 |
|
thiago
| that's the *point* of a cryptographic hash function | 20:13 |
|
| wait, it's *not* sufficient | 20:13 |
|
| you cannot reverse from a SHA-1 to code | 20:13 |
| ← a3Dman left | 20:15 |
| → roygbiv joined | 20:16 |
|
rmbeer
| thiago, is sufficient for me, i no want give the code... | 20:17 |
| ← steven_a_s left | 20:17 |
|
thiago
| you do realise the whole point of a patent is to explain how something is done, right? | 20:17 |
|
_ikke_
| rmbeer: it doesn't matter what's sufficient to you | 20:18 |
|
thiago
| anyway, your lawyer will draft the patent for you | 20:18 |
| → buggaboosanchez joined | 20:18 |
| ← buggaboosanchez left | 20:18 |
| → buggaboosanchez joined | 20:20 |
| → coco joined | 20:20 |
|
Toba
| thank you for the laugh, rmbeer. I needed a good chuckle | 20:20 |
| → axs221_ joined | 20:20 |
|
Toba
| It really fits well into my philosophy that anyone who wants a software patent really doesn't get it, very nicely | 20:21 |
|
| cheers | 20:21 |
| ← buggaboosanchez left | 20:21 |
| → buggaboosanchez joined | 20:21 |
|
_ikke_
| rmbeer: the original idea about patents is that you get temporary monoply in exchange of describing the invention so that that info does not get lost. You cannot get only 1 part of the deal. | 20:22 |
| → a3Dman joined | 20:22 |
| ← axs221 left | 20:23 |
|
rmbeer
| _ikke_, i see... interesting idea... | 20:23 |
|
thiago
| more than just "not get lost", the point is to explain it for the betterment of everyone | 20:24 |
|
_ikke_
| thiago: that's implied with not getting lost | 20:24 |
|
thiago
| I prefer it being explicit: it's just not making something cryptic public | 20:24 |
|
| it's about explaining the invention | 20:24 |
| ← linuxmodder left | 20:24 |
| → linuxmodder joined | 20:25 |
| → svm_invictvs joined | 20:25 |
|
rmbeer
| thiago, the problem is that no is for the public... | 20:25 |
| ← marshmn left | 20:26 |
| → Phylock joined | 20:26 |
|
_ikke_
| rmbeer: some companies choose to forfeit pattenting stuff in order not having to publish the idea | 20:26 |
| ← Milijus_ left | 20:27 |
|
thiago
| rmbeer: then don't patent | 20:27 |
|
| keep it a secret | 20:27 |
|
Toba
| yeah, what you want is a trade secret | 20:27 |
|
| which is seemingly what you already have. | 20:27 |
|
thiago
| but if someone discovers your secret, you have no protection | 20:27 |
|
Peng
| rmbeer: Is your goal to make the world a worse place? | 20:27 |
| → cdown joined | 20:27 |
| ← svm_invictvs left | 20:28 |
| ← marinin left | 20:28 |
|
rmbeer
| Peng, yes, I want the destruction of the whole world! | 20:29 |
|
| i build the virus T! | 20:30 |
|
| and in C++! | 20:30 |
|
Toba
| Please keep it a trade secret then... wouldn't want everyone knowing how to make and release Virus T | 20:30 |
| → Sleepy63 joined | 20:31 |
| ← lkolstad left | 20:31 |
| → Parraki joined | 20:32 |
| ← sq-one left | 20:33 |
| → vjacob joined | 20:38 |
| → marinin joined | 20:38 |
| → LeBlaaanc joined | 20:38 |
| → ShockingIsntIt joined | 20:38 |
| → Locra joined | 20:41 |
| ← cdown left | 20:41 |
| ← Locra left | 20:43 |
| ← clickjack left | 20:44 |
| → safe joined | 20:44 |
|
rmbeer
| Toba, you also laught by the Virus T? | 20:44 |
| ← coco left | 20:46 |
| → jab416171 joined | 20:47 |
| ← a3Dman left | 20:48 |
| → manuelschneid3r joined | 20:48 |
| → dminuoso_ joined | 20:49 |
|
Toba
| Yes, but I will make sure not to retell the joke in case you sue me | 20:49 |
| → cagmz joined | 20:50 |
| ← axs221_ left | 20:50 |
| → axs221 joined | 20:51 |
| ← Darcidride left | 20:51 |
| ← jimi_ left | 20:52 |
| → highkix joined | 20:52 |
|
rmbeer
| Toba, Sorry, I have patented laughter, you owe me double... | 20:53 |
|
Toba
| Blast | 20:53 |
| ← dminuoso_ left | 20:53 |
| ← ivo_ left | 20:55 |
| ← highkix left | 20:56 |
| ← Tobbi left | 20:56 |
| ← Cabanossi left | 20:59 |
| → Cabanossi joined | 21:00 |
| ← marinin left | 21:02 |
| → bronson joined | 21:03 |
| → justan0theruser joined | 21:04 |
| → robinb joined | 21:04 |
| ← justan0theruser left | 21:05 |
| → justan0theruser joined | 21:06 |
| ← justanotheruser left | 21:06 |
| → marinin joined | 21:06 |
| → nocaberi joined | 21:08 |
| ← bronson left | 21:08 |
| ← manuelschneid3r left | 21:08 |
| ← Bock left | 21:08 |
| nocaberi → Bock | 21:09 |
| ← robinb left | 21:09 |
| ← petersaints left | 21:10 |
| → petersaints joined | 21:12 |
| → kyan joined | 21:13 |
| ← Phylock left | 21:13 |
| → Sasazuka joined | 21:14 |
| ← roygbiv left | 21:15 |
| → mbrumbelow joined | 21:15 |
| ← vjacob left | 21:16 |
| ← Sasazuka left | 21:17 |
| ← jottr left | 21:18 |
| → Achylles joined | 21:19 |
| → endiruna joined | 21:20 |
|
skered
| I have a listing of files '??' with 'git status -uall' using 'git clean -f' doesn't remove these files. | 21:21 |
|
| Any idea why? | 21:21 |
| ← marinin left | 21:21 |
| → jottr joined | 21:22 |
| ← dmc left | 21:22 |
| → dmc joined | 21:23 |
| → marinin joined | 21:24 |
| ← mattcen left | 21:25 |
| → tohuw joined | 21:25 |
| ← tohuw left | 21:25 |
| → tohuw joined | 21:25 |
| ← hseg left | 21:26 |
| ← bdbaddog left | 21:27 |
| → mattcen joined | 21:28 |
| ← endiruna left | 21:29 |
| → piraye joined | 21:30 |
| ← safe left | 21:30 |
| → endiruna joined | 21:30 |
|
skered
| Ok running 'git clean -df' fixed it ( even thought I did that before ). shrug. | 21:31 |
| ← Achylles left | 21:33 |
| ← King_Hual left | 21:35 |
| → ronster joined | 21:36 |
| ← jungsubk left | 21:37 |
| → ronc joined | 21:37 |
| → a3Dman joined | 21:37 |
| ← ronc left | 21:37 |
| → marshmn joined | 21:38 |
| ← endiruna left | 21:40 |
| ← rmbeer left | 21:40 |
| → endiruna joined | 21:40 |
| ← tmsmith left | 21:41 |
| ← endiruna left | 21:41 |
| ← schleppel left | 21:42 |
| → svm_invictvs joined | 21:43 |
| ← TomyLobo left | 21:44 |
| → al-damiri joined | 21:44 |
| ← Guest65754 left | 21:45 |
| ← Solvaring left | 21:46 |
| → debian joined | 21:47 |
| debian → Guest95681 | 21:47 |
| ← marshmn left | 21:52 |
| → durham joined | 21:52 |
| ← JerkyMcJerkface[ left | 21:53 |
| ← aard__ left | 21:54 |
| ← mbrumbelow left | 21:55 |
| → Outsider__ joined | 21:56 |
| ← Puffball left | 22:00 |
| ← wrkrcoop left | 22:01 |
| → wrkrcoop joined | 22:02 |
| → Puffball joined | 22:03 |
| → askb joined | 22:04 |
| ← john_hexis left | 22:06 |
| ← paul424 left | 22:06 |
| → theoceaniscool joined | 22:09 |
| ← stutter left | 22:10 |
| → bdbaddog joined | 22:10 |
| ← Puffball left | 22:11 |
|
bdbaddog
| question about expected functionality.. I checkout a fork, then I add the usptream remote, then i checkout -b mybranch upstream/master, make changes, and git push.. git's trying to push to the upstream repo. Is that expected? | 22:11 |
| ← voiceftp left | 22:11 |
| → voiceftp joined | 22:12 |
| ← orbyt_ left | 22:12 |
| ← ronster left | 22:12 |
| → ronster joined | 22:13 |
| → czart__ joined | 22:13 |
| ← PioneerAxon left | 22:13 |
| ← tilpner left | 22:13 |
| → roygbiv joined | 22:14 |
| → orbyt_ joined | 22:15 |
| ← dreiss left | 22:16 |
| ← czart_ left | 22:17 |
| ← simka left | 22:17 |
| → Mattiaslndstrm joined | 22:18 |
|
parsnip
| bdbaddog: if you do `git push` without specifying the remote, it may be looking in for .git/config for a default. | 22:20 |
| ← paskl left | 22:20 |
| → paskl joined | 22:21 |
|
parsnip
| bdbaddog: can check with `git config --list | grep remote` | 22:21 |
| ← xaa left | 22:23 |
|
bdbaddog
| parsnip: is the default per branch? | 22:23 |
|
| (local branch) | 22:23 |
|
parsnip
| bdbaddog: maybe you want the default fetch to be upstream, and default push to fork? | 22:25 |
| ← piraye left | 22:25 |
|
parsnip
| i think there's settings for each branch | 22:25 |
| → Es0teric joined | 22:25 |
|
bdbaddog
| I thought after I created a branch of upstream master the branch would go to fork for both push and pull. | 22:26 |
|
parsnip
| from the man page for git-branch, "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the branch.<name>.remote and branch.<name>.merge configuration entries) so that git pull will appropriately merge from the remote-tracking branch." | 22:27 |
| ← paskl left | 22:27 |
|
parsnip
| oh, you used checkout | 22:28 |
| ← mikecmpbll left | 22:28 |
| ← axs221 left | 22:29 |
| → ShapeShifter499 joined | 22:29 |
|
bdbaddog
| yes checkout. | 22:29 |
| → axs221 joined | 22:29 |
| ← theoceaniscool left | 22:30 |
| → overlord_tm joined | 22:30 |
| → paskl joined | 22:30 |
|
parsnip
| man page seems to suggest it will use --track by default, and to see git branch docs. | 22:30 |
| → svm_invi_ joined | 22:31 |
|
bdbaddog
| k. I'll take a look. I used to do this a year ago on another project, and I'm wondering if the behavior changed along with the git push change. | 22:31 |
| ← Es0teric left | 22:31 |
|
parsnip
| and from git push man page, "When the command line does not specify where to push with the <repository> argument, branch.*.remote configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to origin." | 22:31 |
|
bdbaddog
| ahh.. | 22:32 |
|
parsnip
| bdbaddog: i've heard that git doesn't change much | 22:32 |
|
bdbaddog
| the git push default changed a while back you can specify in .gitconfig to be matching, or simple (I think) | 22:32 |
|
parsnip
| oh yeah | 22:33 |
|
| i remember all the notices | 22:33 |
| ← svm_invictvs left | 22:34 |
| ← Guest90177 left | 22:34 |
| svm_invi_ → svm_invictvs | 22:35 |
|
bdbaddog
| o.k. got it.. : git config branch.subst_rewrite.remote origin. did the trick. Thanks for your help! | 22:35 |
|
parsnip
| glad to! | 22:35 |
| ← ok91 left | 22:38 |
| ← justan0theruser left | 22:38 |
| ← menip left | 22:38 |
| ← Raed left | 22:38 |
| → marinin_ joined | 22:39 |
| → ozette joined | 22:39 |
| ← bseyer left | 22:39 |
| ← marinin left | 22:40 |
| ← h12o left | 22:41 |
| → menip joined | 22:41 |
| → xaa joined | 22:42 |
| ← iamthad left | 22:45 |
| ← cagedwisdom left | 22:45 |
| → dave0x6d joined | 22:47 |
| ← ZyX-I left | 22:49 |
| ← jottr left | 22:54 |
| → justan0theruser joined | 22:57 |
| → cagedwisdom joined | 22:58 |
| → vjacob joined | 22:58 |
| ← DogHackit left | 22:59 |
| → Goplat joined | 23:00 |
| → DogHackit joined | 23:01 |
| ← marinin_ left | 23:01 |
| → BowBoy joined | 23:02 |
| ← paskl left | 23:03 |
| ← finalbeta left | 23:03 |
| → bronson joined | 23:04 |
| ← Nizumzen left | 23:06 |
| ← bronson left | 23:09 |
| ← j08nY left | 23:09 |
| → paskl joined | 23:10 |
| → aax joined | 23:11 |
| → Achylles joined | 23:12 |
| ← xaa left | 23:14 |
| → shinnya joined | 23:17 |
| → dreiss joined | 23:18 |
| → TikityTik joined | 23:20 |
| ← ozette left | 23:23 |
| ← Murr left | 23:26 |
| → Murr joined | 23:26 |
| → slazer joined | 23:26 |
|
slazer
| I have heard there is some recommendation for the line length of GIT commit messages, is that true? I also heard there was some key shortcut in VIM to achieve this. | 23:27 |
| ← overlord_tm left | 23:28 |
|
slazer
| is the shortcut 'gq'? | 23:29 |
| ← durham left | 23:31 |
| → Solvaring joined | 23:32 |
|
thiago
| yes, there's a recommendation | 23:33 |
|
| 72 | 23:33 |
| ← orbyt_ left | 23:34 |
| ← ronster left | 23:45 |
| → Es0teric joined | 23:49 |
| ← rorro left | 23:51 |
| ← jakogut left | 23:51 |
| → jakogut joined | 23:53 |
| → Raed joined | 23:55 |
| ← Es0teric left | 23:55 |
| ← Cabanossi left | 23:58 |
| ← hypercube32 left | 23:59 |
| ← aax left | 23:59 |