IRCloggy #git 2018-04-02

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2018-04-02

← weez17 left00:00
← moldy left00:00
→ weez17 joined00:00
← weijin left00:02
← shinnya left00:04
→ johnnyb joined00:05
← coco left00:06
← SwiftMatt left00:06
→ Mattiaslndstrm joined00:08
← joshbright left00:09
→ ecuanaso joined00:09
→ Karyon joined00:13
→ _ADN_ joined00:13
← sim590 left00:13
→ sim590 joined00:14
→ Nizumzen joined00:16
→ joshbright joined00:16
← Gurkenglas left00:17
← drodger left00:18
→ drodger joined00:19
→ widp joined00:21
→ andyhuzhill joined00:23
→ zulutango joined00:25
← joshbright left00:27
→ sz0 joined00:30
← ecuanaso left00:34
→ weijin joined00:35
→ HoierM joined00:36
← rafasc left00:36
→ mrBen2k2k2k joined00:37
→ khisanth_ joined00:39
← johnnyb left00:39
← Nizumzen left00:40
← weijin left00:40
← Karyon left00:42
← Guest21 left00:42
← khisanth__ left00:42
→ joshbright joined00:44
← joshbright left00:45
← ThatOtherGuy left00:45
→ ThatOtherGuy joined00:46
→ joshbright joined00:47
← joshbright left00:49
← VoradorPT left00:51
← doug16k left00:52
agio hi, I just learned how to run `git diff' using different algorithms, patience, minimal, histogram etc . My question is: the `git diff` command only prints diffs, how do I use those same algorithm when actually staging?00:52
If I try and use the `--diff-algorithm' option when staging, e.g. `git add --diff-algorithm patience .' git throws : error: unknown option `diff-algorithm'00:53
% git --version00:54
git version 2.7.400:54
→ ecuanaso joined00:55
→ weijin joined00:57
← Mattiaslndstrm left01:00
rewt agio, git add adds the whole file, not just the diff01:01
git does not store the diff; it re-creates it every time you run git diff01:01
← weijin left01:01
← ecuanaso left01:04
agio rewt: yes, so eventually once I can get the "add the whole file" staging command to work - I would then want to "upgrade" that to something like the `git add --patch' option - but Im just trying to get the most simple case working first01:05
← flying_sausages left01:06
rewt git add doesn't add the patch... what are you trying to do exactly? what problem are you trying to solve?01:06
agio rewt: yes, thats the problem: I run `git diff --diff-algorithm=patience <file>' and its exactly how I want the commit to capture the change - but then, as you say, `git diff' doesn't save that diff does it?01:07
rewt no, the diff is not saved anywhere; when you run `git diff` is when it is generated01:08
which is why i don't get what `git add` has to do with any of that01:08
once the file is added, you can run `git diff` with any options you want to get any kind of diff you want from it01:08
→ flying_sausages joined01:08
→ armin_ joined01:11
agio oh, so you're saying - say I download a remote branch and start viewing the branch say with `git log --patch' that I could say use `git log --patch --diff-algorithm=patience' to display - an already captured diff - in an alternative way?01:11
rewt: ^01:11
← armin left01:12
rewt sure, if `git log` has that; it will generate all the diffs when you run that command01:12
← LiftLeft left01:12
rewt the repo only has full complete versions of files01:13
there is no "captured diff"01:13
→ sourcream joined01:13
rewt if you add & commit a file, then change it, then add & commit again, git stores both complete full versions of it, NOT the first one and the diff to the 2nd one01:14
← taoqy left01:14
agio ah, you're right `git log --patch --diff-algorithm=...' does work!01:14
rewt: repo only has full compleete versions of files? that would mean in a repo with say 2500 commits - there are 2500 full versions of every file? the repo would be huge?01:16
rewt yes01:17
← armin_ left01:17
rewt after a while git does store compressed versions (using diffs or w/e), but that's completely invisible to the user01:17
→ armin joined01:17
→ Karyon joined01:17
agio I thought by only having commits - which contain only the minimum number of line changes necessary to modify an existing file to achieve the next commit - you can have a repo which is only a bit larger than say the working tree + index tree + commits?01:18
→ weijin joined01:19
← phluks left01:19
rewt that's not how git works -- imagine storing 2500 diffs for a file... git would need to process them all to arrive at the latest version01:20
and if the repo has 1000s of files...01:20
that's a lot of diffs01:20
agio rewt: ah so say if I only changed 3 files in a commit - 3 entirely new files would be checked in and the repo would increase by the size of those files (uncompressed or not) but actually - we're not duplicating the entire repo, we're only increasing by 3 files worth of data...?01:21
rewt yes, only changed files are stored01:22
agio wow.. ok01:22
→ jleclanche joined01:22
rewt the way it works is a commit points to a tree (directory), which in turn can point to other trees or files... every commit, tree, and file has an id (hash based on content and some metadata)... if a file doesn't change, its hash doesn't change, so the new tree points to that same version01:24
if a file does change, it gets a new id, and the new tree points to the new file01:24
→ LiftLeft joined01:25
→ finalbeta joined01:25
rewt also, if no files change in a directory (tree), that tree's id does not change (because its content did not change), so the tree (or commit) pointing to it can point to that same old tree01:25
agio oh wow. right . jeez I thought a commit pointed to a literal patch...01:26
rewt and a branch is nothing more than a pointer to a commit01:26
when you "commit to a branch" git does not record what branch was "active" at the time of the commit01:26
agio right so to envisage what you are describing - one would use the `git ls-files' or `git ls-tree' commands ?01:26
rewt yes, those look up the contents of the referenced id, regardless of which commit(s) it's in01:28
← sourcream left01:30
agio so this arrangement is similar to linux/unix file systems where a directory inode can point to another sub-directory inode which could point to file inodes - which pooint to the hard data block. but in git you can swap out the pointers - based on on the tree which some commit points to?01:31
→ rchavik joined01:31
← m0viefreak left01:32
agio and couple that with many different copies of the underlying data/files - you get a basis for version control?01:32
rewt something like that, yes01:33
← YuGiOhJCJ left01:34
→ ecuanaso joined01:34
← Tobbi left01:35
agio rewt: wow. thanks. yeah, in the the past I never got the ls-tree commands, but now they definitely make more sense01:35
← endiruna left01:36
← cybrNaut left01:39
→ GeekTheAlien joined01:40
← drodger left01:41
→ cybrNaut joined01:41
→ crtcji joined01:44
← LiftLeft left01:44
← igemnace left01:44
← GeekTheAlien left01:44
→ drodger joined01:47
← ilbot3 left01:48
← ecuanaso left01:48
→ ArcaTech joined01:50
← Fissure left01:51
← pfleck left01:53
← Karyon left01:57
→ ilbot3 joined01:57
→ LiftLeft joined01:57
← \void left01:58
← _ADN_ left01:58
→ igemnace joined01:58
← hooksie1 left01:59
→ xiaohui joined01:59
→ doug16k joined02:00
← crtcji left02:00
→ supernovah joined02:00
supernovah whats the command to checkout a specific commit and set all the files to the state at that commit02:01
→ sucks_ joined02:01
supernovah is it just git reset --hard <hash>02:02
→ fr33domlover joined02:03
supernovah because I still have a bunch of untracked files showing in git status02:03
oh I was in a subdirectory02:04
→ Raed|Laptop joined02:04
→ hooksie1 joined02:05
← HoierM left02:06
agio just do `git checkout <commit>'02:08
← xiaohui left02:08
agio you will be in a headless state but thats cool.02:08
← supernovah left02:09
agio if you run `git reset --hard <hash>' you will lose all the recent history/commits + index + working tree all the way back to the commit02:09
→ IndianArya joined02:10
← RougeR left02:12
dmc → cmd02:17
← john-34 left02:18
← UniFreak left02:19
→ SwiftMatt joined02:19
→ __rob2 joined02:19
→ john-34 joined02:20
← felixsanz left02:21
← __rob left02:21
→ testnick123 joined02:22
→ felixsanz joined02:22
← moei left02:23
← ArcaTech left02:26
← john-34 left02:26
→ john-34 joined02:27
← john-34 left02:28
→ john-34 joined02:28
→ liyou joined02:29
← sentriz left02:30
← igemnace left02:30
→ ArcaTech joined02:37
→ supernovah joined02:37
→ oojacoboo joined02:39
→ Mattiaslndstrm joined02:40
→ g00s joined02:40
→ akushner_ joined02:42
→ crtcji joined02:42
← crtcji left02:43
← weijin left02:46
← akushner left02:46
→ weijin joined02:46
→ fly_ joined02:47
← fly_ left02:48
→ fly_ joined02:48
fly_ hi. I have a second remote that is like, very different. how can I make a branch from that remote without needing to deal with merges?02:48
← piggah left02:48
← Mattiaslndstrm left02:52
← IndianArya left02:52
← weijin left02:53
← akushner_ left02:53
→ IndianArya joined02:53
← testnick123 left02:54
→ weijin joined02:54
fly_ hmm, git pull -f -Xtheirs mostly works, I guess.02:55
agio git fetch <second_remote> <branch>02:55
fly_: you want a local branch you can checkout to and work on?02:55
fly_ Yes02:56
← IndianArya left02:56
→ IndianArya joined02:57
agio ah ok the command above wont really help - will only give you read only remote tracknig branch02:57
← zumba_addict left02:58
← MaekSo left03:00
→ MaekSo joined03:00
← MaekSo left03:01
→ MaekSo joined03:01
← Olipro left03:03
→ Olipro joined03:03
Olipro → Guest5340503:03
← Crypt0x left03:05
← supernovah left03:05
← doug16k left03:06
← sucks_ left03:08
→ sucks joined03:08
← sucks left03:08
→ sucks joined03:10
→ supernovah joined03:12
← IndianArya left03:15
← Guest53405 left03:18
→ IndianArya joined03:19
→ shinnya joined03:19
→ dre_ joined03:21
→ doug16k joined03:22
← MACscr_ left03:23
→ Raed|Laptop_ joined03:23
→ testnick123 joined03:23
← Raed|Laptop left03:25
← noobineer left03:26
← sucks left03:27
← thebope left03:28
→ thebope joined03:29
→ canvon_ joined03:29
← canvon left03:30
← tt left03:31
← zulutango left03:31
← fr33domlover left03:32
← thebope left03:33
← supernovah left03:34
→ zulutango joined03:36
← diogenese left03:37
← IndianArya left03:37
→ Wulf4 joined03:38
← mud left03:41
← Wulf left03:41
Wulf4 → Wulf03:41
→ supernovah joined03:42
← Nokurn left03:44
→ diogenese joined03:44
→ Nokurn joined03:46
→ Lyqyd joined03:48
→ IndianArya joined03:49
← IndianArya left03:51
→ IndianArya joined03:51
→ piggah joined03:51
← sweatsuit left03:55
→ Olipro joined03:56
Olipro → Guest6010403:56
← piggah left03:57
→ sweatsuit joined03:58
→ xiaohui joined03:58
→ czart_ joined03:58
← xiaohui left03:59
→ ferdna joined04:01
← Raed|Laptop_ left04:02
← czart left04:02
→ kgrimes joined04:04
← supernovah left04:08
← kgrimes left04:09
← fly_ left04:10
→ mrBen2k2k2k_ joined04:10
→ re1 joined04:15
← Guest60104 left04:15
→ Guest60104 joined04:15
Guest60104 → Olipro04:15
← sz0 left04:18
← Olipro left04:22
← weijin left04:26
← linuxmodder left04:28
→ weijin joined04:29
← weijin left04:33
← alhariel left04:39
← sanscoeur left04:44
→ alhariel joined04:45
← alhariel left04:45
→ igemnace joined04:45
← IndianArya left04:46
← Lyqyd left04:48
→ weijin joined04:49
← dpyro left04:53
→ ecuanaso joined04:53
← g00s left04:53
→ Olipro joined04:53
→ dpyro joined04:54
Olipro → Guest7903304:54
← testnick123 left04:56
→ govg joined05:00
← BillyCrook left05:00
→ jstimm joined05:01
← fletom left05:02
→ pfleck joined05:03
→ energizer joined05:03
← pks left05:03
← ecuanaso left05:04
← igemnace left05:04
→ pks joined05:04
→ duderonomy joined05:06
← dre_ left05:10
← jstimm left05:11
← pfleck left05:15
← orbyt_ left05:16
ProfMac_ → ProfMac05:16
ProfMac → ProfMac_05:17
← asphyxia left05:17
← ferdna left05:27
→ xiaohui joined05:32
← xiaohui left05:33
← menip left05:35
→ supernovah joined05:40
← sunrunner20 left05:40
→ ocds joined05:41
← drodger left05:44
→ drodger joined05:46
→ nephyrin joined05:46
← weijin left05:47
← bartman left05:47
→ subhojit777 joined05:47
→ igemnace joined05:48
→ fletom joined05:50
← basiclaser left05:52
← ocds left05:55
← energizer left05:56
→ igemnace_ joined05:56
← igemnace left05:56
→ weijin joined05:57
→ sat-aton joined05:57
← sat-aton left05:57
→ sat-aton joined05:57
← re1 left05:58
← sat-aton__ left06:00
← SwiftMatt left06:02
→ __rob joined06:10
← __rob2 left06:12
→ borkr joined06:19
→ muricantrump joined06:21
→ tt joined06:23
→ dre_ joined06:26
→ tkore joined06:27
← tkore left06:27
→ tkore joined06:27
← Random832 left06:31
← cmd left06:38
→ mms_ joined06:41
mms_ any one using gerrit ? in notify email when I use internal group names it does not send out notifications but placing email addresses works06:42
→ energizer joined06:42
→ dmc joined06:44
→ pfleck joined06:45
← ShapeShifter499 left06:46
← madewokherd left06:48
→ ShapeShifter499 joined06:48
← thiago left06:54
← subhojit777 left06:58
→ oxymoron93 joined07:07
→ Random832 joined07:07
→ phinxy joined07:09
→ muelleme_ joined07:09
→ sanscoeur joined07:12
→ King_Hual joined07:14
← King_Hual left07:14
→ King_Hual joined07:14
← thallada left07:14
→ dmone joined07:19
→ Puffball_ joined07:20
→ lalitmee joined07:23
← mms_ left07:23
← Puffball left07:23
→ lalit joined07:24
← lalitmee left07:27
→ xiaohui joined07:33
→ jay-m joined07:34
← xiaohui left07:35
→ xiaohui joined07:36
← xiaohui left07:36
→ xiaohui joined07:37
← xiaohui left07:37
→ xiaohui joined07:38
← xiaohui left07:38
→ thallada joined07:40
← jay-m left07:41
→ drbean joined07:43
← liyou left07:44
→ coderkun joined07:44
← doug16k left07:45
→ xiaohui joined07:45
← xiaohui left07:45
← d^sh left07:46
→ xiaohui joined07:46
→ d^sh joined07:46
← xiaohui left07:47
→ pfleck1 joined07:47
→ mms_ joined07:49
→ marcovanest joined07:50
lalit → lalitmee07:50
← staafl_ left07:51
← n0body left07:51
→ xiaohui joined07:52
→ venmx joined07:54
← muelleme_ left07:55
→ ocds joined07:59
← xiaohui left08:01
← venmx left08:02
← marcovanest left08:03
→ n0body joined08:04
→ nowhere_man joined08:04
← nowhereman_ left08:05
→ muelleme_ joined08:06
→ __rob2 joined08:08
→ jonpetermatt joined08:10
← __rob left08:10
← Bobdude left08:14
← pfleck left08:16
pfleck1 → pfleck08:16
→ Tobbi joined08:21
← ArcaTech left08:21
→ ArcaTech joined08:22
← ArcaTech left08:22
← energizer left08:24
← ocds left08:26
← d^sh left08:26
→ d^sh joined08:27
← archer121 left08:29
→ tvale joined08:35
→ mar77i_ joined08:35
← mar77i left08:36
← reorder_ left08:36
→ schleppel joined08:39
→ jonpetermatt_ joined08:42
→ pfleck1 joined08:43
← jonpetermatt left08:44
← nowhere_man left08:44
← tvale left08:45
→ tvale joined08:49
igemnace_ → igemnace08:52
→ KeyJoo joined08:54
→ MACscr joined08:58
→ venmx joined09:00
→ escproxy joined09:02
← mms_ left09:04
→ sentriz joined09:05
→ ocds joined09:08
→ staafl_ joined09:08
→ dege joined09:08
→ mms_ joined09:08
→ re1 joined09:09
→ __rob joined09:10
→ hari_ joined09:10
→ wandering_vagran joined09:10
← __rob2 left09:10
← jonpetermatt_ left09:10
← dreiss left09:10
← supernovah left09:10
← hari_ left09:14
← muricantrump left09:15
← thxffo left09:16
mms_ ldap auth gerrit does it have issue with notify email to internal groups in gerrit code review ?09:17
← catsup left09:18
→ catsup joined09:18
← hunterlabs left09:18
← Wulf left09:19
← catsup left09:19
← rkta left09:19
→ catsup joined09:20
← stevenbenner left09:23
← venmx left09:24
← n0body left09:24
→ Fernando-Basso joined09:24
→ math-alpha joined09:24
← goweol left09:24
→ hunterlabs joined09:25
→ Gurkenglas joined09:25
→ amatas joined09:25
→ supernovah joined09:25
→ thxffo joined09:25
← dege left09:26
→ lalit joined09:27
← lalitmee left09:28
→ howdoi joined09:28
← math-alpha left09:29
→ lalitmee joined09:31
← lalit left09:33
← weijin left09:35
← pfleck1 left09:37
← mms_ left09:38
→ doug16k joined09:41
← ocds left09:41
→ YuGiOhJCJ joined09:42
→ zefferno joined09:42
→ jstein_ joined09:48
jstein_ → jstein09:49
→ mms_ joined09:50
← drodger left09:50
→ MarioBranco joined09:50
→ drodger joined09:55
← tvale left09:58
→ jay-m joined09:58
→ jnavila joined09:59
← Ram-Z left10:00
→ endiruna joined10:00
→ weijin joined10:01
← dre_ left10:01
← MarioBranco left10:02
← muelleme_ left10:03
← KeyJoo left10:04
→ math-alpha joined10:04
mms_ any one using notify group NAME syntax ?10:06
with gerrit10:06
→ MarioBranco joined10:07
← MarioBranco left10:07
→ jacekbogdanski joined10:08
← math-alpha left10:08
← supernovah left10:10
→ chris_wot joined10:11
← King_Hual left10:11
→ tvale joined10:12
→ leeN joined10:13
← mms_ left10:13
→ venmx joined10:17
→ Ram-Z joined10:18
→ manuelschneid3r joined10:18
← doug16k left10:18
→ mms_ joined10:20
→ supernovah joined10:23
→ nowhere_man joined10:23
← venmx left10:29
→ venmx joined10:30
→ doug16k joined10:30
← mms_ left10:30
→ MutantMahesh joined10:34
← kanzure left10:34
→ kanzure joined10:34
gitinfo set mode: +v10:34
→ mms_ joined10:34
← mms_ left10:37
→ rkta joined10:37
← MutantMahesh left10:38
→ mms_ joined10:39
← jnavila left10:41
← andyhuzhill left10:41
→ \void joined10:42
← jast left10:44
→ kostur86 joined10:45
→ Karyon joined10:46
← widp left10:46
← lalitmee left10:46
→ mostlybadfly joined10:47
← justanotheruser left10:47
← thinkpad left10:48
← endiruna left10:49
→ jast joined10:49
← mms_ left10:50
← NerdyPepper left10:50
→ MutantMahesh joined10:51
← tunekey left10:53
← jast left10:53
→ MarioBranco joined10:54
← rkta left10:55
→ endiruna joined10:56
mar77i_ → mar77i10:57
← chris_wot left10:57
→ chris_wot joined10:58
← tvale left11:00
→ coco joined11:02
← jstein left11:03
← supernovah left11:04
← gitinfo left11:05
← chris_wot left11:06
→ chris_wot joined11:07
← venmx left11:07
← chris_wot left11:07
← zulutango left11:07
→ chris_wot joined11:08
→ zulutango joined11:08
→ thinkpad joined11:09
← chris_wot left11:10
→ jast joined11:12
→ supernovah joined11:14
→ _ADN_ joined11:15
← jast left11:16
← _aeris_ left11:17
→ n0body joined11:18
→ bartman joined11:19
← APic left11:22
← supernovah left11:23
→ CodeSlingerPaul joined11:24
← thinkpad left11:26
→ thinkpad joined11:29
→ noobineer joined11:29
→ toydestroyer_ joined11:30
→ VeeEm joined11:30
→ ams__ joined11:30
← toydestroyer left11:31
← VeeEm left11:31
→ volkomeister joined11:33
← volkomeister left11:33
→ bsanford joined11:35
→ jost joined11:35
→ tymczenko joined11:35
← pgupta left11:36
→ Wulf joined11:39
→ jast joined11:40
→ Nizumzen joined11:40
→ gitinfo joined11:41
ChanServ set mode: +o11:41
→ Cavallari joined11:41
→ pfleck1 joined11:42
← pfleck left11:43
pfleck1 → pfleck11:43
→ Singmyr joined11:43
← jacekbogdanski left11:44
← dpyro left11:45
→ NerdyPepper joined11:46
← thinkpad left11:46
→ fr33domlover joined11:47
→ mms_ joined11:47
→ thinkpad joined11:48
→ supernovah joined11:50
← YuGiOhJCJ left11:51
→ _aeris_ joined11:53
← _aeris_ left11:53
← noobineer left11:55
mms_ any one using gerrit and configured notify group NAME syntax ?11:55
→ _aeris_ joined11:55
← thinkpad left11:55
← peepsalot left11:56
← speedmann left11:56
→ lalitmee joined11:59
→ acidjnk joined11:59
acidjnk hello12:00
When I'm developing on a 1.3 branch and a 1.2 branch. And then I need a quick fix on the 1.2-branch, but that totally doesn't apply to 1.3 which handles the situation completely differently. Can I merge 99 % of 1.2-changes to 1.3, but skip that kind of quick fix?12:01
← markmarkmark left12:02
→ markmarkmark joined12:02
→ widp joined12:03
← igemnace left12:03
← NerdyPepper left12:08
→ n0b0dy joined12:08
→ NerdyPepper joined12:08
← CodeSlingerPaul left12:09
→ synthroid joined12:09
← supernovah left12:10
→ peepsalot joined12:10
→ CodeSlingerPaul joined12:11
← n0body left12:12
← NerdyPepper left12:12
← fr33domlover left12:13
→ NerdyPepper joined12:13
→ thinkpad joined12:15
← Nizumzen left12:17
← CodeSlingerPaul left12:17
→ tvale joined12:17
→ CodeSlingerPaul joined12:19
→ Nizumzen joined12:20
→ reprazent joined12:22
→ Karyon_ joined12:23
← zulutango left12:23
→ duderono_ joined12:25
← Trieste left12:25
← reprazent left12:26
← Karyon left12:27
← CodeSlingerPaul left12:27
→ speedmann joined12:28
→ Trieste joined12:28
← duderonomy left12:28
← Wulf left12:29
→ CodeSlingerPaul joined12:29
→ Wulf joined12:30
← duderono_ left12:30
← mms_ left12:31
← speedmann left12:31
→ reprazent joined12:34
→ jacekbogdanski joined12:35
← plasticboy left12:37
→ plasticboy joined12:39
← yn left12:39
← thinkpad left12:40
← manuelschneid3r left12:42
→ yn joined12:43
← reprazent left12:44
→ thinkpad joined12:44
← MutantMahesh left12:44
→ ecuanaso joined12:44
← felixsanz left12:45
→ felixsanz_ joined12:45
→ jacekbog1 joined12:46
← jacekbogdanski left12:46
→ SwiftMatt joined12:47
← SwiftMatt left12:48
← weijin left12:49
→ kes joined12:52
→ pp5mgt joined12:53
→ reprazent joined12:54
← jay-m left12:54
← bsanford left12:57
→ jay-m joined12:58
→ RougeR joined12:59
← RougeR left12:59
→ RougeR joined12:59
← jacekbog1 left12:59
→ jstein_ joined13:00
jstein_ → jstein13:00
→ paxri01 joined13:00
← _aeris_ left13:01
← tvale left13:01
→ _aeris_ joined13:01
← lalitmee left13:02
← TSS_ left13:02
→ speedmann joined13:04
→ venmx joined13:10
coderkun Maybe cherry-pick a range13:10
https://git-scm.com/docs/git-cherry-pick13:10
← armin left13:10
→ armin joined13:11
→ muelleme_ joined13:11
→ kuka joined13:12
oxymoron93 acidjnk: ^13:13
← khisanth_ left13:15
→ tvale joined13:15
← widp left13:16
→ SwiftMatt joined13:16
← acidjnk left13:18
→ chalupajack joined13:18
→ APic joined13:18
→ weijin joined13:20
← rchavik left13:21
← endiruna left13:21
→ sleepingforest joined13:22
→ duderonomy joined13:23
→ linuxmodder joined13:23
← weijin left13:24
→ thebope joined13:25
← kuka left13:27
→ khisanth_ joined13:28
← howdoi left13:28
→ weijin joined13:28
← SwiftMatt left13:29
← gusnan left13:30
← naoey left13:32
← weijin left13:33
→ naoey joined13:34
← jcarpenter2 left13:34
→ reorder_ joined13:35
← raynold left13:36
← lightstalker left13:40
← ecuanaso left13:41
→ ocds joined13:42
← LichtMacher left13:42
→ lightstalker joined13:43
← ocds left13:44
→ sepher joined13:44
→ ecuanaso joined13:45
← duderonomy left13:45
← thebope left13:46
→ thebope joined13:47
→ duderonomy joined13:47
← kanzure left13:47
← oxymoron93 left13:48
→ griffindy joined13:48
← jay-m left13:49
← shinnya left13:49
← griffindy left13:49
→ chris_wot joined13:49
→ Dougie187 joined13:50
← _ADN_ left13:51
← thebope left13:51
→ griffindy joined13:52
← griffindy left13:53
→ _ADN_ joined13:53
→ d10n-work joined13:54
← _ADN_ left13:55
→ _ADN_ joined13:56
← reprazent left13:57
d10n-work When running `git gui`, I frequently get a notice "This repo has ~5500 loose objects. [...] Compress the database now?" - even shortly after running git gc. What are big causes of loose objects?13:58
plexigras is there a nice way to display what files are tracked, modified, cached, and untracked?13:59
→ griffindy joined14:00
plexigras i know i can do git ls-files14:00
d10n-work plexigras: `git status -u`14:00
→ weijin joined14:00
d10n-work you may not need the -u flag. `git status` should show all that by default I think14:01
→ kanzure joined14:01
← _ADN_ left14:01
plexigras yes thanks14:01
d10n-work oh, reading your question again, maybe I misunderstood what you want - do you want to include unmodified files in the output?14:02
← griffindy left14:02
plexigras it would be cool but its not highly necessary14:02
→ testnick123 joined14:04
← dsdeiz left14:06
← duderonomy left14:06
→ _ADN_ joined14:07
d10n-work looks like `git ls-files -tcdmo` includes unmodified files14:08
← testnick123 left14:08
→ YuGiOhJCJ joined14:08
← weijin left14:09
→ dsdeiz joined14:10
← dsdeiz left14:10
→ dsdeiz joined14:10
plexigras but its not honoring .gitignore?14:11
→ thiago joined14:11
d10n-work it looks like you can add the `--exclude-standard` flag to honor .gitignore14:12
→ muricantrump joined14:17
← YuGiOhJCJ left14:17
← Gurkenglas left14:18
← Wulf left14:21
← synthroid left14:24
→ acidjnk joined14:24
→ rafasc joined14:25
← tvale left14:26
→ howdoi joined14:26
→ LichtMacher joined14:27
← escproxy left14:27
→ testnick123 joined14:28
→ synthroid joined14:28
→ Wulf joined14:28
→ supernovah joined14:29
→ weijin joined14:31
← muelleme_ left14:32
← ShapeShifter499 left14:36
← weijin left14:36
→ Whiskey joined14:37
→ weijin joined14:37
→ kuka joined14:38
→ ShapeShifter499 joined14:39
← testnick123 left14:39
← ShapeShifter499 left14:40
→ moei joined14:40
→ jready joined14:40
→ ShapeShifter499 joined14:41
→ al-damiri joined14:41
→ tvale joined14:41
← weijin left14:41
→ kn-928 joined14:42
← kuka left14:43
→ Phylock joined14:46
← kostur86 left14:48
→ UTAN_dev joined14:48
→ crose joined14:48
← msp301 left14:49
← linuxmodder left14:50
→ Mike11 joined14:50
→ msp301 joined14:50
← Case_Of left14:51
→ Case_Of joined14:52
→ mrom joined14:53
→ mniip joined14:53
← Singmyr left14:54
← tkore left14:56
← mrom left14:59
← venmx left15:01
→ Es0teric joined15:01
→ fahadash joined15:03
→ YuGiOhJCJ joined15:04
← Cavallari left15:04
→ FrostCandy joined15:05
→ raynold joined15:07
← govg left15:08
→ duderonomy joined15:08
→ greggerz joined15:09
← sanscoeur left15:10
← kanzure left15:10
→ escproxy joined15:11
→ morenoh149 joined15:11
morenoh149 is there anyway to tell git not to attempt to merge a file when doing git merge <branch> ?15:12
it's doing a pretty bad job in this particular instance and I'd like to handle it myself15:12
← synthroid left15:13
canton7 morenoh149, you can merge with --no-commit, fix it up, then complete the merge15:13
← zefferno left15:15
← duderonomy left15:15
canton7 (using checkout --ours/--theirs/--merge as you want)15:15
→ jimmyrcom joined15:17
→ madewokherd joined15:18
→ sammyg joined15:19
← supernovah left15:20
← ghormoon left15:22
→ synthroid joined15:23
← msp301 left15:23
→ msp301 joined15:24
→ synthroi_ joined15:24
← synthroid left15:24
→ weijin joined15:25
→ dreiss joined15:27
→ ghormoon joined15:28
← weijin left15:30
→ kanzure joined15:31
→ govg joined15:32
← hunterlabs left15:33
→ goodafternoon joined15:34
plexigras is there a way to have git ls-files not be recursive?15:35
so only the folder names are shown15:35
← msp301 left15:36
_ikke_ plexigras: depending on what you want, git ls-tree might be suitable15:36
→ hunterlabs joined15:36
plexigras nvm its a bad idea anyway15:36
← Karyon_ left15:36
→ msp301 joined15:36
← govg left15:37
→ govg joined15:38
← crose left15:38
← nielsk left15:39
← jready left15:41
→ nd joined15:42
→ kuka joined15:43
→ cagomez joined15:43
← msp301 left15:43
← nd_ left15:44
→ msp301 joined15:45
→ weijin joined15:46
→ nielsk joined15:48
→ noobineer joined15:48
← weijin left15:51
→ wreed joined15:53
→ ferdna joined15:55
→ jnavila joined15:55
← kes left15:56
→ dendazen joined15:56
← nielsk left15:56
→ paul424 joined15:56
→ jnewt_ joined16:01
→ sat-aton__ joined16:02
← jimmyrcom left16:03
← sat-aton left16:05
jnewt_ i have a local copy of a github repo. the repo has a pull request that is not merged. i want to merge that into my local copy.16:05
← sammyg left16:06
← _ADN_ left16:06
→ flippedouttt joined16:06
→ _ADN_ joined16:06
rafasc jnewt_: github stores pull requests under refs/pull/ID/head16:07
→ SwiftMatt joined16:07
rafasc https://help.github.com/articles/checking-out-pull-requests-locally/16:07
jnewt_ https://gist.github.com/piscisaureus/3342247 i found that, seems overly complicated. do i really need to modify my local .git/config?16:07
→ nielsk joined16:08
← ecuanaso left16:08
← tt left16:08
rafasc if it's a one time thing, you can follow the github documentation url.16:09
→ ecuanaso joined16:10
rafasc that approach you linked is for when you're interested in all PRs and want to make things more permanent.16:11
← ecuanaso left16:11
← tvale left16:12
← Kaisyu left16:15
→ nohop joined16:16
nohop I have made a bunch of changes in a branch called "develop" that i haven't pushed yet. What's a safe way to temporarily 'switch' to the remote branch 'develop', and later switch back to my local one ?16:17
→ Karyon_ joined16:18
→ justanotheruser joined16:19
← kn-928 left16:20
→ weijin joined16:20
→ phluks joined16:20
→ UTAN_dev_ joined16:22
→ menip joined16:23
← menip left16:23
→ muelleme_ joined16:25
← weijin left16:25
← UTAN_dev left16:25
← dendazen left16:26
← ejsf left16:26
→ tt joined16:27
← NerdyPepper left16:27
→ ejsf joined16:27
→ eche779 joined16:28
← eche779 left16:30
← justanotheruser left16:32
→ eche779 joined16:33
→ weijin joined16:33
→ dendazen joined16:33
← finalbeta left16:33
← eche779 left16:33
rafasc nohop: create a branch out of the remote branch develop and switch to it.16:33
→ finalbeta joined16:34
rafasc smoothing like $git checkout -b newbranch origin/develop;16:34
something*16:35
← muelleme_ left16:35
← kuka left16:36
← weijin left16:38
← beerdrop left16:39
→ synthroid joined16:39
← fletom left16:41
← tymczenko left16:43
← synthroi_ left16:43
→ ecuanaso joined16:43
← howdoi left16:45
← acidjnk left16:45
← Mike11 left16:47
← ecuanaso left16:47
← kanzure left16:48
→ kanzure joined16:48
← rafasc left16:49
→ hmoreno joined16:49
← jnavila left16:49
→ rafasc joined16:50
→ fr33domlover joined16:50
← dendazen left16:50
→ sanscoeur joined16:50
← sanscoeur left16:51
→ kuka joined16:51
← morenoh149 left16:51
← kuka left16:55
→ sanscoeur joined16:55
← dreiss left16:57
← goodafternoon left16:58
→ durham joined16:58
→ akushner joined16:58
→ dreiss joined16:59
→ dpyro joined17:00
→ weijin joined17:01
→ reprazent joined17:01
← cagomez left17:03
→ cagomez joined17:04
← cagomez left17:05
← weijin left17:05
→ NerdyPepper joined17:05
← dpyro left17:06
← wreed left17:07
→ dpyro joined17:07
← dreiss left17:08
→ Gurkenglas joined17:08
→ m0viefreak joined17:08
← jstein left17:09
→ tymczenko joined17:14
→ kgrimes joined17:15
← tt left17:17
→ hbautista joined17:18
→ energizer joined17:19
→ palmtree joined17:20
→ UTAN_dev joined17:20
→ tt joined17:21
→ sammyg joined17:21
→ TSS_ joined17:21
← UTAN_dev_ left17:23
← tymczenko left17:28
→ linuxmodder joined17:29
→ SJr joined17:30
→ muelleme_ joined17:31
→ Cavallari joined17:32
→ g00s joined17:35
→ stutter_ joined17:36
← muelleme_ left17:36
→ weijin joined17:36
← wandering_vagran left17:38
← SwiftMatt left17:38
← LiftLeft left17:39
→ cagomez joined17:40
← weijin left17:41
\void → Time-Warp17:43
→ weijin joined17:44
← re1 left17:44
Time-Warp → \void17:44
→ jready joined17:45
→ rkta joined17:46
← ams__ left17:47
← weijin left17:48
→ star_prone joined17:49
← mmattice left17:50
→ kn-928 joined17:50
← Wulf left17:50
→ LiftLeft joined17:51
← amatas left17:52
← surfist left17:53
→ muelleme_ joined17:55
← MarioBranco left17:55
→ UTAN_dev_ joined17:56
← theskillwithin left17:56
→ theskillwithin joined17:57
→ sunrunner20 joined17:58
← UTAN_dev left17:58
JJonah Is there a difftool like vimdiff that will output directly into the terminal the way default diff output does rather than launching a gui program? you can assume a sufficiently wide terminal.17:59
tang^ use vimdiff?18:00
← star_prone left18:00
JJonah tang^: when i use vimdiff it opens vim18:01
→ acidjnk joined18:01
→ surfist joined18:01
→ akushner_ joined18:01
tang^ oh, straight drop to terminal18:02
→ cdleonard joined18:02
→ jmenbo joined18:02
canton7 JJonah, like diff -y ?18:02
Pennth having trouble with github since they disallowed TLS1.0. I've recompiled openssl and curl for a Red Hat 5 box that I can't just get rid of. curl to github is fine, but git fails over https and just hangs with git://18:03
JJonah tang^: yes18:03
← vdamewood left18:03
Pennth Is there anything I can add to .git/config or /etc/profile.d that can fix this?18:04
← akushner left18:04
JJonah canton7: can you elaborate? what command are suggesting?18:04
canton7 JJonah, diff -y ?18:05
the `diff` command with the `y` flag18:05
tang^ Pennth: if it's RHEL5, they'll tell you to upgrade to a supported version18:05
github removed git:// access a while ago18:06
← reprazent left18:06
JJonah canton7: i'm still not following how that answers my question. this is what i see with that:18:06
JJonah $ g diff -y master18:06
usage: git diff [<options>] [<commit> [<commit>]] [--] [<path>...]18:06
← energizer left18:07
tang^ set diff as your difftool18:07
man git-config18:07
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html18:07
→ Singmyr joined18:08
→ kneeki joined18:08
→ dimi1947 joined18:08
← kanzure left18:09
JJonah tang^: sorry, i get it now. but it still asks to launch when i do that:18:09
$ g difftool -t "diff -y" master18:09
Viewing (1/69): 'Dockerfile'18:09
Launch 'diff -y' [Y/n]? Y18:09
Pennth tang^, What should I change the URL protocol to in .git/config?18:09
tang^ Pennth: personally, I use SSH everywhere18:10
canton7 JJonah, you'll want diff.externel, not difftool, iirc18:11
*diff.external18:11
JJonah, e.g. https://stackoverflow.com/questions/7669963/how-can-i-get-a-side-by-side-diff-when-i-do-git-diff18:11
(and other links from https://www.google.co.uk/search?q=git+diff+side+by+side)18:11
→ Sasazuka joined18:13
→ weijin joined18:14
← rafasc left18:16
→ testnick123 joined18:16
← coderkun left18:16
→ rafasc joined18:17
← felixsanz_ left18:17
← paul424 left18:17
← hmoreno left18:17
← minionofgozer left18:18
← weijin left18:19
→ minionofgozer joined18:19
→ Guest21 joined18:20
← jnewt_ left18:20
→ tunekey joined18:21
← sauvin left18:24
← i7c left18:25
→ nioncode_ joined18:25
← nioncode left18:25
← akushner_ left18:26
→ nixjdm joined18:26
→ akushner joined18:27
→ boombatower joined18:27
→ durham_ joined18:27
← opalepatrick left18:28
← kgrimes left18:29
← ferdna left18:29
← chalupajack left18:30
← jleclanche left18:30
← durham left18:31
← minionofgozer left18:32
→ joekeilty joined18:32
← akushner left18:32
→ SwiftMatt joined18:32
→ minionofgozer joined18:32
← durham_ left18:32
← joekeilty left18:34
JJonah canton7: ty18:35
→ cpr joined18:37
→ hmoreno joined18:38
← cpr left18:39
← nielsk left18:40
→ nowhereman_ joined18:40
← minionofgozer left18:41
→ kanzure joined18:41
→ minionofgozer joined18:42
→ cpr joined18:42
← linuxmodder left18:42
← hmoreno left18:42
← nowhere_man left18:44
← Karyon_ left18:45
← drodger left18:46
→ weijin joined18:46
→ hmoreno joined18:46
→ crose joined18:47
→ nielsk joined18:47
→ drodger joined18:47
← drodger left18:47
← cpr left18:48
→ user__ joined18:49
← minionofgozer left18:51
← weijin left18:51
← muelleme_ left18:51
→ minionofgozer joined18:52
→ drodger joined18:52
← SCHAPiE left18:52
→ wreed joined18:53
← kn-928 left18:54
→ bemo joined18:57
← FrostCandy left18:57
→ ocds joined18:58
← wreed left18:58
→ SCHAPiE joined19:00
→ xeno joined19:01
← RougeR left19:02
→ FrostCandy joined19:02
← bemo left19:03
→ hmoreno1 joined19:04
→ ecuanaso joined19:04
← hmoreno left19:05
→ weijin joined19:06
← palmtree left19:07
← YuGiOhJCJ left19:08
→ beerdrop joined19:08
← crose left19:08
← fr33domlover left19:09
→ fr33domlover joined19:10
→ jottr_ joined19:10
← weijin left19:10
→ IndianArya joined19:11
→ chaosruler joined19:12
→ Sonderblade joined19:12
→ palmtree joined19:12
→ Bobdude joined19:13
← ocds left19:13
← finalbeta left19:13
→ finalbeta joined19:14
← testnick123 left19:15
← jottr_ left19:16
→ tymczenko joined19:17
→ hanna` joined19:18
→ jottr_ joined19:20
→ manuelschneid3r joined19:20
→ crmne joined19:20
← hanna left19:21
→ gunix joined19:21
gunix hello19:21
gitinfo gunix: 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.19:21
→ weijin joined19:21
← arecaceae left19:21
gunix i am following this tutorial: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/19:22
→ arecaceae joined19:22
gunix and i am getting this errors: https://bpaste.net/show/a0ae9080671019:22
*these19:22
← kanzure left19:23
gunix nevermind, this fixed it: git pull origin master --allow-unrelated-histories19:24
← jottr_ left19:24
gunix however, --allow-unrelated-histories is not part of autocomplete and that is confusing19:24
→ chaosruler_ joined19:24
← cagomez left19:24
→ star_prone joined19:25
→ cagomez joined19:25
← dimi1947 left19:26
← chaosruler left19:26
← weijin left19:26
hanna` → hanna19:29
→ Karyon_ joined19:29
← star_prone left19:29
← cagomez left19:30
→ cfoch__ joined19:32
→ i7c joined19:32
→ VoradorPT joined19:33
← palmtree left19:34
← Nokurn left19:34
→ cpr joined19:34
→ Nokurn joined19:35
← cpr left19:36
→ dege joined19:37
← Karyon_ left19:37
→ Karyon_ joined19:38
sammyg → torvalds19:39
→ fletom joined19:39
→ jungsubk joined19:39
torvalds → sammyg19:40
→ cagomez joined19:41
← cagomez left19:46
← jungsubk left19:46
← borkr left19:46
→ jungsubk joined19:47
rafasc gunix: --allow-unrelated-histories is no a part of autocompletion because usually is not what people want.19:47
https://ptpb.pw/sVE219:47
your repository now has two root commits.19:47
→ Raed|Laptop_ joined19:49
← LichtMacher left19:49
← nikheizen left19:51
← Raed|Laptop_ left19:53
→ joekeilty joined19:54
→ weijin joined19:55
→ cagomez joined19:57
gunix rafasc: how did you see that?19:58
rafasc !lol19:58
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all19:58
→ Raed|Laptop joined19:58
← weijin left20:00
← IndianArya left20:00
→ kuka joined20:00
nohop rafasc> nohop: create a branch out of the remote branch develop and switch to it.20:01
← cagomez left20:02
nohop Yeah, that's actually what I ended up doing. I was wondering if there was a simpler thing like git somethingsomething origin/develop :)20:02
→ sanscoeu_ joined20:02
xcm → Guest8073020:03
← Guest80730 left20:03
→ xcm joined20:03
rafasc nohop: you can checkout origin/develop directly, that will leave in the detached head state.20:04
→ star_prone joined20:04
→ kgrimes joined20:04
rafasc not sure what you wanted to do, so I suggested the safe way to do it.20:05
← muricantrump left20:05
← sanscoeur left20:06
rafasc but you could do something like: git checkout origin/develop; do something; git commit; git merge develop;20:06
if happy with the result, git branch -f develop HEAD;20:07
→ palmtree joined20:08
→ mmattice joined20:09
→ unreal joined20:09
rafasc you avoid creating the temporary branch, but you're using more things that could potentially be a pain in the ass.20:10
→ weijin joined20:11
→ cagomez joined20:12
← hmoreno1 left20:15
← Guest9757 left20:15
← kuka left20:16
← Puffball_ left20:16
← weijin left20:16
← cagomez left20:16
→ kuka joined20:16
→ cagomez joined20:17
← Raed|Laptop left20:17
→ csaba2 joined20:19
← Nokurn left20:19
← beerdrop left20:19
→ Nokurn joined20:20
← Nokurn left20:21
csaba2 hello, I've created a git repo on my windows 7 machine... then on my win10 laptop I cloned the repo and made some changes... now I want to push the changes back to the original repo, but I get error message20:22
← joekeilty left20:22
→ Nokurn joined20:22
csaba2 "unable to write sha1 filename ./objects/pack/pack-6c530e1"20:22
why isn't it working?20:23
← user__ left20:23
← jungsubk left20:23
rafasc csaba2: seems like a permission issue.20:24
← drodger left20:24
→ Anthaas joined20:24
csaba2 yes :) but what needs to be fixed? I could clone it without any issues, so technically the push should work too20:24
the directory on the original repo is shared with read/write permission20:25
→ drodger joined20:26
rafasc did you trim the path? or is it truncated to "./objects/pack/pack-6c530e1" ?20:26
csaba2 ah ok I found the solution: https://stackoverflow.com/questions/6551441/git-error-unable-to-write-sha1-filename-permission-denied/6553594#655359420:26
needed to run this config:20:26
git config core.sharedRepository true20:26
rafasc !rubberducking20:28
gitinfo We love being your rubber ducks! Just tell us what your problem is, and maybe you'll find the solution yourself! Our favorite questions are the ones we don't need to answer. (Don't forget to mention your solution for posterity's benefit!)20:28
rafasc :)20:28
← peepsalot left20:29
← sanscoeu_ left20:29
→ sanscoeur joined20:30
rafasc csaba2: when working with non-bare repos it's usually preferred to pull from the other side over pushing to it.20:30
→ hmoreno1 joined20:32
← kuka left20:32
← palmtree left20:32
→ weijin joined20:32
→ beerdrop joined20:34
→ wootehfoot joined20:34
→ palmtree joined20:35
← Karyon_ left20:35
← weijin left20:37
→ Mattiaslndstrm joined20:38
← crmne left20:39
← star_prone left20:39
→ crmne joined20:39
← crmne left20:40
→ crmne joined20:41
← ecuanaso left20:41
→ peepsalot joined20:41
→ endiruna joined20:42
← guideline left20:42
→ Masterphi joined20:42
→ raedah joined20:43
→ justanotheruser joined20:43
← palmtree left20:45
← watsonjar2 left20:45
→ LichtMacher joined20:46
← brwoods_ left20:47
← synthroid left20:47
← Phylock left20:51
raedah Is there a suggested alternative to github that has free private repos and good issue tracking?20:54
j416 raedah: bitbucket20:54
← kneeki left20:54
_ikke_ gitlab20:54
← Sonderblade left20:55
_ikke_ bitbucket is free up to 5 collaborators20:55
barteks2x https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/ how will this interact with history of some files in that directory being together with all the other files? (as i, it only recently became a separate directory)20:56
rafasc git daemon and a notepad :D20:57
← Cavallari left20:58
← Mattiaslndstrm left20:58
→ Anthaas_ joined20:58
→ Mattiasl_ joined20:58
rafasc barteks2x: the files outside the directory are not included in the commit.20:59
barteks2x which commit?20:59
rafasc any.21:00
barteks2x ... And I specically tried to ensure that git sees my file moves to ensure I keep history21:00
→ palmtree joined21:00
rafasc filterbranch will process each commit and will change the associated tree.21:00
← Anthaas left21:01
rafasc after filterbranch you won't have the same history.21:01
barteks2x how will it interact with giut blame then which seems to know about movign files21:01
← phluks left21:02
rafasc filterbranch doesn't keep history, the whole repo will look like that outer folder never existed.21:02
← csaba2 left21:02
barteks2x on one hand I would like to split my project into separate repositories after splitting it into modules,but I also don't want to lose years of commit history21:03
← manuelschneid3r left21:03
rafasc you could use git subtrees21:03
barteks2x how does that work?21:04
rafasc !subtree21:04
gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.21:04
hmoreno1 → morenoh14921:04
barteks2x doesn't seem relevant for doing the opposite21:04
← crmne left21:04
barteks2x unless I'm missing something21:04
→ crmne joined21:04
→ johnnyb joined21:05
rafasc it can be done with git subtree. subtree has mechanisms for importing and exporting.21:06
!git-subtree21:06
gitinfo git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt for more info.21:06
← madewokherd left21:06
→ paultreny joined21:06
→ weijin joined21:07
rafasc barteks2x: ^21:07
paultreny → Guest866421:07
barteks2x from the description that looks like exactly the kind of magic I would need21:08
→ Karyon_ joined21:08
← minionofgozer left21:09
rafasc barteks2x: are these sub-projects meant to be included in other git repos?21:09
← nanga left21:09
→ minionofgozer joined21:10
→ nanga joined21:10
← nanga left21:10
→ nanga joined21:10
← chaosruler_ left21:10
barteks2x not really, unless someone is masochistic enough to deal with gradle and trying to hack into the internals of my project and at the same time make a modified version of it. But I use version numbers based on output of git describe, and separating them would make it possible to have the version numbers actually independent21:11
← Fysicus left21:11
← weijin left21:11
rafasc what I am trying to ask is, will you need to re-import this repo into your folder as a git submodule? or something similar?21:11
barteks2x I probably could make it so I won't need to but that would be another few hours of fighting with gradle21:12
→ jungsubk joined21:12
→ Karyon joined21:13
← justanotheruser left21:13
→ justanotheruser joined21:13
barteks2x so what if I need to, and what if I don't?21:13
← minionofgozer left21:14
→ minionofgozer joined21:14
→ xaxxon joined21:15
rafasc both options have pros and cons. Filterbranch strips everything that doesn't touch the directory you specified.21:15
← nul left21:15
→ linuxmodder joined21:15
rafasc but the result is a different repo all together.21:15
→ weijin joined21:16
← Karyon_ left21:16
rafasc subtrees are slow for big histories.21:16
barteks2x is ~1200 commits big?21:17
rafasc there's an option --rejoin that will speed things a bit, but it will also create duplicate commits. (its a trade-off)21:17
← palmtree left21:17
← rodarmor left21:18
→ rodarmor joined21:18
← torshido left21:18
→ torshido joined21:18
barteks2x unless it takes days, I can deal with that one time waiting. I also still have a bit fuzzy idea about what it will actually look like at the end. I guess the only way to know is to try21:19
← weijin left21:20
← mattcen left21:23
→ jstimm joined21:23
rafasc i think you need to think ahead and figure out how are you going to use this "exported repo" in the future.21:23
barteks2x In the future when things stabilize a bit (as in, my "API" is version 1.x and isn't changed almost every day)21:24
I would like to have them as separate repositories21:24
rafasc and based on that choice, choose between subtrees/submodules/external dependency managment21:25
→ mattcen joined21:27
barteks2x how exactly is subtree that isn't actually a separate repository anywhere different from everything being together in one normal repsository?21:28
← Guest21 left21:29
barteks2x I think I will just keep everything in one repository for now21:30
far less issues to worry about21:30
← sat-aton__ left21:31
← jungsubk left21:33
← hbautista left21:34
→ hbautista joined21:34
← johnnyb left21:35
→ invisbl joined21:36
→ jnewt joined21:37
→ weijin joined21:37
← jnewt left21:38
→ bwn joined21:41
← weijin left21:42
← Mattiasl_ left21:43
← paxri01 left21:43
→ Mattiaslndstrm joined21:44
→ [Brain] joined21:44
← crmne left21:45
← beerdrop left21:46
→ crmne joined21:46
→ weijin joined21:50
→ weaksauce joined21:50
← kgrimes left21:51
→ felixsanz joined21:51
weaksauce i am having a problem with line endings getting changed in ways that break things21:51
any way to reset git to defaults?21:52
← FrostCandy left21:52
weaksauce maybe not full defaults but resetting anything dealing with line endings?21:52
← d10n-work left21:53
→ chaosruler joined21:54
→ Sound joined21:54
← weijin left21:54
→ Fysicus joined21:54
← Fysicus left21:56
→ Fysicus joined21:56
→ kgrimes joined21:57
← invisbl left21:59
→ invisbl joined22:00
→ beerdrop joined22:01
→ kneeki joined22:01
← jready left22:04
← kgrimes left22:04
→ palmtree joined22:04
DelTree bonjo3122:05
oops...22:05
→ jready joined22:05
← Dougie187 left22:05
tang^ scratch that password22:05
_ikke_ What password, I only see ******22:06
← morenoh149 left22:06
← Karyon left22:06
rafasc _ikke_: number of * doesn't match. :(22:08
tang^ it's one of those readers that randomizes the actual number of characters in the password22:09
rafasc oh we have the advanced version I see.22:09
← jready left22:09
← Thominus left22:10
→ Thominus joined22:11
← palmtree left22:11
→ kgrimes joined22:11
← drodger left22:12
rafasc barteks2x: not that different. The subtree tool just allows you to import and export with reproducible results.22:14
← \void left22:14
→ ferdna joined22:14
→ star_prone joined22:15
← kgrimes left22:16
→ nowhere_man joined22:18
→ weijin joined22:18
← stutter_ left22:18
← weaksauce left22:18
→ drodger joined22:18
→ xaxxon_ joined22:18
← xaxxon left22:19
← star_prone left22:19
xaxxon_ → xaxxon22:19
→ invisbl_ joined22:19
→ madewokherd joined22:20
← doug16k left22:21
→ kn-928 joined22:22
← nowhereman_ left22:22
← Coop left22:22
→ shinnya joined22:22
← invisbl left22:23
← weijin left22:23
→ supernov1h joined22:25
→ joeyy joined22:26
→ nullspoon joined22:27
← sammyg left22:27
→ FrostCandy joined22:27
→ Karyon joined22:27
← dege left22:28
← supernov1h left22:30
← greggerz left22:30
→ kerrick joined22:31
← Fernando-Basso left22:31
kerrick How do I run a specific file through a sed command before staging it? I think I want to use a clean filter in my .gitattributes, but I'm not sure what the correct syntax is.22:31
Specifically, I have path/to/my/file clean=sed 's/foo/bar/', but I get the error 's/foo/bar/' is not a valid attribute name: .gitattributes:122:32
wait, do I need to define my sed command as a filter first with `git config filter.my_command.clean`?22:33
← chaosruler left22:35
kerrick I figured it out, I was misreading the docs22:35
New question: how can I check in a clean filter?22:36
→ jready joined22:36
← averell left22:37
← kn-928 left22:40
→ kn-928 joined22:40
← g00s left22:41
← jready left22:41
→ guideline joined22:41
→ averell joined22:42
→ supernov1h joined22:42
rafasc kerrick: you'll need to instruct people how to do it.22:42
kerrick :/22:43
rafasc git doesn't allow automatic edit of configuration for security reasons.22:43
← peepsalot left22:43
← beerdrop left22:43
rafasc imagine if your usptream could alias git log to rm -rf / ;22:44
→ watsonjar joined22:44
rafasc git pull, nice, somecommits... let's see what they did.. git log and you're done..22:45
→ Coop joined22:45
→ wreed joined22:45
rafasc you can include it on something like a makefile if your project has one.22:45
→ RougeR joined22:46
→ orbyt_ joined22:46
← Gurkenglas left22:46
→ weijin joined22:47
→ doug16k joined22:47
← wootehfoot left22:47
→ morenoh149 joined22:47
← weijin left22:51
← Karyon left22:51
→ weijin joined22:52
← fahadash left22:52
← thxffo left22:52
kerrick OK, thanks for the tips22:53
← nullspoon left22:53
← hunterlabs left22:53
→ Raed|Laptop joined22:53
→ durham joined22:54
→ peepsalot joined22:57
← weijin left22:57
→ Es0teric_ joined22:58
→ beerdrop joined22:58
← blunaxela left22:59
← dalias left23:00
← SwiftMatt left23:01
→ blunaxela joined23:01
← drodger left23:02
→ Fissure joined23:02
→ hunterlabs joined23:02
→ thxffo joined23:03
← finalbeta left23:04
← FrostCandy left23:05
→ drodger joined23:07
← _ikke_ left23:09
→ sourcream joined23:10
→ _ikke_ joined23:13
← hbautista left23:14
→ hbautista joined23:15
← Singmyr left23:18
← Neo left23:19
→ alhariel joined23:22
→ kgrimes joined23:23
→ devbaka joined23:24
→ duderonomy joined23:26
← devbaka left23:26
→ venmx joined23:26
← _ikke_ left23:26
← Tobbi left23:28
→ kuka joined23:28
→ Karyon joined23:30
← sourcream left23:31
← kuka left23:33
→ weijin joined23:34
← uptime left23:35
← kent\n left23:35
→ kent\n joined23:36
→ MacWinner joined23:37
→ Kaisyu joined23:37
→ uptime joined23:38
← xaxxon left23:38
→ _ikke_ joined23:39
← hooksie1 left23:41
madduck how do I ask Git "is <commitish1> a parent of <committish2>" such that the result is false if the two are the same?23:42
ah git-related23:43
← Masterphi left23:43
madduck uh, no. that doesn't exist of course23:43
git merge-base --is-ancestor unfortunately thinks c1 is an ancestor of c2 if the two are the same23:45
bremner can't you just pass them both to rev-parse and check for string equality?23:46
(as well as some merge-base thing)23:46
madduck yeah, two checks23:46
← venmx left23:46
madduck i'd of course prefer if "is-ancestor" did the right thing23:46
bremner watch out for tag dereferencing if you go that wa23:46
madduck or are you an ancestor of yourself? ;)23:46
← crmne left23:47
→ crmne joined23:48
← weijin left23:48
← m0viefreak left23:49
← tymczenko left23:49
← duderonomy left23:49
→ dave0x6d joined23:50
→ Lyqyd joined23:51
→ Gurkenglas joined23:52
→ weijin joined23:55
← ferdna left23:56
← Sound left23:57
→ palmtree joined23:58
← orbyt_ left23:59
→ xaxxon joined23:59

Logs Search ←Prev date Next date→ Channels Documentation