| 2018-02-18 |
| ← kozy left | 00:00 |
| ← weez17 left | 00:00 |
| → kozy joined | 00:00 |
| → weez17 joined | 00:00 |
| → dermoth joined | 00:00 |
| ← xcm left | 00:02 |
| ← sammyg left | 00:02 |
| → xcm joined | 00:02 |
| → kus joined | 00:02 |
| ← finalbeta left | 00:04 |
| → nowhere_man joined | 00:04 |
| → matsaman joined | 00:04 |
| ← matsaman left | 00:04 |
| → ron____ joined | 00:05 |
| ← cdown left | 00:05 |
| ← nowhereman_ left | 00:07 |
| → rafasc joined | 00:07 |
| ← i336_ left | 00:09 |
| gitinfo set mode: +v | 00:09 |
|
ron____
| I was trying this gitignore for fun : https://gist.github.com/anonymous/f91a69f8e98bbee7bf6f41e86134ecc7 | 00:09 |
|
| And found this result : .gitignore:7:!/app/a app/a | 00:10 |
|
| This is the ouput of git check-ignore app/a -v | 00:10 |
|
| Any idea why? | 00:10 |
| ← ron____ left | 00:10 |
| → i336 joined | 00:11 |
| ← marianina8 left | 00:11 |
| → ronbd joined | 00:11 |
| gitinfo set mode: +v | 00:12 |
| ← BlessJah left | 00:13 |
| → bkxd joined | 00:16 |
| → topdownjimmy joined | 00:17 |
|
GitUserOnlyJust
| maybe something is eating the hard tab? | 00:18 |
| ← King_Hual left | 00:19 |
| ← xfbs left | 00:20 |
| ← cust left | 00:21 |
| ← leeN left | 00:22 |
|
GitUserOnlyJust
| reading the docs, I would expect the output might be: And found this result : .gitignore:7:!/app/a<tabGoesHere>app/a | 00:22 |
|
| provided that the file app/a exists, which is why git check-ignore --verbose is reporting it. | 00:22 |
| → BlessJah joined | 00:25 |
|
ronbd
| git-check-ignore only prints thing which will be ignored | 00:27 |
| ← MACscr left | 00:28 |
|
ronbd
| So the actualy existence of the file should not create any distraction for the command as per the documentation | 00:28 |
|
GitUserOnlyJust
| " If the pattern contained a ! prefix or / suffix, it will be preserved in the output. " I think this means that it will be output no matter what. | 00:32 |
|
| add the --non-matching flag and how the output changes. ( I have no idea ) | 00:33 |
|
ronbd
| not sure what this option does | 00:34 |
|
| Btw, interstingly git check-ignore app/a/b -v or git check-ignore app/b -v works perfeclty | 00:35 |
|
| It prints nothing as per expectation | 00:36 |
|
GitUserOnlyJust
| it says it outputs things which do not match any rule listed in .gitignore | 00:36 |
|
| if those files do not exists, then there should be no output. | 00:36 |
|
| --verbose shows you which files match which rules. It can't tell you it matches a ! rule, if it doesn't put it in the output. | 00:37 |
|
| It seems to me it is doing exactly what you are asking it to do | 00:37 |
|
ronbd
| Let me explain again | 00:38 |
|
GitUserOnlyJust
| I do not think this statement is accurate: "git-check-ignore only prints thing which will be ignored" especially when you add the --verbose flag. | 00:38 |
|
ronbd
| In my .gitignore file : https://gist.github.com/anonymous/f91a69f8e98bbee7bf6f41e86134ecc7 | 00:38 |
|
| Please notice the very first line | 00:39 |
|
| I have instructed to ignore everything in the directory | 00:39 |
| ← manuelschneid3r left | 00:39 |
|
GitUserOnlyJust
| yeah, and then you say "don't ignore this file" | 00:40 |
|
ronbd
| Then in line #3 & #4 explicitly mention to include app directory and app/* | 00:40 |
|
| Then in line #3 & #4 explicitly mention to include app directory and app/a | 00:40 |
|
GitUserOnlyJust
| no | 00:40 |
|
| no /app means a file | 00:40 |
|
ronbd
| So by the definition app/a should be tracked right? | 00:40 |
|
cbreak
| not tracked. Just not ignored. | 00:41 |
|
| if you want to track it, git add -f it | 00:41 |
|
GitUserOnlyJust
| yes, app/a is tracked, it is not ignored. that is what it is telling you. that file matches the "don't ignore me" rule | 00:41 |
| ← shinnya left | 00:41 |
|
ronbd
| Nope app/a is ignored | 00:42 |
|
| I have tried creating a file and it says nothing on the git status | 00:43 |
|
GitUserOnlyJust
| the !/app rule ignores a file named app | 00:43 |
|
| a rule like !/app/ would ignore a directory named app | 00:43 |
|
| ahh... | 00:43 |
|
ronbd
| but anything except a like app/b, app/c, app/d works file | 00:43 |
|
| fine* | 00:43 |
|
GitUserOnlyJust
| because you didn't un-ignore /app/ | 00:44 |
| xcm → Guest21558 | 00:44 |
| ← Guest21558 left | 00:44 |
| → xcm joined | 00:44 |
|
ronbd
| Please visit the very last example here | 00:45 |
|
| https://git-scm.com/docs/gitignore | 00:45 |
| → MACscr joined | 00:45 |
|
ronbd
| I did not find anywhere that /app will only match with file | 00:46 |
|
| Rather than it is mentioned that adding a trailing slash will only match with a directory | 00:46 |
| → cust joined | 00:46 |
|
GitUserOnlyJust
| I don't know what it says in the docs, I only know what I learned from painful experience. | 00:46 |
|
ronbd
| My experience seems to be different here mate then | 00:47 |
| ← cust left | 00:47 |
|
ronbd
| I have tried twice in the meantime | 00:47 |
|
| It worked perfectly fine | 00:47 |
|
| app matches both file and directory where app/ only matches with directory | 00:48 |
| ← GoBear left | 00:48 |
|
GitUserOnlyJust
| but your original question was about git check-ignore --verbose | 00:51 |
|
ronbd
| git check-ignore --verbose just tells you what it will be doing with the gitignore files | 00:53 |
|
| And I found this behaviour either inconsistent with the documentation or failed to understand it | 00:53 |
|
GitUserOnlyJust
| and I don't know what's in your folder. but if files app/b and app/c also exist, I would expect check-ignore --verbose to report that they aren't ignored. | 00:53 |
| ← bkxd left | 00:53 |
|
ronbd
| yes I have app/b & app/c: they are not ignored | 00:54 |
| → bkxd joined | 00:54 |
|
ronbd
| But surprisingly app/a does not match the "dont ignore me rule" and it is ignored | 00:55 |
|
GitUserOnlyJust
| you are right about /app .vs /app/ but I don't see why check-ignore --verbose reports /app/a but not /app/b or /app/c because they should match the !/app "don't ignore me" rule. | 00:56 |
|
ronbd
| If I change !app/**, then git starts to ignore app/a, app/b, app/c, everything inside app. | 00:56 |
|
gitinfo
| [!cant_happen] The scenario you describe does not add up, and/or we feel it is unlikely that there is such a fundamental bug that it could have happened like this. Please provide more detail: what commands (literally!) did you run, what did they say, and what did you expect instead? | 00:56 |
| → tmsmith_ joined | 00:56 |
| ← tmsmith left | 00:57 |
| ← babyflakes left | 00:57 |
| → ashar joined | 00:58 |
| → ashar4 joined | 00:58 |
|
GitUserOnlyJust
| something doesn't add up | 00:58 |
|
ronbd
| No doubt mate | 00:58 |
| ← ashar4 left | 00:58 |
|
ronbd
| Playing with it for more than 4 hours | 00:58 |
|
| Something surely does not add up | 00:59 |
| ← ashar left | 00:59 |
| → ashar joined | 00:59 |
| ← ashar left | 01:00 |
| → cdown joined | 01:00 |
| → ashar joined | 01:00 |
| → xaxxon joined | 01:00 |
| ← RougeR left | 01:03 |
| ← fla77ire left | 01:03 |
| ← menip left | 01:04 |
| ← xcm left | 01:04 |
| → xcm joined | 01:05 |
| ← cdown left | 01:05 |
| ← HollywoodJack left | 01:06 |
| → cdown joined | 01:06 |
| → fla77ire joined | 01:08 |
| → andrewSC joined | 01:08 |
| ← Murr left | 01:08 |
| → learning joined | 01:08 |
| → Murr joined | 01:08 |
|
andrewSC
| hi all, I've been at this for a while now and wanted to make sure I'm not nuts. I'm compiling from source and I see #L2-L3 and #L7 in the output.. https://gist.github.com/andrewSC/96a8a244a9c717bf54c47e3a65fa9eaf | 01:09 |
|
thiago
| waiting for the Git part of the question | 01:10 |
|
andrewSC
| haha right the actual question | 01:10 |
|
| Should I be concerned that a site_perl folder isn't being generated in the mw-to-git folder? or that those targets don't have rules? | 01:12 |
|
| does that make sense? | 01:12 |
|
thiago
| I have no clue | 01:12 |
|
andrewSC
| because iirc there used to be a site_perl folder that was generated | 01:12 |
|
thiago
| but one suggestion: when seeing a make error, run wgain with -j1 | 01:12 |
|
andrewSC
| thiago: yeah i thought it was something race related too | 01:12 |
|
| still get the same error :/ | 01:12 |
|
thiago
| but do you get two errors like in the output you pasted? | 01:13 |
|
andrewSC
| great question | 01:13 |
| ← bkxd left | 01:13 |
|
andrewSC
| lemme run it with j1 and try again/actually save the output this time | 01:13 |
|
thiago
| anyway, I don't know aything about git-mw and I haven't built Git from sources in 10 years or so | 01:13 |
|
andrewSC
| thiago: no worries, I figure I'd atleast ask here since I haven't been able to find an answer with the searching i've done so far | 01:15 |
| ← Amanas left | 01:20 |
| → bkxd joined | 01:20 |
| ← ronbd left | 01:24 |
| → marianina8 joined | 01:25 |
| → bkxd_ joined | 01:26 |
| ← bkxd left | 01:26 |
| ← tmsmith_ left | 01:27 |
| ← bkxd_ left | 01:27 |
| → bkxd joined | 01:29 |
| ← pirocks left | 01:30 |
| ← fla77ire left | 01:33 |
| ← learning left | 01:34 |
| → learning joined | 01:34 |
| → bkxd_ joined | 01:36 |
| ← bkxd left | 01:37 |
| ← konsolebox left | 01:37 |
| ← Lyqyd left | 01:38 |
| → konsolebox joined | 01:39 |
| → bkxd joined | 01:39 |
| ← bkxd_ left | 01:41 |
| ← dviola left | 01:43 |
| ← dave0x6d left | 01:43 |
| ← bkxd left | 01:49 |
| ← liefer left | 01:50 |
|
rafasc
| i keep fogetting that you can do $git checkout - to checkout the previous checked out branch | 01:50 |
| → liefer joined | 01:51 |
| ← cbreak left | 01:52 |
| → cbreak joined | 01:53 |
| ← kbaegis left | 01:57 |
| ← jokajak left | 02:00 |
| → jokajak joined | 02:02 |
| ← konsolebox left | 02:07 |
| ← dermoth left | 02:09 |
| → dermoth joined | 02:09 |
| → konsolebox joined | 02:10 |
| ← hacman left | 02:14 |
| ← dermoth left | 02:15 |
| ← jstein left | 02:16 |
| → dviola joined | 02:17 |
| → FoxRocks joined | 02:21 |
| → finalbeta joined | 02:22 |
| ← justan0theruser left | 02:23 |
| ← aielima left | 02:23 |
| ← jready left | 02:25 |
| ← konsolebox left | 02:27 |
| ← m0viefreak left | 02:28 |
| → konsolebox joined | 02:28 |
| ← VoradorPT left | 02:33 |
| → jready joined | 02:35 |
| → justanotheruser joined | 02:35 |
|
andrewSC
| yeah looks like it prints twice with j1 as well | 02:36 |
|
| tried adding perllibdir to the make for giggles but that didn't change anything | 02:37 |
|
| seems 2.16.2 can build fine locally.. it's just the diff between 2.16.2 and master that's giving me trouble.. Going through the commits there was a bunch of perl related changes but i'm not entirely sure what's the root cause yet | 02:38 |
| → kbaegis joined | 02:38 |
| ← jready left | 02:40 |
| ← justanotheruser left | 02:41 |
| → justanotheruser joined | 02:41 |
| ← kbaegis left | 02:43 |
| ← ilbot3 left | 02:46 |
| → kbaegis joined | 02:50 |
| ← kbaegis left | 02:50 |
| → kbaegis joined | 02:51 |
| → Raed|Laptop joined | 02:52 |
| → mniip joined | 02:52 |
| ← mooasaurus left | 02:55 |
| → mooasaurus joined | 02:55 |
| → ilbot3 joined | 02:57 |
| ← marianina8 left | 02:57 |
| ← xaxxon left | 03:00 |
| ← xcm left | 03:00 |
| → xcm joined | 03:01 |
| → shinnya joined | 03:03 |
| ← andrewSC left | 03:03 |
| ← konsolebox left | 03:05 |
| ← xcm left | 03:06 |
| → xcm joined | 03:06 |
| → konsolebox joined | 03:06 |
| ← cfoch_ left | 03:07 |
| → xaxxon joined | 03:07 |
| ← mlopezviedma left | 03:10 |
| → bmgxc9 joined | 03:11 |
| ← bmgxc9 left | 03:11 |
| → bmgxc9 joined | 03:12 |
| → cdg joined | 03:13 |
| ← Raed|Laptop left | 03:14 |
| → mlopezviedma joined | 03:15 |
| ← konsolebox left | 03:16 |
| → konsolebox joined | 03:17 |
| ← cdg left | 03:17 |
| → Portugol9 joined | 03:18 |
| ← xaxxon left | 03:18 |
| → xaxxon joined | 03:24 |
| ← bouncy left | 03:24 |
| → lagothri1 joined | 03:26 |
| ← kbaegis left | 03:27 |
| ← lagothrix left | 03:29 |
| → chachasmooth_ joined | 03:30 |
| ← chachasmooth left | 03:30 |
| → canvon_ joined | 03:30 |
| ← canvon left | 03:30 |
| ← mlopezviedma left | 03:30 |
| ← FoxRocks left | 03:32 |
| → mlopezviedma joined | 03:33 |
| → djapo joined | 03:35 |
| → bouncy joined | 03:38 |
| ← orbyt_ left | 03:39 |
| → Raed|Laptop joined | 03:40 |
| → kbaegis joined | 03:44 |
| ← kbaegis left | 03:44 |
| ← stoopkid left | 03:46 |
| ← piggah_ left | 03:52 |
| → sat-aton joined | 03:55 |
| ← sat-aton left | 03:55 |
| → sat-aton joined | 03:55 |
| ← satifant left | 03:58 |
| → govg joined | 03:58 |
| → mel__ joined | 03:59 |
| ← mel00010 left | 04:01 |
| → aw1 joined | 04:01 |
| ← aw1 left | 04:02 |
| → MaekSo_ joined | 04:02 |
| → bkxd joined | 04:02 |
| ← xcm left | 04:02 |
| → xcm joined | 04:02 |
| ← MaekSo left | 04:02 |
| MaekSo_ → MaekSo | 04:02 |
| ← bkxd left | 04:03 |
| ← Tobbi left | 04:05 |
| → safe joined | 04:05 |
| ← sentriz left | 04:06 |
| → bkxd joined | 04:06 |
| → sentriz joined | 04:07 |
| ← bkxd left | 04:07 |
| → bkxd joined | 04:09 |
| ← bkxd left | 04:09 |
| → cagomez joined | 04:12 |
| → aw1 joined | 04:13 |
| → Lyqyd joined | 04:13 |
| ← ZyX-I left | 04:13 |
| ← aw1 left | 04:13 |
| → aw1 joined | 04:14 |
| ← utumno left | 04:15 |
| ← rafasc left | 04:18 |
| → orbyt_ joined | 04:18 |
| → texinwien_ joined | 04:19 |
| ← IanLiu left | 04:19 |
| → bkxd joined | 04:21 |
| → marianina8 joined | 04:21 |
| → IndianArya joined | 04:22 |
| ← marianina8 left | 04:23 |
| → marianina8 joined | 04:23 |
| ← aw1 left | 04:23 |
| ← xcm left | 04:24 |
| → xcm joined | 04:25 |
| → dre_ joined | 04:25 |
| → kryp70n joined | 04:25 |
| ← texinwien_ left | 04:25 |
| ← cagomez left | 04:26 |
| ← kryp70n left | 04:29 |
| ← konsolebox left | 04:29 |
| → konsolebox joined | 04:30 |
| → andrewSC joined | 04:31 |
|
andrewSC
| it's this right here that's causing those make error messages: https://github.com/git/git/blob/master/contrib/mw-to-git/Makefile#L24 | 04:31 |
|
| nested make | 04:31 |
| → aw1 joined | 04:36 |
| ← aw1 left | 04:39 |
| → aw1 joined | 04:40 |
| ← IndianArya left | 04:42 |
| ← aw1 left | 04:45 |
| ← xcm left | 04:46 |
| → Realzy joined | 04:47 |
| → theweek3nd joined | 04:47 |
|
theweek3nd
| hi there | 04:47 |
|
gitinfo
| theweek3nd: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 04:47 |
|
theweek3nd
| anyone knows how to backup my linux config file (dotfiles) to github using git? | 04:47 |
| → xcm joined | 04:47 |
| ← bkxd left | 04:51 |
| → bkxd joined | 04:51 |
| ← bkxd left | 04:52 |
| → bkxd joined | 04:53 |
| ← bkxd left | 04:54 |
| → bkxd joined | 04:56 |
| → aw1 joined | 04:57 |
| ← bkxd left | 04:58 |
| ← Cabanossi left | 05:00 |
| → bkxd joined | 05:00 |
| ← bkxd left | 05:00 |
| → bkxd joined | 05:01 |
| ← bkxd left | 05:01 |
| ← xaxxon left | 05:01 |
| → xaxxon_ joined | 05:01 |
| → Cabanossi joined | 05:02 |
| ← pks left | 05:03 |
| → pks joined | 05:04 |
| → bkxd joined | 05:05 |
| ← ferdna left | 05:07 |
| ← TinkerTyper left | 05:08 |
| → TinkerTyper joined | 05:08 |
| ← Murr left | 05:08 |
| → Murr joined | 05:08 |
| ← timvisher left | 05:12 |
| → timvisher joined | 05:13 |
| → babyflakes joined | 05:14 |
| ← heftig left | 05:15 |
| ← inovas left | 05:15 |
| xaxxon_ → xaxxon | 05:17 |
| ← orbyt_ left | 05:17 |
| → imack joined | 05:17 |
| → heftig joined | 05:19 |
| ← kus left | 05:25 |
| → matsaman joined | 05:25 |
| ← MrJoshua left | 05:30 |
| ← aw1 left | 05:32 |
| ← xcm left | 05:34 |
| ← publio left | 05:34 |
| → xcm joined | 05:34 |
| ← bkxd left | 05:36 |
| → bkxd joined | 05:37 |
| ← bkxd left | 05:37 |
| → bkxd joined | 05:38 |
| ← msonntag left | 05:42 |
| → widp joined | 05:44 |
| ← bmgxc9 left | 05:45 |
| ← bkxd left | 05:47 |
| → msonntag joined | 05:47 |
| → bkxd joined | 05:50 |
| → jakogut_ joined | 05:53 |
| → Codaraxis_ joined | 05:55 |
| → noobineer joined | 05:55 |
| ← Codaraxis left | 05:55 |
| ← bkxd left | 05:55 |
| → bkxd joined | 05:56 |
| → aw1 joined | 05:56 |
| ← dsop left | 05:58 |
| ← bkxd left | 05:58 |
| → dsop joined | 05:58 |
| → bkxd joined | 05:59 |
| ← theweek3nd left | 05:59 |
| ← bkxd left | 06:00 |
| ← matsaman left | 06:01 |
| → dave0x6d joined | 06:08 |
| ← sasheto left | 06:08 |
| → bkxd joined | 06:10 |
| → jimi_ joined | 06:11 |
| → IndianArya joined | 06:12 |
| ← imack left | 06:15 |
| ← jimi_ left | 06:16 |
| ← learning left | 06:20 |
| ← dviola left | 06:21 |
| → sasheto joined | 06:22 |
| ← bkxd left | 06:22 |
| → bkxd joined | 06:24 |
| ← IndianArya left | 06:25 |
| → IndianArya joined | 06:27 |
| ← Ede_123 left | 06:27 |
| → learning joined | 06:29 |
| → dermoth joined | 06:30 |
| → chamaeleon- joined | 06:31 |
| ← chamaeleon left | 06:32 |
| ← dermoth left | 06:35 |
| → dermoth joined | 06:35 |
| ← noobineer left | 06:36 |
| ← chamaeleon- left | 06:37 |
| → chamaeleon joined | 06:37 |
| ← aw1 left | 06:39 |
| → jimi_ joined | 06:43 |
| ← HourGate left | 06:47 |
| ← xaxxon left | 06:50 |
| → aw1 joined | 06:53 |
| → HourGate joined | 06:53 |
| ← bkxd left | 06:57 |
| → stoopkid joined | 06:58 |
| → fekir joined | 06:58 |
| ← Lyqyd left | 07:01 |
| ← amosbird left | 07:01 |
| ← IndianArya left | 07:01 |
| → amosbird joined | 07:02 |
| → Nizumzen joined | 07:03 |
| ← marianina8 left | 07:05 |
| ← evil_god left | 07:09 |
| → sleepingforest joined | 07:10 |
| ← sleepingforest left | 07:10 |
| → piggah joined | 07:10 |
| → marianina8 joined | 07:10 |
| ← figurehe4d left | 07:11 |
| ← sleepingdeforest left | 07:11 |
| → sleepingforest joined | 07:12 |
| → pfleck joined | 07:13 |
| → cdg joined | 07:13 |
| ← hendry left | 07:14 |
| ← learning left | 07:14 |
| ← sleepingforest left | 07:17 |
| ← cdg left | 07:19 |
| ← Raed|Laptop left | 07:20 |
| ← kadoban left | 07:21 |
| ← rvgate__ left | 07:22 |
| → rvgate__ joined | 07:22 |
| ← aw1 left | 07:25 |
| ← dermoth left | 07:26 |
| → dermoth joined | 07:27 |
| → xaxxon joined | 07:28 |
| ← netj left | 07:29 |
| → netj joined | 07:29 |
| → MoziM joined | 07:35 |
| → tkore joined | 07:35 |
| → piggah_ joined | 07:36 |
| ← piggah_ left | 07:37 |
| → piggah_ joined | 07:37 |
| → staafl joined | 07:37 |
| ← piggah left | 07:38 |
| → StuartMI joined | 07:42 |
| ← piggah_ left | 07:45 |
| ← skirk left | 07:45 |
| ← papna_ left | 07:45 |
| → papna_ joined | 07:45 |
| → bmgxc9 joined | 07:45 |
| ← bmgxc9 left | 07:45 |
| → bmgxc9 joined | 07:46 |
| ← perrier-jouet left | 07:49 |
| ← bmgxc9 left | 07:54 |
| → imack joined | 07:56 |
| → zefferno joined | 08:02 |
| → HollywoodJack joined | 08:05 |
| → rokups joined | 08:06 |
| → piggah joined | 08:09 |
| ← zefferno left | 08:10 |
| ← konsolebox left | 08:14 |
| → konsolebox joined | 08:15 |
| ← pfleck left | 08:20 |
| → KeyJoo joined | 08:21 |
| ← KeyJoo left | 08:22 |
| → KeyJoo joined | 08:22 |
| → zefferno joined | 08:23 |
| → learning joined | 08:27 |
| ← dave0x6d left | 08:28 |
| ← thiago left | 08:28 |
| ← jstimm left | 08:29 |
| → jstimm joined | 08:32 |
| → theoceaniscool joined | 08:42 |
| → pfleck joined | 08:42 |
| ← theoceaniscool left | 08:42 |
| → theoceaniscool joined | 08:43 |
| ← alyptik left | 08:44 |
| → alyptik joined | 08:46 |
| → King_Hual joined | 08:46 |
| ← King_Hual left | 08:46 |
| → King_Hual joined | 08:46 |
| ← Gurkenglas left | 08:46 |
| → jzeus joined | 08:47 |
| → skirk joined | 08:49 |
| ← konsolebox left | 08:49 |
| → texinwien_ joined | 08:49 |
| → konsolebox joined | 08:50 |
| ← pfleck left | 08:51 |
| ← StuartMI left | 08:52 |
| ← HollywoodJack left | 08:53 |
| ← finalbeta left | 08:56 |
| → finalbeta joined | 08:57 |
| ← dreiss left | 08:58 |
| ← theoceaniscool left | 08:59 |
| ← Nizumzen left | 09:00 |
| ← bluepixel left | 09:01 |
| ← konsolebox left | 09:01 |
| → wxg joined | 09:01 |
| ← weez17 left | 09:01 |
| → weez17 joined | 09:02 |
| → minionofgozer joined | 09:02 |
| → konsolebox joined | 09:03 |
| ← jimi_ left | 09:03 |
| ← minionofgozer_ left | 09:03 |
| ← learning left | 09:03 |
| → kurkale6ka joined | 09:05 |
| ← imack left | 09:05 |
| ← konsolebox left | 09:08 |
| → konsolebox joined | 09:10 |
| ← piggah left | 09:12 |
| ← konsolebox left | 09:14 |
| → konsolebox joined | 09:15 |
| → nimomo joined | 09:15 |
| → pfleck joined | 09:16 |
| ← wxg left | 09:17 |
| → bluepixel joined | 09:18 |
| ← konsolebox left | 09:20 |
| → wandering_vagran joined | 09:22 |
| ← kdeal left | 09:23 |
| ← wandering_vagran left | 09:23 |
| → ManDay joined | 09:23 |
| → pfleck1 joined | 09:23 |
| → wandering_vagran joined | 09:24 |
| ← i7c left | 09:24 |
| ← nioncode left | 09:24 |
| → kdeal joined | 09:25 |
|
ManDay
| When I issue `git clone https://git.ffmpeg.org/ffmpeg.git +HEAD:refs/git-r3/HEAD --depth=1` I get an error about "bad pack header". Is that because the --depth came last? | 09:26 |
| → konsolebox joined | 09:26 |
| → nioncode joined | 09:27 |
| ← pionen left | 09:27 |
| → schleppel joined | 09:28 |
| ← MoziM left | 09:32 |
| ← dpyro left | 09:32 |
| ← LiftLeft left | 09:32 |
| ← ManDay left | 09:32 |
| → MoziM joined | 09:34 |
| ← Arcaelyx_ left | 09:37 |
| → eroux joined | 09:41 |
| → ianfleeton joined | 09:43 |
| ← timvisher left | 09:44 |
| → timvisher joined | 09:45 |
| → Nizumzen joined | 09:45 |
| → jnavila joined | 09:45 |
| → StuartMI joined | 09:45 |
| ← konsolebox left | 09:45 |
| ← justanotheruser left | 09:46 |
| ← skirk left | 09:47 |
| → konsolebox joined | 09:48 |
| ← ianfleeton left | 09:48 |
| → ok91 joined | 09:48 |
| → justanotheruser joined | 09:48 |
| ← pfleck left | 09:50 |
| pfleck1 → pfleck | 09:50 |
| ← dre_ left | 09:52 |
| ← konsolebox left | 09:53 |
| → pfleck1 joined | 09:53 |
| → konsolebox joined | 09:53 |
| ← m1dnight_ left | 09:54 |
| ← konsolebox left | 10:01 |
| → phluks joined | 10:01 |
| → konsolebox joined | 10:02 |
| ← staafl left | 10:03 |
| ← dhollinger left | 10:05 |
| ← kurkale6ka left | 10:06 |
| ← konsolebox left | 10:06 |
| ← pfleck1 left | 10:07 |
| → konsolebox joined | 10:08 |
| ← foul_owl left | 10:11 |
| ← konsolebox left | 10:12 |
| → konsolebox joined | 10:14 |
| → threenuc joined | 10:16 |
| ← catsup left | 10:19 |
| ← konsolebox left | 10:19 |
| → catsup joined | 10:19 |
| → konsolebox joined | 10:20 |
| ← catsup left | 10:20 |
| → catsup joined | 10:20 |
| ← xaxxon left | 10:23 |
| → foul_owl joined | 10:25 |
|
matkatmusic
| Smh, xcode 9 won't let me modify the username field when trying to clone a repo from Bit Bucket | 10:25 |
|
| gotta use SourceTree to clone, I guess | 10:25 |
| ← konsolebox left | 10:25 |
| → konsolebox joined | 10:26 |
| → borkr joined | 10:27 |
| ← konsolebox left | 10:31 |
| → dhollinger joined | 10:32 |
| → pirocks joined | 10:32 |
| → konsolebox joined | 10:33 |
| ← energizer left | 10:35 |
| → ashar4 joined | 10:35 |
| ← ok91 left | 10:37 |
| → weilbith joined | 10:37 |
| ← konsolebox left | 10:38 |
| ← weilbith left | 10:39 |
| ← ashar left | 10:39 |
| → konsolebox joined | 10:39 |
| → RougeR joined | 10:40 |
| ← Realzy left | 10:42 |
| → imack joined | 10:43 |
| ← texinwien_ left | 10:46 |
| ← konsolebox left | 10:46 |
| → konsolebox joined | 10:48 |
| ← mel__ left | 10:49 |
| ← xcm left | 10:49 |
| → xcm joined | 10:49 |
| → manuelschneid3r joined | 10:50 |
|
cbreak
| matkatmusic: you probably need to add an other account | 10:50 |
|
| it seems to be extremely limited... just github | 10:51 |
|
matkatmusic
| you can't add non-github accounts | 10:51 |
|
cbreak
| I know... | 10:51 |
| ← safe left | 10:55 |
| ← chris_wot left | 10:57 |
| ← konsolebox left | 10:58 |
| → konsolebox joined | 11:00 |
| ← jimmyrcom left | 11:02 |
| ← timvisher left | 11:02 |
| → timvisher joined | 11:03 |
| ← kdeal left | 11:03 |
| ← tunekey left | 11:04 |
| → mel__ joined | 11:04 |
| → kdeal joined | 11:05 |
| ← konsolebox left | 11:05 |
| → konsolebox joined | 11:06 |
| → opalepatrick joined | 11:06 |
| → texinwien_ joined | 11:08 |
| → DaGoaty joined | 11:08 |
| ← DaGoaty left | 11:09 |
| ← zulutango left | 11:11 |
| ← konsolebox left | 11:14 |
| → konsolebox joined | 11:15 |
| ← texinwien_ left | 11:21 |
| → texinwien joined | 11:22 |
| ← kaustubhw left | 11:23 |
| → kaustubhw joined | 11:24 |
| → Gurkenglas joined | 11:26 |
| ← mel__ left | 11:27 |
| → i7c joined | 11:28 |
|
plitter
| I'm reading on git workflows on https://git-scm.com/docs/gitworkflows. is it frowned upon to merge from the "master" branch into feature regularly? | 11:28 |
|
cbreak
| plitter: no. In some workflows that's ok | 11:29 |
|
| but I'd avoid it | 11:29 |
|
| it just clutters history with nonsense | 11:29 |
| → leeN joined | 11:29 |
|
cbreak
| feature branches probably only live for a few days, you probably don't need to merge master | 11:29 |
| → sz0 joined | 11:30 |
|
plitter
| so if you need to get a feature from master you should try to find that feature branch and merge it into your feature branch? | 11:30 |
|
cbreak
| sure, if you want that. | 11:31 |
|
| alternative: rebase the feature branch onto the new master | 11:31 |
|
| (that's what I'd do) | 11:31 |
|
plitter
| just the rebase wouldn't get you the feature branch into your branch right? | 11:32 |
| → mosab joined | 11:32 |
|
plitter
| isn't rebase just pointing to the new master without doing anything to the code? | 11:33 |
| ← leah2 left | 11:33 |
|
i7c
| Rebase takes a bunch of commits and *bases* them on a different history. So effectively the tip of your branch has lots of different "code" afterwards. | 11:35 |
|
| If at first your commit is based on one that just adds the file "a.txt" and you rebase on a history that adds a thousand files, after the rebase you have those thousand files in the tree of your commit as well. | 11:36 |
| ← konsolebox left | 11:37 |
|
plitter
| i7c: but not in your working tree | 11:38 |
| → konsolebox joined | 11:38 |
| ← nowhere_man left | 11:38 |
|
i7c
| Also in your working tree. | 11:38 |
|
| You can only rebease on a clean working directory, so after the rebase your working tree would match the commit exactly. | 11:39 |
|
| (ignoring stuff like --autostash) | 11:39 |
|
plitter
| what happens on conflicts then? | 11:40 |
| → nowhere_man joined | 11:40 |
|
i7c
| Git tries to resolve them automatically and if not rebase stops and asks you to resolve manually. | 11:40 |
|
| *if it does not succeed | 11:40 |
|
cbreak
| it's like during a merge | 11:41 |
|
| but the semantics are a bit different in the details | 11:41 |
| ← ProfMac left | 11:43 |
|
plitter
| so it sort of does a merge without the commit message | 11:44 |
|
| as in doing the patches that were on your branch on the new master | 11:46 |
| ← konsolebox left | 11:47 |
| ← chamaeleon left | 11:48 |
| → leah2 joined | 11:48 |
| → konsolebox joined | 11:49 |
| → IndianArya joined | 11:51 |
| ← netj left | 11:54 |
| → chamaeleon joined | 11:54 |
| → netj joined | 11:54 |
| ← konsolebox left | 11:56 |
| → HollywoodJack joined | 11:56 |
| → konsolebox joined | 11:58 |
| ← shinnya left | 11:59 |
| ← Gurkenglas left | 11:59 |
| ← konsolebox left | 12:03 |
| ← chamaeleon left | 12:03 |
| → nowhereman_ joined | 12:03 |
| → konsolebox joined | 12:04 |
| → ZyX-I joined | 12:07 |
| ← nowhere_man left | 12:07 |
| ← netj left | 12:08 |
| → DaGoaty joined | 12:08 |
| ← konsolebox left | 12:08 |
| → netj joined | 12:09 |
| → konsolebox joined | 12:09 |
| ← raynold left | 12:09 |
| ← DaGoaty left | 12:10 |
| → jmd joined | 12:11 |
| → chamaeleon joined | 12:11 |
| → chaosruler joined | 12:12 |
| ← konsolebox left | 12:14 |
| → konsolebox joined | 12:15 |
| ← plexigras left | 12:18 |
| ← timvisher left | 12:20 |
| ← konsolebox left | 12:20 |
| ← trobotham left | 12:20 |
| → timvisher joined | 12:21 |
| → konsolebox joined | 12:21 |
| → aw1 joined | 12:21 |
| → plexigras joined | 12:22 |
| ← pirocks left | 12:23 |
| → Tobbi joined | 12:23 |
| ← leah2 left | 12:23 |
| → rorro joined | 12:25 |
| ← howdoi left | 12:26 |
| → trobotham joined | 12:27 |
| ← cdown left | 12:28 |
| → belmoussaoui joined | 12:30 |
| → leah2 joined | 12:31 |
| ← RougeR left | 12:32 |
| ← konsolebox left | 12:34 |
| → konsolebox joined | 12:35 |
| ← KeyJoo left | 12:35 |
| → YuGiOhJCJ joined | 12:35 |
| ← IndianArya left | 12:39 |
| ← konsolebox left | 12:40 |
| → SteffanW joined | 12:40 |
| → konsolebox joined | 12:41 |
| → DocRedfish joined | 12:42 |
| → Gurkenglas joined | 12:44 |
| ← konsolebox left | 12:46 |
| → konsolebox joined | 12:46 |
| → abs joined | 12:48 |
| gitinfo set mode: +v | 12:49 |
|
abs
| hi everyone I'm using freenode for the first time | 12:49 |
| → staafl joined | 12:51 |
|
jmd
| abs: I hope you have a thick skin! | 12:52 |
| ← rorro left | 12:52 |
| ← netj left | 12:53 |
|
abs
| the community here seems to be way more advanced than gitter (what I currently use) | 12:53 |
| ← imack left | 12:53 |
| → netj joined | 12:54 |
| → IndianArya joined | 12:54 |
| → draget joined | 12:55 |
|
jmd
| abs: ok. Welcome to freenode. I hope you find it useful. Just be warned that unfortunately not everyone on the network is always polite, so don't get discouraged if you meet some of the other sort of people. | 12:55 |
| ← jnavila left | 12:55 |
|
draget
| I have a local settings file that is per-developer. Thus only an settings.example file is in the repository and each developer is told to copy it to settings and adjust it. The settings file itself is ignored. | 12:56 |
| ← IndianArya left | 12:56 |
| → xfbs joined | 12:56 |
|
draget
| Now we needed to update the template. The developers have to change their local settings / write a new one. I wonder: Can I add a 'remove' to the commit that removes the local untracked file? I assume that would be very much against the principles of GIT, tho thought I' dask | 12:56 |
|
abs
| Thanks for wisdom | 12:57 |
|
draget
| I know my eMail on our develpoment mailing list will be ignored about the need to rewrite the local settings. | 12:58 |
| ← mosab left | 12:58 |
|
jmd
| draget: I've no idea what you mean by "local settings". | 12:58 |
| → RougeR joined | 12:58 |
| ← RougeR left | 12:58 |
| → RougeR joined | 12:58 |
|
jmd
| draget: Maybe you're talking about the ~/.gitconfig file? | 13:00 |
|
sonOfRa
| draget: making changes to untracked files doesn't really work nicely. What I would recommend is storing *and tracking* "settings.skeleton", and then telling devs to copy settings.skeleton to settings.real, and then adjust it there, maybe even offer an interactive shell script that takes care of this | 13:02 |
|
| Now people still have to run the script again (or edit again) on change to the skeleton file | 13:02 |
|
| But that's the closest you get to doing this automatically | 13:02 |
| ← YuGiOhJCJ left | 13:02 |
|
draget
| jmd: No, these are settings related to our project. Nothing git-specific. | 13:02 |
|
| It is just a file called 'settings' that is in .gitignore | 13:03 |
| ← belmoussaoui left | 13:03 |
|
draget
| I could make our buildscripts depend on a file called 'settings2', then they will fail and people will notice. Or add some logic that detects the old settings file - which is buttulgy x.x | 13:05 |
|
sonOfRa
| maybe include the skeleton file as a step in your build system; if "settings.real" has a newer mtime than "settings.skeleton", run the interactive mode | 13:05 |
|
| Err, other way around | 13:05 |
|
osse
| !config | 13:05 |
|
gitinfo
| [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas | 13:05 |
| → oDn joined | 13:06 |
|
sonOfRa
| That way, every time you update the build file, the setup script is ran, and forces the developer to enter new/current values, but *only* if the skeleton file was changed since the last time that the *real* file was written | 13:06 |
| → mosab joined | 13:06 |
| → pirocks joined | 13:09 |
| → imack joined | 13:12 |
| ← dermoth left | 13:15 |
| → dermoth joined | 13:15 |
|
jmd
| My personal opinion is that .gitignore files are a gross misfeature. I would recommend avoiding their use. | 13:16 |
| → tachoknight_ joined | 13:16 |
| ← mosab left | 13:17 |
| ← djb-irc left | 13:17 |
| ← timvisher left | 13:17 |
| ← tachoknight_ left | 13:18 |
|
draget
| Yes, I update the buildscript. Hacked a little test that checks the local settings file and yells at the user if it was not updated. | 13:19 |
| → timvisher joined | 13:19 |
|
osse
| It's easier to use gitignore than to rewrite a build system to support out of source builds :P | 13:19 |
|
draget
| jmd: How would you come to this conclusion? o.o | 13:19 |
|
jmd
| draget: Because they hide important information. | 13:20 |
|
osse
| If they do then you're no using them right | 13:20 |
|
draget
| What about files that should not be added to the repository? Depend on the devs being so smart not to add them? | 13:20 |
| ← Portugol9 left | 13:20 |
| → mosab joined | 13:21 |
|
jmd
| draget: If they should not be added to the repository then that is even more reason why I should know about their existance. | 13:21 |
| → jnavila joined | 13:22 |
|
jmd
| If some fool has put its name in a git ignore file, then I won't know that it has somehow been generated. | 13:22 |
| → rorro joined | 13:22 |
|
draget
| Well, open your file explorer and look at them. These are your local files. *local* information is something different to project-wide information. | 13:22 |
| ← xfbs left | 13:23 |
|
jmd
| well like I say it's just my opinion, but I recommend not using .gitignore. | 13:23 |
|
draget
| Even WITH ignore files we have managed at least… 5-6 times in our project (~9 devs team within last two years) to have stupid local configuration stuff in the repository that first breaks when others pull the infos, then breaks again when they 'fix' it locally and push their crap, and than once more when someone who has a basic understanding of VCS comes along and removes it, causing the next pull to remove the files locally which are not cleanly | 13:23 |
|
| autogenerated without some minor manual work. | 13:23 |
| ← mosab left | 13:24 |
| → mosab joined | 13:25 |
| → Portugol9 joined | 13:25 |
|
draget
| I have hit the 'brick wall' of cold, mercyless reality too often… I set up guidelines, I use commithooks to limit permissions and I explain it about every other month to them. *sighs* | 13:25 |
|
jmd
| draget: Right. With .gitignore those files do not show when you type "git status". If the .gitignores were removed, then the devs would have been instantly aware of these rougue files. So the probability of such mistakes would be greatly reduced. | 13:25 |
| ← mosab left | 13:25 |
|
draget
| git status shows me what I can put into my next commit. | 13:26 |
| → mosab joined | 13:27 |
| → cdown joined | 13:27 |
|
draget
| I do agree… showing ignored files, listing files that are tracked but ignored or on another topic submodules… the git commands to display those infos are aweful… it is a painful learning curve. But this is a UX/design issue… the concepts of git are doing well. | 13:28 |
|
osse
| The advantage of making it harder to add files that shouldn't be added are greater than the disadvantage of accidentally not adding files that should be, imo. | 13:28 |
| → IndianArya joined | 13:28 |
| ← mosab left | 13:29 |
|
osse
| Also, with in source builds git status would be pretty useless without | 13:29 |
| ← IndianArya left | 13:29 |
| → mosab joined | 13:29 |
|
draget
| Whoever came up with the idea of in-source builds needs a slap anyways. | 13:30 |
|
osse
| Surely that's not an idea someone came up with, but the natural thing to do before someone thought of out of source builds :p | 13:31 |
| ← bs left | 13:32 |
| → kbaegis joined | 13:32 |
| ← kbaegis left | 13:32 |
| → kbaegis joined | 13:33 |
| → bs joined | 13:33 |
| ← pirocks left | 13:33 |
| EnchanterTim → stoned | 13:33 |
| → IndianArya joined | 13:34 |
| → theoceaniscool joined | 13:36 |
| ← imack left | 13:37 |
| ← cdown left | 13:37 |
| ← mosab left | 13:38 |
| ← kdeal left | 13:39 |
| → cdown joined | 13:39 |
| ← metts left | 13:43 |
| → pionen joined | 13:44 |
| → metts joined | 13:44 |
| ← pionen left | 13:45 |
| → pionen joined | 13:45 |
| ← cdown left | 13:48 |
| ← IndianArya left | 13:48 |
| ← rorro left | 13:49 |
| ← abs left | 13:51 |
| → ok91 joined | 13:52 |
| ← ok91 left | 13:52 |
| ← pfleck left | 13:53 |
| ← jnavila left | 13:53 |
| ← aw1 left | 13:55 |
| ← draget left | 13:57 |
| → chris_wot joined | 13:59 |
| ← wandering_vagran left | 14:00 |
| → pfleck joined | 14:04 |
| ← phluks left | 14:04 |
| → kdeal joined | 14:06 |
| → imack joined | 14:08 |
| ← timvisher left | 14:12 |
| → timvisher joined | 14:13 |
| ← banisterfiend left | 14:16 |
| → kurkale6ka joined | 14:19 |
| → sammyg joined | 14:23 |
| ← NightMonkey left | 14:23 |
| → jnavila joined | 14:24 |
| → NightMonkey joined | 14:28 |
| → czart_ joined | 14:30 |
| → reynierpm joined | 14:31 |
| → alan5 joined | 14:33 |
| ← czart left | 14:34 |
| → doener joined | 14:38 |
| → pbandark joined | 14:39 |
| → bluepixe1 joined | 14:42 |
| ← marianina8 left | 14:44 |
| ← jnavila left | 14:45 |
| ← dermoth left | 14:45 |
| → dermoth joined | 14:45 |
| ← bluepixel left | 14:45 |
| → wxg joined | 14:47 |
| ← chris_wot left | 14:49 |
| ← kurkale6ka left | 14:50 |
| ← oDn left | 14:55 |
| → cdown joined | 14:56 |
| → oDn joined | 14:56 |
| → Amanas joined | 14:59 |
| ← fran__ left | 15:01 |
| → fran__ joined | 15:01 |
| ← SteffanW left | 15:02 |
| → VoradorPT joined | 15:03 |
| → kbaegis1 joined | 15:04 |
| ← kbaegis left | 15:05 |
| ← NightMonkey left | 15:06 |
| ← Xiti` left | 15:08 |
| → Xiti joined | 15:08 |
| → barduck joined | 15:09 |
| ← pfleck left | 15:10 |
| → perrier-jouet joined | 15:12 |
| ← oDn left | 15:13 |
| → NightMonkey joined | 15:14 |
| ← fran__ left | 15:15 |
| kevr_ → kevr | 15:15 |
| ← timvisher left | 15:22 |
| → timvisher joined | 15:24 |
| → noobineer joined | 15:24 |
| ← noobineer left | 15:24 |
| → olbat joined | 15:27 |
| ← olbat left | 15:27 |
| → olbat joined | 15:27 |
| ← RougeR left | 15:29 |
| → pfleck joined | 15:30 |
| ← MACscr left | 15:32 |
| ← NightMonkey left | 15:34 |
| → sleepingforest joined | 15:38 |
| ← sleepingforest left | 15:38 |
| → sgen joined | 15:38 |
| → sleepingforest joined | 15:38 |
| ← sgen left | 15:39 |
| ← imack left | 15:42 |
| ← nimomo left | 15:43 |
| → sgen joined | 15:43 |
| → jnavila joined | 15:44 |
| ← sgen left | 15:44 |
| ← dermoth left | 15:44 |
| → dermoth joined | 15:45 |
| ← pbandark left | 15:46 |
| → nimomo joined | 15:46 |
| ← liefer left | 15:48 |
| → liefer joined | 15:49 |
| ← nimomo left | 15:50 |
| ← govg left | 15:51 |
| ← tkore left | 15:59 |
| ← gxt_ left | 16:01 |
| → kadoban joined | 16:02 |
| → gxt_ joined | 16:04 |
| ← sammyg left | 16:05 |
| ← texinwien left | 16:10 |
| ← borkr left | 16:11 |
| ← wxg left | 16:12 |
| → orbyt_ joined | 16:13 |
| → Darcidride joined | 16:17 |
| → imack joined | 16:23 |
| → durham joined | 16:24 |
| → coumbole joined | 16:25 |
| ← coumbole left | 16:26 |
| → jimi_ joined | 16:27 |
| ← theoceaniscool left | 16:28 |
| → Mike11 joined | 16:28 |
| ← timvisher left | 16:29 |
| → timvisher joined | 16:30 |
| ← durham left | 16:31 |
| → durham joined | 16:32 |
| → durham_ joined | 16:33 |
| ← durham left | 16:33 |
| ← zefferno left | 16:35 |
| → coumbole joined | 16:38 |
| → mosab joined | 16:38 |
| mosab → mos3abof | 16:39 |
| ← Portugol9 left | 16:40 |
| ← mos3abof left | 16:40 |
| → nimomo joined | 16:40 |
| → Portugol9 joined | 16:40 |
| → mos3abof joined | 16:40 |
| → RougeR joined | 16:43 |
| ← RougeR left | 16:43 |
| → RougeR joined | 16:43 |
| → dreiss joined | 16:44 |
| ← nimomo left | 16:45 |
| ← shymega left | 16:45 |
| bluepixe1 → bluepixel | 16:45 |
| ← coumbole left | 16:47 |
| ← cdown left | 16:47 |
| → denete_ joined | 16:49 |
| → nimomo joined | 16:51 |
| ← Khisanth left | 16:52 |
| → phluks joined | 16:52 |
| ← kevr left | 16:52 |
| ← jimi_ left | 16:55 |
| ← pionen left | 16:56 |
| ← synthmeat left | 16:59 |
| ← Amanas left | 16:59 |
| ← Dragon092 left | 17:01 |
| ← Gurkenglas left | 17:02 |
| → synthmeat joined | 17:02 |
| → jimi_ joined | 17:02 |
| → sammyg joined | 17:03 |
| → coumbole joined | 17:04 |
| → Khisanth joined | 17:06 |
| → Dragon092 joined | 17:06 |
| ← Murr left | 17:08 |
| → Murr joined | 17:08 |
| → Gurkenglas joined | 17:10 |
| → surfist joined | 17:11 |
| ← widp left | 17:12 |
| ← jimi_ left | 17:12 |
| → KeyJoo joined | 17:12 |
| ← mos3abof left | 17:16 |
| → thiago joined | 17:18 |
| ← denete_ left | 17:19 |
| → denete_ joined | 17:19 |
| → Amanas joined | 17:19 |
| → mos3abof joined | 17:20 |
| ← v4ult left | 17:20 |
| ← durham_ left | 17:20 |
| ← mos3abof left | 17:20 |
| → mos3abof joined | 17:21 |
| ← glebihan left | 17:21 |
| → nimomo_ joined | 17:23 |
| ← jakogut_ left | 17:24 |
| → snowkidind joined | 17:25 |
| ← nimomo left | 17:26 |
| → publio joined | 17:26 |
| → qpdb joined | 17:28 |
| → fstd_ joined | 17:28 |
| → zzz joined | 17:29 |
| → marianina8 joined | 17:29 |
| → sr___ joined | 17:29 |
| → menip joined | 17:31 |
| → banisterfiend joined | 17:31 |
| ← fstd left | 17:31 |
| fstd_ → fstd | 17:31 |
| → Tee_Pee joined | 17:35 |
| ← trobotham left | 17:35 |
| ← guideline left | 17:36 |
| ← DocRedfish left | 17:37 |
| → Arcaelyx joined | 17:38 |
| ← timvisher left | 17:38 |
| → timvisher joined | 17:39 |
| ← sz0 left | 17:43 |
|
sphalerite_
| I sometimes find myself having rather large tests to run for a bisect. Is there some sort of "n-sect" operation that might allow me to execute these in parallel (probably across multiple machines)? | 17:45 |
| → lxpup_24904 joined | 17:45 |
|
sphalerite_
| i.e. to split the range between last-known-good and first-known-bad into 3 or 4 rather than two | 17:45 |
| ← lxpup_24904 left | 17:46 |
| → nielsk joined | 17:48 |
| → LiftLeft joined | 17:48 |
| → SteffanW joined | 17:49 |
| → guideline joined | 17:50 |
| ← nimomo_ left | 17:51 |
| → nimomo joined | 17:51 |
| → lxpup_24904 joined | 17:53 |
| ← ashar4 left | 17:54 |
|
_ikke_
| sphalerite_: nothing built into git | 17:54 |
| → ashar4 joined | 17:54 |
|
_ikke_
| I'm not sure if a bisection algorithm is parralelizable | 17:55 |
| ← nimomo left | 17:55 |
| ← denete_ left | 17:55 |
| → theoceaniscool joined | 17:56 |
| → Phylock joined | 17:56 |
| → nd_ joined | 17:57 |
|
Peng_
| Not efficiently, but you could still do it. You'd just wind up testing some unnecessary commits. | 17:58 |
| ← plexigras left | 17:59 |
| ← Amanas left | 17:59 |
| ← nd left | 17:59 |
| ← pfleck left | 17:59 |
| → pfleck joined | 18:00 |
|
Peng_
| Cloud quantum bogo bisect: Use cloud computing to test every commit at once. :P | 18:00 |
| → plexigras joined | 18:00 |
| → rorro joined | 18:00 |
| ← lxpup_24904 left | 18:00 |
| → rwb joined | 18:02 |
| ← pR0Ps left | 18:02 |
| ← ashar4 left | 18:03 |
| → ashar4 joined | 18:03 |
| ← staafl left | 18:04 |
| → cfoch_ joined | 18:05 |
| → Amanas joined | 18:07 |
| ← Mike11 left | 18:08 |
|
sphalerite_
| Peng_: I like it! :p | 18:12 |
| → pR0Ps joined | 18:12 |
| ← kdeal left | 18:12 |
|
sphalerite_
| _ikke_: yeah, it's not hugely parallelisable but I imagine you could still cut down on the time it takes (at the cost of testing more commits and interrupting some of the tests when it turns out they were unnecessary) significantly | 18:12 |
|
Peng_
| Sounds nice, but I have no idea if anyone's implemented something like that. :X | 18:14 |
|
guardian
| hello, I'm looping over a list of sha1s. For each of these, how can I get the number of lines added and removed? As 2 separate fields | 18:15 |
| → gugah joined | 18:15 |
| → kdeal joined | 18:15 |
| → ProfMac joined | 18:17 |
|
_ikke_
| guardian: git show --numstat <hash> | 18:18 |
| qpdb → Guest99248 | 18:21 |
| ← Guest99248 left | 18:21 |
| → qpdb joined | 18:21 |
| → hacman joined | 18:23 |
| → jimi_ joined | 18:24 |
| ← jimi_ left | 18:24 |
| → jimi_ joined | 18:24 |
| ← ashar4 left | 18:25 |
| → ashar4 joined | 18:26 |
|
guardian
| thanks | 18:31 |
|
| gonna look at this | 18:31 |
| → Lyqyd joined | 18:32 |
| ← SteffanW left | 18:32 |
| ← timvisher left | 18:36 |
| → timvisher joined | 18:37 |
| → BSaboia joined | 18:38 |
| → SteffanW joined | 18:38 |
| ← BSab left | 18:41 |
| ← pfleck left | 18:41 |
| ← jimi_ left | 18:41 |
| → nimomo joined | 18:42 |
| → rh10 joined | 18:45 |
| → jimi_ joined | 18:46 |
| → nuc joined | 18:46 |
| ← nimomo left | 18:46 |
| → lxpup_24904 joined | 18:47 |
|
Whiskey
| if i have a folder | 18:47 |
|
| where i do git init | 18:47 |
|
| and then add orgin to the git | 18:47 |
|
| how can i imor the current project to the folder and start where i left off? Current i can only import it and get the "Root" folder name in that folder but i want just the files from the project in the current folder i am in | 18:48 |
| → jungsubk joined | 18:48 |
| ← Amanas left | 18:48 |
| → ferdna joined | 18:49 |
| ← ashar4 left | 18:49 |
| → Mattiaslndstrm joined | 18:50 |
| → pfleck joined | 18:52 |
| → Sonderblade joined | 18:53 |
| ← menip left | 18:54 |
| ← imack left | 18:54 |
| → dviola joined | 18:55 |
| → energizer joined | 18:55 |
| → m0viefreak joined | 18:57 |
| ← energizer left | 18:57 |
| ← lxpup_24904 left | 18:58 |
| → Sircle_ joined | 18:58 |
| → disruptivefour joined | 18:59 |
| ← Sircle_ left | 18:59 |
| → Sircle_ joined | 18:59 |
| ← SteffanW left | 18:59 |
| ← Sircle_ left | 18:59 |
| → Sircle joined | 18:59 |
|
Sircle
| HI | 18:59 |
| ← disruptivefour left | 18:59 |
|
tobiasvl
| Whiskey: it's not really clear what you're asking | 19:00 |
| ← Lyqyd left | 19:00 |
| ← MaekSo left | 19:00 |
|
Sircle
| I made directory permission changes and now I have git status and diff says all files modified. It is not letting me take pull from origin master. What should I do? old mode 100644 | 19:01 |
|
| new mode 100755 | 19:01 |
| ← mos3abof left | 19:02 |
| → mos3abof joined | 19:03 |
|
tobiasvl
| Sircle: do you want to commit the change or discard it? | 19:03 |
|
| the only permission git cares about is +x | 19:03 |
| ← mos3abof left | 19:04 |
|
Sircle
| tobiasvl, I want not to commit it as its a directory /file permission. I do not want to discard it either as its needed (I guess if I discard it, the old permissions will get back ? | 19:04 |
| → mos3abof joined | 19:04 |
|
tobiasvl
| if it's needed, why don't you want to commit it? | 19:05 |
| → glebihan joined | 19:06 |
|
Sircle
| tobiasvl, because if I just pull it by another user, its 755 by default. Its a filesystem thing. Why commit so many files in so many websites I have for this? | 19:06 |
| ← jungsubk left | 19:06 |
|
tobiasvl
| Sircle: I don't understand. why is it needed? if it's needed, why is it not needed in the repo? | 19:06 |
|
Sircle
| its needed for file system. Its not needed in the repo. | 19:07 |
| → Goplat joined | 19:07 |
|
tobiasvl
| I have no idea what you mean by that | 19:07 |
|
| if the files need to be +x then surely they need to be it in the repo | 19:08 |
| ← jimi_ left | 19:08 |
|
Sircle
| the permission is not about +x | 19:08 |
| → mosab joined | 19:08 |
| ← Murr left | 19:08 |
| ← mos3abof left | 19:08 |
|
tobiasvl
| yes it is. git does not track other !permissions | 19:08 |
|
gitinfo
| Git does not store full UNIX permissions, even if it makes it look like it does. In fact, the only mode-related info Git stores is whether a given file is executable. Anything else is taken care of by your umask and the core.sharedRepository setting. See also !configfiles | 19:08 |
| → Murr joined | 19:08 |
| ← RougeR left | 19:09 |
| ← mosab left | 19:10 |
| → mosab joined | 19:11 |
| ← mosab left | 19:11 |
| ← ghost43 left | 19:12 |
| → ghost43 joined | 19:12 |
| → nephyrin` joined | 19:13 |
| → MaekSo joined | 19:13 |
| ← nephyrin left | 19:15 |
| → Raed|Laptop joined | 19:16 |
| → menip joined | 19:16 |
| ← rorro left | 19:16 |
| ← pfleck left | 19:16 |
| ← banisterfiend left | 19:17 |
| → IanLiu joined | 19:18 |
| → applecrumble joined | 19:18 |
| → Sircle_ joined | 19:18 |
| → jimi_ joined | 19:20 |
| ← SpeakerToMeat left | 19:21 |
| ← Sircle left | 19:22 |
| → pfleck joined | 19:22 |
| → imack joined | 19:22 |
| → Sircle__ joined | 19:25 |
| ← PtxDK left | 19:25 |
| → PtxDK joined | 19:25 |
| ← phluks left | 19:25 |
| ← Sircle_ left | 19:28 |
| → pfleck1 joined | 19:28 |
| → meadmoon joined | 19:30 |
| → raynold joined | 19:30 |
| ← imack left | 19:31 |
| → tvw joined | 19:31 |
| ← kbaegis1 left | 19:33 |
| → kbaegis joined | 19:34 |
| ← kbaegis left | 19:34 |
| → kbaegis joined | 19:34 |
| ← kbaegis left | 19:34 |
| → kbaegis joined | 19:35 |
|
Random832
| the tree format is weird... ascii octal "mode", but binary hash | 19:36 |
| ← timvisher left | 19:39 |
| ← pombreda left | 19:39 |
| → timvisher joined | 19:40 |
| → texinwien joined | 19:42 |
| → regedit joined | 19:44 |
| ← regedit left | 19:44 |
| → regedit joined | 19:44 |
| ← regedit left | 19:44 |
| → regedit joined | 19:44 |
| ← regedit left | 19:44 |
| → regedit joined | 19:45 |
| ← regedit left | 19:45 |
| → regedit joined | 19:45 |
| ← regedit left | 19:45 |
| → regedit_ joined | 19:46 |
| ← regedit_ left | 19:46 |
| ← gugah left | 19:48 |
| ← LiftLeft left | 19:49 |
| → SpeakerToMeat joined | 19:49 |
| → dpyro joined | 19:49 |
| → sammyg2 joined | 19:51 |
| ← finalbeta left | 19:52 |
| → finalbeta joined | 19:52 |
| ← sammyg left | 19:53 |
| → energizer joined | 19:55 |
| ← TinkerTyper left | 19:56 |
| → tunekey joined | 19:56 |
| → TinkerTyper joined | 19:58 |
| ← tvw left | 19:58 |
| ← meadmoon left | 20:00 |
| ← texinwien left | 20:00 |
| → LiftLeft joined | 20:02 |
| → phluks joined | 20:02 |
| → gugah joined | 20:03 |
| ← netlar left | 20:03 |
| ← zzz left | 20:06 |
| → ZiZiBe joined | 20:07 |
| → MACscr joined | 20:08 |
| ← jimi_ left | 20:09 |
| → dege joined | 20:11 |
| ← pfleck1 left | 20:11 |
| → jimi_ joined | 20:12 |
| ← Nizumzen left | 20:14 |
| → Sircle_ joined | 20:14 |
| → piggah joined | 20:15 |
| ← KeyJoo left | 20:18 |
| ← Sircle__ left | 20:18 |
| → Sircle__ joined | 20:19 |
| ← Sircle_ left | 20:19 |
| ← mattcen left | 20:21 |
| → Achylles joined | 20:24 |
| → mattcen joined | 20:24 |
| → Sircle_ joined | 20:24 |
| ← sammyg2 left | 20:25 |
| → sammyg2 joined | 20:26 |
| ← Sircle__ left | 20:27 |
| → Sircle__ joined | 20:28 |
| ← Sircle_ left | 20:29 |
| ← thomasross left | 20:31 |
| → Sircle_ joined | 20:31 |
| ← foul_owl left | 20:32 |
| → sQVe joined | 20:32 |
| ← kdeal left | 20:32 |
| ← alyptik left | 20:32 |
| → JoeGaff joined | 20:32 |
| ← xcm left | 20:33 |
| → alyptik joined | 20:33 |
| → xcm joined | 20:33 |
| ← czart_ left | 20:34 |
| → rorro joined | 20:34 |
| ← Sircle__ left | 20:35 |
| ← timvisher left | 20:35 |
| ← fekir left | 20:36 |
| → timvisher joined | 20:36 |
| ← rokups left | 20:42 |
| → redhedded1 joined | 20:45 |
| → foul_owl joined | 20:48 |
| ← minionofgozer left | 20:48 |
| → pirocks joined | 20:48 |
| ← xcm left | 20:48 |
| ← ZyX-I left | 20:49 |
| → xcm joined | 20:49 |
| ← applecrumble left | 20:50 |
| → minionofgozer joined | 20:50 |
| → applecrumble joined | 20:52 |
| ← Raed|Laptop left | 20:53 |
| → czart_ joined | 20:54 |
| ← MACscr left | 20:54 |
| → disruptivefour joined | 20:55 |
| → xaxxon joined | 20:55 |
| ← disruptivefour left | 20:57 |
| ← czart_ left | 20:58 |
| → Sircle__ joined | 20:59 |
| → kdeal joined | 20:59 |
| ← rorro left | 21:00 |
| → Amanas joined | 21:03 |
| ← Sircle_ left | 21:03 |
| → Nizumzen joined | 21:03 |
| → griffindy joined | 21:03 |
| → Raed|Laptop joined | 21:03 |
| → MACscr joined | 21:04 |
| ← redhedded1 left | 21:07 |
| ← energizer left | 21:07 |
| → energizer joined | 21:07 |
| ← energizer left | 21:07 |
| → energizer joined | 21:08 |
| ← phluks left | 21:08 |
| → Lyqyd joined | 21:09 |
| ← griffindy left | 21:11 |
|
robattila256
| I love you Robby!!!!!!!!!!!!!! | 21:12 |
| ← applecrumble left | 21:13 |
| → Sircle_ joined | 21:15 |
| → RougeR joined | 21:15 |
| ← RougeR left | 21:15 |
| → RougeR joined | 21:15 |
| → moei joined | 21:15 |
| ← alyptik left | 21:16 |
| → alyptik joined | 21:17 |
| ← ZiZiBe left | 21:17 |
| ← Sircle__ left | 21:19 |
| ← PioneerAxon left | 21:19 |
| → PioneerAxon joined | 21:19 |
| ← pfleck left | 21:21 |
| ← nevodka left | 21:22 |
| → ZyX-I joined | 21:24 |
| ← m0viefreak left | 21:26 |
| → nevodka joined | 21:29 |
| → Sircle__ joined | 21:30 |
| ← Sircle_ left | 21:33 |
| ← timvisher left | 21:35 |
| → timvisher joined | 21:36 |
| → pfleck joined | 21:37 |
| → bmgxc9 joined | 21:38 |
| ← bmgxc9 left | 21:38 |
| → evil-god joined | 21:39 |
| ← sQVe left | 21:39 |
| ← Amanas left | 21:40 |
| → GoBear joined | 21:42 |
| ← Mattiaslndstrm left | 21:44 |
| → Sircle_ joined | 21:44 |
| ← theoceaniscool left | 21:45 |
| ← snowkidind left | 21:46 |
| ← King_Hual left | 21:46 |
| ← Sircle__ left | 21:47 |
| ← leeN left | 21:48 |
| → Sircle__ joined | 21:52 |
| → durham joined | 21:53 |
| ← hvxgr left | 21:54 |
| ← durham left | 21:55 |
| ← Sircle_ left | 21:55 |
| → Sircle_ joined | 21:56 |
| → Mattiaslndstrm joined | 21:56 |
| ← Sircle__ left | 21:57 |
| → Sircle__ joined | 21:59 |
| ← jimi_ left | 22:02 |
| ← Sircle_ left | 22:03 |
| → Sircle_ joined | 22:03 |
| ← finalbeta left | 22:04 |
| ← jab416171 left | 22:04 |
| ← Sircle__ left | 22:05 |
| → rmbeer joined | 22:05 |
|
rmbeer
| hello | 22:05 |
|
| i want remove the last two commits, what command must use with 'git rebase'? | 22:05 |
| → jab416171 joined | 22:06 |
| ← doener left | 22:06 |
| → jimmyrcom joined | 22:07 |
|
thiago
| git reset | 22:07 |
| ← Mattiaslndstrm left | 22:07 |
|
rmbeer
| thiago, thanks by the joke... | 22:08 |
| ← threenuc left | 22:08 |
|
thiago
| I'm not joking | 22:09 |
|
| you use the git reset command to remove the top two commits | 22:09 |
|
| not git rebase | 22:09 |
|
MrJones
| rebase is for rewriting commits with another base, not remove them. you can use it for squashing maybe, but then they aren't gone, just mushed into others | 22:11 |
|
| MrJones +1's thiago | 22:12 |
| → kus joined | 22:13 |
|
rmbeer
| ok, understand... thanks... | 22:13 |
|
MrJones
| rmbeer: reset changes your HEAD if you use it on a commit (similar to checkout), except that it'll also move the current branch pointer and hence get rid of the followup commits which is what you want | 22:13 |
|
| read the man page for details, I believe it has examples and all | 22:14 |
| → planet_ joined | 22:14 |
| → Amanas joined | 22:15 |
| → bmgxc9 joined | 22:16 |
| ← bmgxc9 left | 22:16 |
|
rmbeer
| git reset HEAD~2 ? | 22:16 |
|
thiago
| yes | 22:17 |
|
| or --hard | 22:17 |
|
| I mean, with --hard | 22:17 |
|
| git reset will move the commit, but not the checkout | 22:17 |
|
| --hard checks it out too | 22:17 |
| ← planet_ left | 22:19 |
|
ChrisADR
| you could also use git rebase -i rmbeer | 22:19 |
|
| and then decide wheter to keep or not your commits, if that was what you were asking | 22:20 |
|
rmbeer
| thiago, without --hard also move the checkout, i fix the list of commits, thanks :) | 22:21 |
|
| have the HEAD and master in the correct position... | 22:21 |
| ← Amanas left | 22:22 |
|
thiago
| without --hard, HEAD and index move, but not the worktree | 22:23 |
| ← Gurkenglas left | 22:24 |
|
rmbeer
| no understand... | 22:25 |
|
_ikke_
| !demyst | 22:25 |
|
gitinfo
| [!reset] reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD) | 22:25 |
|
_ikke_
| https://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified | 22:25 |
|
rmbeer
| ah, i see... no mather why the last commit is about of remove and add the same files... | 22:26 |
|
| s/mather/matter/ | 22:26 |
|
| s/last/last two/ | 22:27 |
|
| it was just hard to convert 1 full repository into 40 separate repositories... | 22:28 |
| → Sircle__ joined | 22:29 |
| ← pirocks left | 22:29 |
| ← konsolebox left | 22:30 |
| ← orbyt_ left | 22:31 |
| → cagmz joined | 22:32 |
| ← Sircle_ left | 22:32 |
| ← Darcidride left | 22:33 |
| → ZiZiBe joined | 22:34 |
| → pirocks joined | 22:34 |
| → Sircle_ joined | 22:35 |
| → learning joined | 22:36 |
| → konsolebox joined | 22:36 |
| ← Sircle__ left | 22:38 |
| → hvxgr joined | 22:39 |
| → rafasc joined | 22:41 |
| → figurehe4d joined | 22:43 |
| ← xcm left | 22:46 |
| → xcm joined | 22:46 |
| → Myk267 joined | 22:46 |
| → orbyt_ joined | 22:48 |
| ← menip left | 22:51 |
| → nimomo joined | 22:51 |
| → Mattiaslndstrm joined | 22:53 |
| ← nimomo left | 22:56 |
| ← Sonderblade left | 22:56 |
| ← kus left | 22:57 |
| ← MoziM left | 22:57 |
| ← sammyg2 left | 22:58 |
| ← pfleck left | 22:59 |
| → Sonderblade joined | 23:01 |
| ← timvisher left | 23:01 |
| ← jnavila left | 23:02 |
| → timvisher joined | 23:02 |
| → Sircle joined | 23:02 |
| ← learning left | 23:04 |
| → sammyg2 joined | 23:04 |
| ← Sircle_ left | 23:05 |
| ← Bengi left | 23:06 |
| → Amanas joined | 23:06 |
| ← schleppel left | 23:06 |
| → war_pigs joined | 23:07 |
| ← Mattiaslndstrm left | 23:07 |
| → pfleck joined | 23:07 |
| → john3voltas joined | 23:08 |
| ← ZiZiBe left | 23:08 |
| → Sircle_ joined | 23:09 |
| → Bobdude joined | 23:10 |
| → escproxy joined | 23:11 |
| ← Sircle left | 23:12 |
| → Mattiaslndstrm joined | 23:12 |
| → Sircle__ joined | 23:12 |
| → Bengi joined | 23:14 |
| → astrofog joined | 23:14 |
| ← Sircle_ left | 23:16 |
| → Kaisyu7 joined | 23:17 |
| ← rh10 left | 23:17 |
| ← Sircle__ left | 23:17 |
| → ome joined | 23:18 |
| → dave0x6d joined | 23:20 |
| ← Mattiaslndstrm left | 23:21 |
| ← hacman left | 23:21 |
| ← HollywoodJack left | 23:22 |
| → applecrumble joined | 23:24 |
| → xaa joined | 23:24 |
| ← dege left | 23:24 |
| ← de-vri-es left | 23:24 |
| → de-vri-es joined | 23:25 |
| → MattMaker joined | 23:26 |
| ← dreiss left | 23:28 |
| unreal_ → unreal | 23:30 |
| ← sammyg2 left | 23:31 |
| → rh10 joined | 23:32 |
| → sammyg2 joined | 23:33 |
| ← coumbole left | 23:33 |
| ← Phylock left | 23:34 |
| → finalbeta joined | 23:35 |
| ← Kaisyu7 left | 23:35 |
| → shinnya joined | 23:35 |
| ← barduck left | 23:35 |
| ← war_pigs left | 23:36 |
| ← sammyg2 left | 23:37 |
| ← Nizumzen left | 23:42 |
| → learning joined | 23:43 |
| ← john3voltas left | 23:50 |
| → john3voltas joined | 23:50 |
| ← mooasaurus left | 23:51 |
| → mooasaurus joined | 23:51 |
| ← tn left | 23:54 |
| → war_pigs joined | 23:57 |
| ← pirocks left | 23:58 |