IRCloggy #git 2018-05-18

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-05-18

← jdogherman left00:01
← jimmyrcom_ left00:03
→ energizer joined00:04
→ _ikke_ joined00:04
← NEOalquimista left00:04
→ jdogherman joined00:05
← nowhere_man left00:05
→ nowhere_man joined00:06
← Narrat left00:08
← Powielony left00:14
← dreiss left00:16
→ Powielony joined00:17
← Powielony left00:17
→ Powielony joined00:17
← Powielony left00:17
← akushner left00:17
→ Powielony joined00:17
→ akushner joined00:18
← lafleurdubien left00:20
← Powielony left00:21
← regedit left00:22
→ andyhuzhill joined00:22
← akushner left00:23
← mattcen left00:26
→ dendazen joined00:26
nedbat masterasia: pushing a new commit won't remove the old commit.00:27
masterasia: a git repo is a tree (really a graph) of commits. You created a new line of commits, but that doesn't remove the old ones00:28
→ mattcen joined00:29
→ pity joined00:31
→ BallChang-CN joined00:32
← xaxxon left00:32
← beefjoe left00:34
→ beefjoe joined00:35
→ xaxxon joined00:35
→ durham_ joined00:36
← nitric_ left00:37
→ Have-Quick joined00:37
← cagomez left00:39
masterasia nedbat, I force pushed over the old commit00:39
→ thiago joined00:39
nedbat masterasia: that doesn't matter.00:39
masterasia: it just means you now have two commits, both with the same parent commit.00:39
masterasia how would I retrieve the old commit then?00:39
nedbat masterasia: if you knew the hash, you could get it.00:39
→ ToBeFree joined00:39
← ToBeFree left00:39
→ ToBeFree joined00:39
nedbat masterasia: or if there is a branch (like that pull request) that refers to it00:40
→ cagomez joined00:40
→ rosco_y joined00:40
gitinfo set mode: +v00:40
masterasia oh so once something is pushed00:40
it is up there forever?00:40
← thiago left00:40
nedbat masterasia: if nothing refers to it, it will eventually be garbage-collected.00:40
← durham left00:40
masterasia ah00:40
so what I have to do is delete the PR?(but the PR isn't a git construct)00:40
← ToBeFree left00:41
← durham_ left00:41
→ doubtful joined00:42
← strugee left00:42
→ noobineer joined00:43
← noobineer left00:43
← dviola left00:44
→ jameser joined00:44
← cagomez left00:44
nedbat masterasia: deleting the PR and the branch will help, i don't know if it will be enough00:44
masterasia: why do you need to get rid of the commit?00:45
→ goweol1 joined00:45
masterasia I used a racial slur in a console.log so I could grep for it in my terminal00:45
A code-review caught it00:45
:|00:45
I forgot to remove it00:45
→ cagomez joined00:46
nedbat masterasia: ok, well, it's not in the code any more.00:46
← ryantrinkle left00:47
← kfoonamalik left00:47
← goweol left00:47
→ ryantrinkle joined00:47
→ shinnya joined00:49
← drbean left00:50
← cagomez left00:51
→ thiago joined00:51
→ strugee joined00:53
← _ADN_ left00:53
← noteness_ left00:56
→ noteness joined00:56
→ igemnace joined00:56
← CodeSlingerPaul left00:58
→ dreiss joined01:00
← hesco left01:00
← Sasazuka left01:07
← kneeki|aa left01:07
← doubtful left01:08
→ noobineer joined01:10
← bork left01:10
→ RobertLM78 joined01:11
→ bork joined01:12
→ doubtful joined01:12
← dansan_ left01:12
→ dviola joined01:12
→ dansan joined01:14
← abe left01:14
← noobineer left01:14
→ finalbeta joined01:15
← goweol1 left01:16
← doubtful left01:17
→ goweol joined01:19
→ bdonnahue joined01:19
→ crimson_king joined01:23
→ doubtful joined01:23
→ orbyt_ joined01:24
← masterasia left01:24
← RobertLM78 left01:25
← orbyt_ left01:28
← sentriz left01:28
← sanscoeur left01:29
→ sentriz joined01:30
michael2 is there a way to view what a `git cherry-pick' would do before running the command? i.e. how can I diff between HeAD and the commit I am "cherry picking" ?01:33
← jready left01:34
michael2 ah, `git cherry-pick --no-commit' seems to work01:35
actually, it loses the commit message. so it would be better to have a command which just shows the diff - if possible01:36
← doubtful left01:37
← navy_seal9614 left01:38
→ doubtful joined01:39
← robattila256 left01:40
→ navy_seal9614 joined01:41
← pity left01:43
← doubtful left01:45
← ilbot3 left01:45
← nowhere_man left01:47
→ nowhere_man joined01:47
← Gurkenglas left01:51
← hph^ left01:51
→ _antares_ joined01:52
← thiago left01:53
→ physikoi joined01:55
← _antares_ left01:57
→ ilbot3 joined01:57
← nowhere_man left01:58
→ ToBeFree joined02:00
→ pity joined02:00
← ToBeFree left02:00
→ _antares_ joined02:02
← mlopezviedma left02:06
→ mlopezviedma joined02:06
← physikoi left02:06
← leah2 left02:07
← atrus left02:07
Eugene michael2 - that would be `git show` for the commit you're trying to cherry-pick02:08
→ physikoi joined02:08
→ leah2 joined02:08
← crimson_king left02:10
→ crimson_king joined02:10
→ orbyt_ joined02:12
← crtcji left02:14
→ atrus joined02:16
→ houami joined02:20
← navy_seal9614 left02:20
← widp left02:20
← ryantrinkle left02:21
← inovas left02:24
← physikoi left02:26
→ inovas joined02:29
→ Es0teric joined02:29
← lagothrix left02:31
→ drbean joined02:32
← goweol left02:33
← Hello71 left02:35
→ ArcaTech joined02:35
← RougeT430 left02:35
→ physikoi joined02:35
← xaxxon left02:36
→ lagothrix joined02:36
→ xaxxon joined02:37
← Es0teric left02:38
→ Hello71 joined02:39
← dreiss left02:40
→ mizu_no_oto joined02:41
→ goweol joined02:43
← mizu_no_oto left02:43
← mel00010 left02:43
← amirpro left02:44
→ mel00010 joined02:44
→ robattila256 joined02:45
rosco_y Here is a visual of my branch history: https://pasteboard.co/HlGsE8D.png . I'm currently in "genericLists" and everything is working great. I'd like to merge genericLists into exploratory and delete all branches after exploratory. Would this be safe?02:49
← _antares_ left02:52
rosco_y I think I should a) "git checkout exploratory" b) "git merge genericLists" and c) "git delete validateRowsAndColumns", "git delete detached-Head", "git branch -d ValidationLists" and finally "git branch -d genericLists" Does this sound about right?02:52
(I guess "git delete branch" would fail) :)02:53
← ArcaTech left02:53
rosco_y I have a sneaking suspicion that since everything is working really great, I'm about to do something really stupid and lose everything.02:54
→ Arcaelyx joined02:54
← metts left02:55
rosco_y oh well, I suppose I can copy the entire project directories somewhere, and then experiment.02:56
It's getting late here--maybe I should just go to bed and see what it looks like in the morning.02:56
yeah, I think that sounds safest.02:56
→ duderonomy joined02:56
← rosco_y left02:56
→ pnepe6 joined02:57
→ govg joined02:58
→ dreiss joined03:01
→ _antares_ joined03:02
← _antares_ left03:03
→ _antares_ joined03:05
← boombatower left03:06
← ustekne left03:08
→ mda1 joined03:10
← ewitz left03:10
→ ArcaTech joined03:11
→ ewitz joined03:11
← beefjoe left03:11
← _antares_ left03:17
→ Goplat joined03:18
→ olivegrt joined03:18
→ YuGiOhJCJ joined03:21
→ destiny_ joined03:21
← dviola left03:25
← dreiss left03:25
← fr33domlover left03:36
← olivegrt left03:39
→ dreiss joined03:43
← gordonfish left03:47
→ _antares_ joined03:52
→ gordonfish joined03:54
← houami left03:58
← drodger left03:58
← ArcaTech left03:59
→ ryantrinkle joined04:00
→ ArcaTech joined04:00
→ Darcidride__ joined04:00
← Darcidride left04:02
→ drodger joined04:04
← raymond left04:05
→ raymond joined04:11
→ JonnyAt joined04:11
→ houami joined04:12
← raymond left04:13
← andyhuzhill left04:17
← shinnya left04:17
→ andyhuzhill joined04:17
rofl__ → jcarpenter204:18
← JonnyAt left04:18
→ JonnyAt joined04:24
← physikoi left04:27
← mel00010 left04:31
→ mel00010 joined04:33
← orbyt_ left04:33
← wgrant left04:34
→ freimatz joined04:44
→ ruslangaripov joined04:46
← crimson_king left04:47
→ crtcji joined04:48
→ Alystair joined04:50
→ jready joined04:50
→ czart__ joined04:50
← czart_ left04:54
← jready left04:54
← om-henners left04:56
→ thiago joined04:56
← foul_owl left04:59
← jsrtr left05:00
← bdonnahue left05:00
→ foul_owl joined05:01
→ jsrtr joined05:01
→ skisela joined05:02
← dustinm left05:04
← dreiss left05:05
→ rchavik joined05:06
→ om_henners joined05:06
→ muelleme joined05:08
→ venmx joined05:09
← duderonomy left05:09
← jimmyrcom left05:09
← xaxxon left05:09
← houami left05:10
← stoopkid left05:14
→ dustinm joined05:14
← _antares_ left05:18
→ duderonomy joined05:18
→ howdoi joined05:20
→ ti2 joined05:22
→ houami joined05:22
← venmx left05:22
← dendazen left05:22
← englishm_work left05:23
→ Tobbi joined05:23
← houami left05:23
→ _antares_ joined05:27
→ venmx joined05:28
→ wgrant joined05:29
← exotime left05:30
→ exotime joined05:30
← mooasaurus left05:31
→ wandering_vagran joined05:31
→ UTAN_dev_ joined05:32
← TikityTik2 left05:33
→ sauvin joined05:33
← UTAN_dev left05:35
← _antares_ left05:35
← ArcaTech left05:37
→ vdv joined05:37
→ _antares_ joined05:37
→ TikityTik joined05:38
→ Raging_Hog joined05:45
← crtcji left05:50
→ ronskisika joined05:51
→ mikemcowie joined05:52
← thiago left05:54
← venmx left05:54
→ thiago joined05:54
← Raging_Hog left05:55
← jokajak left05:55
← jameser left05:55
← YuGiOhJCJ left05:57
→ YuGiOhJCJ joined05:57
← freimatz left05:59
← g00s left06:07
→ g00s_ joined06:07
→ subhojit777 joined06:10
← muelleme left06:12
→ MACscr|lappy joined06:14
→ houami joined06:14
← MACscr|lappy left06:15
→ MACscr|lappy joined06:15
g00s_ → g00s06:18
← MACscr|lappy left06:19
← houami left06:23
← keep_learning left06:23
← drodger left06:24
→ drodger joined06:26
→ ArcaTech joined06:29
→ dege joined06:31
← Have-Quick left06:32
→ MACscr|lappy joined06:33
← drodger left06:36
→ drodger joined06:37
→ oscarcp joined06:38
→ muelleme joined06:38
← oscarcp left06:38
→ Gurkenglas joined06:38
← inovas left06:38
→ Masplus joined06:39
→ tvw joined06:40
← MACscr|lappy left06:42
← Masplus left06:42
← drodger left06:43
→ Masplus joined06:43
→ inovas joined06:44
← duderonomy left06:45
→ duderono_ joined06:45
→ drodger joined06:45
→ chele joined06:48
← muelleme left06:51
→ T_UNIX joined06:52
← ArcaTech left06:53
← wizardedit left06:53
→ wizardedit joined06:55
← wizardedit left06:55
→ wizardedit joined06:55
grawity !a06:56
→ dreiss joined06:57
← ndevgeek left06:59
→ KeyJoo joined07:00
→ abba joined07:01
← gordonfish left07:03
→ schleppel joined07:04
← _antares_ left07:04
← Alystair left07:10
→ theoceaniscool joined07:10
← Soni left07:11
→ Soni joined07:12
← energizer left07:12
← subhojit777 left07:12
← dreiss left07:12
→ Ishtv4n joined07:12
← YuGiOhJCJ left07:12
← dansan left07:13
→ ferdna joined07:13
→ dansan joined07:14
← goweol left07:14
→ Raging_Hog joined07:16
quite_ → quite07:16
← Ishtv4n left07:17
→ venmx joined07:17
← w0ng left07:18
→ TomyWork joined07:18
→ Ishtv4n joined07:18
→ w0ng joined07:18
← ronskisika left07:18
← Eryn_1983_FL left07:20
→ oxymoron93 joined07:21
→ Eryn_1983_FL joined07:22
← Raging_Hog left07:22
→ Raging_Hog joined07:23
← JonnyAt left07:23
→ _antares_ joined07:26
→ JonnyAt joined07:26
→ Karyon joined07:27
→ Tobbi_ joined07:28
← thiago left07:28
→ cur8or joined07:30
← _antares_ left07:31
→ rfuentess joined07:32
← KeyJoo left07:34
← sarri left07:36
→ widp joined07:37
→ sarri joined07:38
← sarri left07:38
→ sarri joined07:38
→ Karyon_ joined07:38
→ tvale joined07:38
← ryantrinkle left07:41
← Karyon left07:41
→ _antares_ joined07:41
← _antares_ left07:46
← kyan left07:49
_ikke_ → kdaudt07:49
kdaudt → _ikke_07:49
← venmx left07:50
→ Xiti` joined07:53
← Raging_Hog left07:54
→ mikecmpbll joined07:54
← ferdna left07:54
← widp left07:55
→ dmone joined07:56
← Xiti left07:57
→ Raging_Hog joined07:58
→ kurkale6ka joined07:58
← mikecmpbll left07:59
← Gurkenglas left07:59
→ houami joined08:00
→ nikheizen joined08:01
→ Exagone313 joined08:01
← andyhuzhill left08:03
← howdoi left08:03
→ venmx joined08:04
→ mikecmpbll joined08:06
← JonnyAt left08:08
→ widp joined08:09
← houami left08:10
→ minionofgozer_ joined08:11
← minionofgozer left08:12
→ Naq joined08:13
→ zish joined08:13
→ andyhuzhill joined08:13
← Naq left08:13
gitinfo set mode: +v08:14
→ goweol joined08:15
→ JeroenT joined08:15
← ruslangaripov left08:15
← andyhuzhill left08:17
→ andyhuzhill joined08:17
zish Hey there! I want to automatically build a specific version of QT but I have issues with the submodules. According to https://wiki.qt.io/Building_Qt_5_from_Git one has to clone the repository; do a checkout of the specific version; do a submodule update.08:17
This works if the repository is freshly cloned - but if i jump to e.g. version 5.9 and then to 5.8 my working directory is dirty08:18
→ bahamut24 joined08:18
→ PioneerAxon joined08:18
← PioneerAxon_ left08:20
tobiasvl zish: I haven't read the entire article, but I assume you need to do this: https://wiki.qt.io/Building_Qt_5_from_Git#Cleaning08:21
← g00s left08:21
→ dbedrenko joined08:22
zish tobiasvl: I tried that but git status still reports: modified: qtdeclarative (untracked content)08:23
dbedrenko Good morning. Did something change in git recently? `git stash list` doesn't show git IDs anymore so I can't apply/drop stashes easily. It shows me instead: "stash@{Wed May 16 10:58:23 2018}: WIP on update-prof-pw: 7229ee4 TMP fix "08:23
← flavius left08:23
zish When executing the clean command it actually states that it is skipping certain repositories08:23
But don't know why08:23
→ zulutango joined08:26
← theoceaniscool left08:28
→ _antares_ joined08:30
→ g00s joined08:31
→ riemann joined08:34
← _antares_ left08:35
← LiftLeft left08:36
→ _antares_ joined08:36
← dpyro left08:38
← JeroenT left08:40
→ LiftLeft joined08:40
← sauvin left08:41
→ sauvin joined08:41
← sauvin left08:43
→ sauvin joined08:43
heftig meh, I wish git rebase -i -p would create a list that includes parent information (as relative line numbers), so that reordering isn't so fragile08:43
← sauvin left08:43
← Goplat left08:44
← venmx left08:44
→ sauvin joined08:44
← sauvin left08:45
→ sauvin joined08:46
← sauvin left08:46
→ DocRedfish joined08:46
→ ArcaTech joined08:47
← kbaegis left08:47
← ArcaTech left08:48
→ _ADN_ joined08:49
← Karyon_ left08:53
→ cdown_ joined08:55
→ Neo4 joined08:56
← cdown left08:58
cdown_ → cdown08:58
← BallChang-CN left09:00
osse heftig: You can define yourself how the lines should look within rebase.instructionFormat. Maybe that can help09:05
← goweol left09:06
→ Karyon_ joined09:07
← freimatz_ left09:13
→ Karyon joined09:13
→ nowhere_man joined09:14
← Karyon_ left09:17
← neunon left09:17
← hunterlabs left09:18
heftig osse: that can only change the look and not the semantics, though09:19
← _ADN_ left09:20
← Karyon left09:22
→ mikecmpb_ joined09:22
heftig I mean that the rebase lines actually contain parent information, e.g. "pick 1 3 | 1234567 message" would mean to use the HEAD from one and three rebase steps earlier as the parents of that commit, creating a merge09:22
← mikecmpbll left09:23
→ Karyon joined09:24
← catsup left09:25
→ catsup joined09:25
← catsup left09:26
→ catsup joined09:26
→ Schrostfutz joined09:27
→ ojdo joined09:27
← rchavik left09:28
→ hunterlabs joined09:29
→ theoceaniscool joined09:30
← wandering_vagran left09:30
← Tobbi_ left09:31
→ KeyJoo joined09:31
← andyhuzhill left09:34
→ leeN joined09:36
← beerdrop left09:37
→ JonnyAt joined09:39
→ smallville7123 joined09:41
← Xarodon left09:41
← JonnyAt left09:44
→ wandering_vagran joined09:45
← wandering_vagran left09:46
→ wandering_vagran joined09:47
← tvale left09:48
← wandering_vagran left09:49
→ houami joined09:49
→ kilobyte joined09:52
→ BallChang-CN joined09:52
← jungsubk left09:52
← houami left09:54
→ beerdrop joined09:54
kilobyte hi! If a file's mtime but not contents changes, most plumbing thinks the tree is dirty, most porcelain considers it clean (and marks clean for subsequent low-level queries). Where may I RTFM about the mechanism involved?09:54
and also how do I trigger the check to mark the tree clean (if it's indeed clean...)?09:55
← nikheizen left09:55
← dcpc007 left09:57
→ pfleck joined09:59
← lankanmon left10:01
→ tvale joined10:02
← ojdo left10:02
→ ojdo joined10:03
fuchstronaut How do I add a (sub-folder) .gitignore file to my repo?10:05
it does not show up using git status10:05
← _antares_ left10:06
← Karyon left10:06
kilobyte fuchstronaut: perhaps it matches one of your current ignore rules? Even if it does, you can still add it manually.10:06
j416 fuchstronaut: you can use man git-check-ignore to see why something is ignored.10:09
gitinfo fuchstronaut: the git-check-ignore manpage is available at https://gitirc.eu/git-check-ignore.html10:09
j416 fuchstronaut: perhaps that helps.10:09
what's a clean and simple way to determine whether or not the work tree is clean? I think i want "git status --porcelain" but it'd be nice to have an exit code rather than printed output. Is there a good way?10:12
(in a script, this is)10:12
← pity left10:12
← Kaisyu left10:12
fuchstronaut thanks kilobyte, j41610:13
j416 o/10:13
→ MarioBranco joined10:14
→ crimson_king joined10:14
→ Amadiro joined10:16
→ _antares_ joined10:16
fuchstronaut Uhm... what is the ~/.gitignore_global file ?10:18
Looks like i am globally ignoring .gitignore files10:18
← naoey left10:19
→ Nizumzen joined10:19
→ dcpc007 joined10:21
← _antares_ left10:21
← skisela left10:22
← chris349 left10:27
← mikecmpb_ left10:28
canton7 fuchstronaut, I don't think that's a standard file, but you might have it set as core.excludesFile in your global git config?10:29
→ mikecmpbll joined10:30
← widp left10:31
← g00s left10:44
← igemnace left10:44
← crimson_king left10:47
→ widp joined10:49
← pfleck left10:53
← inovas left10:54
← gunnarx left10:55
← nowhere_man left10:56
→ mofai joined10:56
← Schrostfutz left10:58
← plexigras left10:58
→ linuxmodder joined10:59
← linuxmodder left11:00
← Neo4 left11:01
→ linuxmodder joined11:01
→ Neo4 joined11:01
→ mikecmpb_ joined11:02
→ lankanmon joined11:02
→ inovas joined11:02
← linuxmodder left11:02
→ linuxmodder joined11:02
← mikecmpbll left11:02
→ _antares_ joined11:03
→ pity joined11:04
← Neo4 left11:05
→ Neo4 joined11:05
→ jlebrech joined11:06
→ floppydh joined11:08
→ Fernando-Basso joined11:08
→ RougeR joined11:09
← RougeR left11:09
→ RougeR joined11:09
→ crtcji joined11:10
→ plexigras joined11:11
→ CheckDavid joined11:15
← a3Dman left11:16
← _antares_ left11:17
→ rafasc joined11:20
→ _antares_ joined11:20
→ pfleck joined11:23
← robattila256 left11:23
← smallville7123 left11:26
→ nowhere_man joined11:27
→ a3Dman joined11:30
← pity left11:32
← widp left11:32
→ dendazen joined11:32
→ sword_smith joined11:34
→ naoey joined11:34
← sword_smith left11:35
→ tcorneli joined11:35
← beerdrop left11:36
→ Regon joined11:39
→ orbitex joined11:39
← tvale left11:40
→ tvale joined11:40
← tvale left11:41
→ Cavallari joined11:42
zish Also posted my question on stackoverflow - if anyone has an idea how to solve this: https://stackoverflow.com/questions/50407382/automating-qt-build-submodule-issue-can-not-get-a-clean-working-directory11:44
→ tvale joined11:45
← kurkale6ka left11:46
rafasc zish: have you tried it without --init?11:48
← Darcidride__ left11:48
← Cthalupa left11:48
zish rafasc: not yet but will try now. takes some time because qt is quite large11:49
→ Cthalupa joined11:50
zish rafasc: Skipping submodule '../../../../qtdeclarative/' => repository is still dirty11:50
→ RougeT430 joined11:51
→ Gurkenglas joined11:51
← ojdo left11:51
→ brontosaurusrex joined11:52
rafasc zish: reading the man page, maybe update --checkout --force;11:53
→ rouget430__ joined11:53
→ rnsanchez joined11:53
← RougeR left11:53
rafasc or hang there a bit longer and someone more experienced with submodules will get to you.11:54
→ synthroid joined11:54
← Masplus left11:54
→ beerdrop joined11:54
→ charolastra joined11:55
→ JeroenT joined11:55
zish rafasc: force on checkout doesn't change anything. the skipping happens only when doing submodule update but i tried to do force on update too - which also didnt work. i am trying to fix this till two days :/11:56
→ kbaegis joined11:56
→ gunnarx joined11:56
← gunnarx left11:56
→ gunnarx joined11:56
← JeroenT left11:56
← kbaegis left11:56
zish but lets see11:56
→ kbaegis joined11:56
rafasc zish: $git submodule update --checkout --force;11:56
I meant that as a single command.11:56
← RougeT430 left11:57
→ ojdo joined11:58
zish rafasc: okay that's interesting. executing this there is no warning and it says "'qtdeclarative': checked out 'fffb997e192a72b4dcd66edc2fbad5473dd359f3'" but afterwards the directory is still dirty :/11:58
modified: qtdeclarative (untracked content)11:59
→ pity joined11:59
rafasc and you claim git clean is not working for you?12:00
zish rafasc: yes. executing git submodule foreach --recursive "git clean -dfx" results in an output which contains a line like "Skipping repository tests/auto/qml/ecmascripttests/test262"12:01
which seems to be the issue12:01
but i dont know why it is skipped12:02
rafasc pass -f twice.12:02
→ camsbury joined12:02
rafasc clean doesn't remove git repositories unless force is passed twice.12:02
zish rafasc: holy - you are my hero!12:03
it worked12:03
→ Karyon joined12:03
rafasc zish: my secret super power is reading the manpages :)12:04
zish rafasc: ok somehow i missed that12:04
but thanks!12:04
rafasc you're welcome :P glad I could help.12:04
zish: but now that you deleted the git repos, you probably need to --init --recursive them again.12:05
← Nizumzen left12:05
→ wandering_vagran joined12:06
zish rafasc: well i think i read that part of the man pages like a billion times but always skipped the last part :/12:06
rafasc I bet there's a better way to do it. Without having to keep deleting the repos.12:06
zish will check now what is the minimal command set to do a checkout between versions12:06
rafasc zish: git man pages are very detailed, it's hard to catch everything.12:07
← wandering_vagran left12:08
→ wandering_vagran joined12:08
zish rafasc: seems like - therefore its good if there is a friendly community around the tools, which seems to be the case :)12:09
→ Karyon_ joined12:09
→ Schrostfutz joined12:11
← nowhere_man left12:12
rafasc zish: reading the manpages a bit more..12:12
← Karyon left12:12
rafasc seems like submodule.<name>.update can be set to a custom command.12:12
→ CodeSlingerPaul joined12:13
rafasc maybe you can set it to a shell script that also cleans the submodule.12:13
← naoey left12:15
← dcpc007 left12:16
rafasc zish: ideally you need a solution that doesn't delete the git repos you already transferred.12:16
zish rafasc: the build automation is a set of commands anyway so it shouldn't be a problem to just do: clone; checkout; clean12:16
→ dcpc007 joined12:17
zish rafasc: yes but it doesn't look like git has a way to get a clean copy of the current state. in mercurial there is actually a command to export a repository to another directory (similar to git archive)12:17
https://www.mercurial-scm.org/repo/hg/help/archive12:18
← rouget430__ left12:18
→ RougeR joined12:18
← RougeR left12:18
→ RougeR joined12:18
→ kurkale6ka joined12:19
→ vdamewood joined12:20
← wandering_vagran left12:20
rafasc you can checkout to a different worktree path with something like: $git --work-tree=<path> checkout HEAD -- .12:21
or even make a new worktree, with git worktree add <...>12:22
that plays well when there's no submodules in the middle.12:22
→ kurkale61 joined12:22
← _antares_ left12:24
rafasc zish: do you know if "tests/auto/qml/ecmascripttests/test262" is a submodule, or just a rogue .git dir inside the repo?12:24
← kurkale6ka left12:24
zish rafasc: seems like a submodule of qtdeclarative https://github.com/qt/qtdeclarative/blob/5.11/.gitmodules12:26
← luca_penn_ left12:28
→ _antares_ joined12:30
← _antares_ left12:31
→ luke_penn joined12:31
← Neo4 left12:31
→ Nizumzen joined12:31
→ Neo4 joined12:32
→ luist joined12:32
→ mSSM joined12:32
→ stoopkid joined12:33
← synthroid left12:34
← rnsanchez left12:34
→ Darcidride joined12:35
→ shinnya joined12:35
rafasc zish: to be honest, what's confusing me here is that if you're passing --recursive, but the time he tries to clean the parent project, that should already be clean.12:35
so, not sure why it is complaining. Maybe a bug, maybe some configuration abuse...12:36
or most likely, just my ignorance. :)12:36
← zulutango left12:36
→ synthroid joined12:38
zish rafasc: i think it is because gitmodules no longer contains the entry so git no longer knows anything about the submodule -> therefore it just says that there is modified content no?12:39
seems to be more a conceptual issue with submodules12:40
→ _antares_ joined12:41
→ cagomez joined12:41
← mSSM left12:42
→ wandering_vagran joined12:42
→ nuxdie joined12:43
→ Cavallari1 joined12:43
← pfleck left12:44
← Cavallari left12:45
Cavallari1 → Cavallari12:45
rafasc yeah. And the submodule url is relative.. so you probably won't need to redownload, which was my main concern.12:45
← cagomez left12:45
zish rafasc: but i have to redownload if i do a clean?!12:46
rafasc zish: git clean doesn't delete directories that contains a .git directory.12:47
when you pass -f, you're telling git to delete them.12:48
pass -f twice*12:49
zish rafasc: yes but if you do not delete them you have a dirty directory which is not really what you want for a clean built12:49
← tcorneli left12:50
zish so right now i actually prefer to redownload some submodules if i switch between versions12:50
→ rnsanchez joined12:51
← _antares_ left12:54
rafasc zish: if that works for you great. I was just wondering if there was a better solution.12:54
← brontosaurusrex left12:56
→ zarzar joined12:57
← zarzar left12:57
← duderono_ left12:58
← pnepe6 left12:58
← pity left12:59
→ houami joined12:59
→ fission6 joined13:02
← robotroll left13:03
← houami left13:04
→ robotroll joined13:04
→ amirpro joined13:06
← gunnarx left13:06
→ marcelofr joined13:07
→ _antares_ joined13:08
← amirpro left13:08
→ amirpro joined13:09
← oxymoron93 left13:14
→ wouter01008 joined13:15
→ gunnarx joined13:16
← wouter0100 left13:16
← Eryn_1983_FL left13:16
← daurnimator left13:18
← Nizumzen left13:19
← amirpro left13:20
→ smallville7123 joined13:23
→ anjen joined13:23
→ PsychoBoB joined13:23
PsychoBoB Guys, How I can see the changes of specific commit ?13:24
← gunnarx left13:24
→ amirpro joined13:24
PsychoBoB I have the number of commit13:25
→ rsrx joined13:25
PsychoBoB I need see the diffs that commit13:25
Ratler git show <sha>13:25
← charolastra left13:26
→ cdown_ joined13:27
← anjen left13:28
← cdown left13:29
cdown_ → cdown13:29
← CheckDavid left13:31
→ jready joined13:34
← govg left13:34
→ govg joined13:36
→ pfleck joined13:37
→ Mike11 joined13:39
← orbitex left13:39
→ gunnarx joined13:39
← fission6 left13:41
→ Turandon joined13:41
→ physikoi joined13:42
← iamthad left13:42
Turandon greetings, i have a question related to my .gitignore. I have added the file cache.db from newsboat. from the point of view of my .gitignore it is in ./newsboat/cache.db. at the moment it is not ignored and consequently added to my changed files. any tips how to solve this?13:43
→ Es0teric joined13:43
Turandon i tried: newsboat/cache.db; ./newsboat/cache.db; cache.db13:44
← smallville7123 left13:44
dbedrenko Turandon: do you need to `git rm` too?13:44
→ fission6 joined13:47
← camsbury left13:47
← gunnarx left13:47
→ camsbury joined13:47
← wandering_vagran left13:48
← Fernando-Basso left13:48
→ iamthad joined13:51
← camsbury left13:52
← pfleck left13:53
→ penguinPerplexed joined13:53
← abba left13:54
→ wandering_vagran joined13:54
→ phluks joined13:54
→ dumyan joined13:55
← dumyan left13:55
← Schrostfutz left13:55
→ ryantrinkle joined13:56
→ kiero joined13:58
← cur8or left13:58
← riemann left13:58
→ stutter_ joined13:58
→ freimatz joined13:59
→ pfleck joined14:00
← rsrx left14:01
→ igemnace joined14:01
← pfleck left14:02
→ pfleck joined14:02
→ gunnarx joined14:03
→ Masplus joined14:04
← Raging_Hog left14:04
← Hello71 left14:04
rafasc Turandon: !ignore_tracked14:05
gitinfo Turandon: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.14:05
→ dimi1947 joined14:06
← Mike11 left14:06
dimi1947 How I can get config info...e-mail/name etc?14:06
← tomfarr left14:07
→ smallville7123 joined14:07
→ Mike11 joined14:07
← Mike11 left14:07
← gunnarx left14:08
← smallville7123 left14:09
→ bdonnahue joined14:09
→ greggerz joined14:10
← wandering_vagran left14:10
moritz dimi1947: git config user.name14:11
→ Dougie187 joined14:11
moritz and same for other config keys14:11
or git config --list # to get all of them14:11
dimi1947 thx14:11
→ Mike11 joined14:12
← Mike11 left14:12
← DocRedfish left14:13
← ryantrinkle left14:14
→ boombatower joined14:15
→ wandering_vagran joined14:15
← linuxmodder left14:15
← jready left14:15
→ fmgt joined14:15
→ Eryn_1983_FL joined14:16
→ Mike11 joined14:17
→ oxymoron93 joined14:17
← Mike11 left14:17
← tvale left14:19
→ jready joined14:20
← _antares_ left14:20
← raynold left14:21
→ Hello71 joined14:22
← rts-sander left14:23
← Guest67374 left14:24
→ rts-sander_2 joined14:24
→ _antares_ joined14:24
← rts-sander_2 left14:25
→ camsbury joined14:26
→ linuxmodder joined14:26
← camsbury left14:26
→ rts-sander joined14:26
← linuxmodder left14:27
→ camsbury joined14:27
→ linuxmodder joined14:27
← luist left14:27
→ relipse joined14:28
← camsbury left14:28
→ camsbury joined14:29
→ fr33domlover joined14:31
→ luist joined14:33
← alhariel left14:34
← Neo4 left14:34
→ crimson_king joined14:36
← zish left14:36
_ikke_ or git config --get-regexp user14:36
← freimatz left14:36
→ freimatz joined14:36
→ nurdie joined14:37
→ jamiejackson joined14:37
→ eh3 joined14:38
→ Sudrien joined14:42
→ jimmyrcom joined14:43
← crtcji left14:44
← floppydh left14:45
← _antares_ left14:46
gitinfo set mode: +v14:47
Sudrien So I've got this pair of commands14:47
git diff --find-copies-harder --find-renames=101% --name-only --diff-filter=ACMRT 'refs/tags/0.0.25' 'refs/tags/0.0.27'14:47
git diff --find-copies-harder --find-renames=101% --name-only --diff-filter=D 'refs/tags/0.0.25' 'refs/tags/0.0.27'14:47
The first should tell me what files changed & were created, the second should tell me what files were deleted14:47
NEITHER tells me the original filename of a content-unchanged rename14:48
← chele left14:48
Sudrien So how do I get the original filename of a rename14:49
→ durham joined14:50
← durham left14:50
→ durham joined14:50
→ csan joined14:53
← matthiaskrgr left14:55
← prg318 left14:58
← durham left14:59
→ prg318 joined14:59
→ pity joined14:59
← amirpro left15:00
→ amirpro joined15:00
← Cavallari left15:01
← fr33domlover left15:01
→ jimmyrcom_ joined15:02
← jimmyrcom_ left15:03
→ jimmyrcom_ joined15:03
→ Nizumzen joined15:05
Sudrien Nobody knows how to find the original path of a rename with git diff?15:05
← argoneus left15:06
← prg318 left15:07
→ troulouliou_div2 joined15:07
→ prg318 joined15:08
→ argoneus joined15:08
← pfleck left15:08
→ nowhere_man joined15:09
← luist left15:09
→ regedit joined15:12
← inovas left15:12
→ mizu_no__ joined15:13
← diogenese left15:14
→ Fernando-Basso joined15:14
← synthroid left15:14
→ IanLiu joined15:16
→ diogenese joined15:16
j416 Sudrien: did you try 'git diff --stat' ?15:16
→ inovas joined15:17
→ matthiaskrgr joined15:17
← csan left15:17
← kiero left15:18
matthiaskrgr → Guest1117815:18
→ NAAAN9T3 joined15:18
← amirpro left15:18
← Guest11178 left15:19
→ Guest11178 joined15:19
← Guest11178 left15:19
→ Guest11178 joined15:19
Sudrien j416: that doesn't make any difference to the file list I'm getting15:19
→ orbyt_ joined15:19
→ crose joined15:19
j416 alright.15:19
it shows renames here.15:19
Guest11178 → matthiaskrgr_15:19
→ berendir joined15:19
→ cagomez joined15:20
← berendir left15:21
→ thiago joined15:21
← IanLiu left15:23
Sudrien j416: My issue is not the formatting of the list, it's that there seems to be no way to git the file name BEFORE the rename. Only AFTER rename comes up, given the appropriate --diff-filter15:23
→ durham joined15:23
→ AndyBlue joined15:23
→ Schrostfutz joined15:23
← dimi1947 left15:23
→ dimi1947 joined15:24
← TSS_ left15:24
dimi1947 what git command tells me the default git editor15:25
→ amirpro joined15:25
← Karyon_ left15:25
→ TSS_ joined15:25
oxymoron93 search for "editor" in man git config, it is that easy15:26
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html15:26
← modin left15:27
← mizu_no__ left15:27
← penguinPerplexed left15:27
← amirpro left15:28
← durham left15:28
→ amirpro joined15:28
← plains left15:29
→ synthroid joined15:29
← AndyBlue left15:29
→ gordonfish joined15:30
← gordonfish left15:30
→ AndyBlue joined15:30
thiago dimi1947: git var GIT_EDITOR15:30
→ gordonfish joined15:30
← orbyt_ left15:31
→ modin joined15:32
← AndyBlue left15:32
→ AndyBlue joined15:33
→ tomfarr joined15:33
→ vdv_ joined15:34
← oxymoron93 left15:36
← AndyBlue left15:36
← cagomez left15:37
→ lordjancso joined15:37
← vdv left15:37
→ plains joined15:38
→ cagomez joined15:38
← albel727 left15:40
← modin left15:40
→ penguinPerplexed joined15:41
← thblt left15:43
← pity left15:44
→ albel727 joined15:44
← Es0teric left15:44
→ modin joined15:45
→ borkr joined15:46
→ d3r3k joined15:48
← borkr left15:50
← linuxmodder left15:50
→ pity joined15:50
→ duderonomy joined15:52
→ dreiss joined15:53
→ ocds joined15:54
dimi1947 I tried this command but it does not work:git --l GIT_EDITOR15:54
→ RougeT430 joined15:55
← ocds left15:56
→ rouget430__ joined15:57
← RougeR left15:58
← crimson_king left15:59
← thiago left15:59
← Schrostfutz left15:59
← lordjancso left16:00
← RougeT430 left16:01
← LiftLeft left16:01
→ Es0teric joined16:02
→ durham joined16:02
→ lordjancso joined16:02
dimi1947 I am using this command to see the default editor:git config core.editor but nothing shows up...what might be the cause of it?16:03
→ JonnyAt joined16:03
→ Neo4 joined16:03
← jlebrech left16:04
→ LiftLeft joined16:04
→ jstimm joined16:05
← mikecmpb_ left16:05
→ jesst_ joined16:05
← jesst_ left16:05
→ Karyon_ joined16:07
← Masplus left16:07
← crose left16:07
→ sanscoeur joined16:08
furrymcgee git config --unset core.editor16:08
→ MACscr|lappy joined16:10
→ crose joined16:10
→ King_Hual joined16:10
→ summi joined16:12
_ikke_ git var -l | grep -i editor16:12
gitinfo set mode: +v16:13
summi hello git gurus. Hope you're all doing well today.16:13
→ _antares_ joined16:13
_ikke_ I'm doing quite alright, thank you :-)16:14
summi I use a complex git subtree command but due to not using it frequently over the past month i'm unable to find it through my log history. I didn't document it too. How would I go on listing all my previously executed commands16:14
← rfuentess left16:14
summi Thank you! :)16:14
_ikke_ git itself does not keep track of it16:15
so you have to rely on you shell history16:15
history | grep subtree16:15
summi hmm, i've tried going back through git bash16:15
okay16:15
no luck16:15
it seemed to store only 500 some commands16:16
→ amirpro_ joined16:16
← amirpro_ left16:18
← lordjancso left16:18
→ amirpro_ joined16:18
← marcelofr left16:19
← MACscr|lappy left16:19
← theoceaniscool left16:19
summi either way, thanks for your quick response _ikke_16:19
← summi left16:20
← amirpro left16:20
amirpro_ → amirpro16:20
→ akushner joined16:21
→ borkr joined16:23
← amirpro left16:23
→ oxymoron93 joined16:25
→ ephemera_ joined16:26
← robotroll left16:27
→ orbyt_ joined16:27
→ luist joined16:27
← kurkale61 left16:28
→ linuxmodder joined16:28
← fission6 left16:28
← jamiejackson left16:29
← PioneerAxon left16:30
→ PioneerAxon joined16:30
→ pfleck joined16:31
→ amirpro joined16:31
→ ArcaTech joined16:33
← amirpro left16:33
→ amirpro joined16:33
← PioneerAxon left16:34
→ PioneerAxon joined16:35
← pfleck left16:35
← madewokherd left16:36
← PioneerAxon left16:37
→ PioneerAxon joined16:37
→ gareppa joined16:39
← stutter_ left16:39
← shinnya left16:39
→ jokajak joined16:40
→ applecrumble joined16:40
← guideX left16:41
→ kurkale61 joined16:42
← PioneerAxon left16:44
→ PioneerAxon joined16:44
← dmone left16:44
← dreiss left16:45
← PioneerAxon left16:46
→ PioneerAxon joined16:47
← MarioBranco left16:48
→ xaxxon joined16:49
← bahamut24 left16:50
← mel00010 left16:50
→ ferdna joined16:51
→ stutter_ joined16:51
DelTree how should I check in a script that a branch is merged into another ?16:51
← PioneerAxon left16:51
→ PioneerAxon joined16:52
← Nizumzen left16:52
← _antares_ left16:53
← nurdie left16:53
← cdown left16:53
→ nurdie joined16:54
→ _antares_ joined16:54
→ iNCoNFuN joined16:55
jokajak DelTree: did you try google? My initial thought would be to use git branch --contains <commit-id> where <commit-id> is some commit in the branch to merge16:55
← troulouliou_div2 left16:55
→ cdown joined16:55
→ theDiabolicalKid joined16:56
← kurkale61 left16:56
_ikke_ git merge-tree --is-ancestor16:56
→ Worldexe joined16:56
_ikke_ git merge-base --is-ancestor16:56
→ nitric joined16:57
← nowhere_man left16:57
← ArcaTech left16:57
→ fission6 joined16:58
← gareppa left16:58
← fission6 left16:59
← penguinPerplexed left16:59
→ muelleme joined17:00
← Karyon_ left17:02
DelTree jokajak: I thought git branch was not to be used in a script...17:02
rafasc jokajak: _ikke_ already posted the answer.17:03
← pity left17:03
← Dougie187 left17:04
DelTree oooh...17:04
← rouget430__ left17:05
rafasc you failed to google and read the chat. You need to grab some coffee. ;)17:05
DelTree quite possible...17:06
← duderonomy left17:07
DelTree and I need to understand what it actually does...17:08
oxymoron93 it returns exit code depending on result, so it is suitable for scripts17:08
→ fission6 joined17:09
→ crtcji joined17:12
DelTree what I fail to see for now is if there's a difference between git merge-base A B and git merge-base B A17:13
→ energizer joined17:13
← leeN left17:14
_ikke_ DelTree: git merge-base <upstream> <commit> checks if <upstream> is an ancestor of <commit>17:14
← mattcen left17:14
jokajak DelTree: there isn't. the --is-ancestor operation is what makes the difference from what I can see in the man page17:14
_ikke_ right, with --is-ancestor17:15
otherwise it will find the merge-base between two commits17:15
oxymoron93 merge-base does not make difference when reordering commit17:15
DelTree ok... a little script contexting it inside an if helps...17:15
oxymoron93 commits*17:15
_ikke_ but it does matter with --is-ancestor like jokajak said17:15
DelTree ok... I seem to get it...17:15
oxymoron93 yup17:16
jokajak DelTree: "Check if the first <commit> is an ancestor of the second <commit>, and exit with status 0 if true, or with status 1 if not. Errors are signaled by a non-zero status that is not 1."17:16
→ mattcen joined17:16
DelTree thanks... I can be slow to understand sometimes... ^_^17:17
jokajak DelTree: you can check the man-page to see how things work: https://git-scm.com/docs/git-merge-base17:17
← dimi1947 left17:18
→ penguinPerplexed joined17:20
← theDiabolicalKid left17:20
→ shinnya joined17:20
→ kneeki joined17:23
→ jnavila joined17:25
→ CheckDavid joined17:25
→ ArcaTech joined17:26
← jstimm left17:26
→ ivokh joined17:29
→ nd_ joined17:29
← nd left17:30
→ jungsubk joined17:32
← penguinPerplexed left17:32
→ freimatz3 joined17:32
← freimatz left17:35
→ Sonderblade joined17:36
← amirpro left17:38
→ amirpro joined17:41
→ venmx joined17:41
← Arcaelyx left17:41
← T_UNIX left17:42
→ wootehfoot joined17:42
→ csan joined17:42
← csan left17:43
→ csan joined17:43
← csan left17:44
← linuxmodder left17:45
→ Nizumzen joined17:45
→ csan joined17:45
→ Naq joined17:45
← Naq left17:46
← wootehfoot left17:46
← ArcaTech left17:48
← csan left17:48
→ weird_error joined17:50
→ nitric_ joined17:52
← nurdie left17:52
→ chris349 joined17:52
→ pfleck joined17:53
→ nurdie joined17:53
← _antares_ left17:53
← nurdie left17:54
← nitric left17:54
← venmx left17:54
→ nurdie joined17:55
← camsbury left17:55
→ nikheizen joined17:56
← cdown left17:57
← chris349 left17:57
→ camsbury joined17:58
→ D630 joined17:59
→ drbean_ joined18:01
← bdonnahue left18:01
→ bdonnahue joined18:01
← drbean left18:02
← ivokh left18:02
← jnavila left18:03
← D630 left18:03
← nurdie left18:04
→ nurdie joined18:05
← jready left18:06
← rafasc left18:06
→ ChristopheT joined18:06
→ jready joined18:06
← ChristopheT left18:06
← Es0teric left18:07
→ rafasc joined18:07
→ Es0teric joined18:10
← jready left18:10
← Wizzup left18:11
← nurdie left18:13
→ robattila256 joined18:15
← stfn left18:15
→ stfn joined18:17
→ Wizzup joined18:18
→ mel00010 joined18:18
← Es0teric left18:21
→ wootehfoot joined18:21
→ jready joined18:22
← kes left18:22
← Sudrien left18:22
→ houami joined18:24
→ nurdie joined18:25
→ MikHel joined18:25
→ Sasazuka joined18:26
gitinfo set mode: +v18:27
MikHel Hi. I have a git repository created from a Mercurial repository. I've made many changes under git and the mercurial one has also changed. I am not sure which tool I used to create my first git repo, but the two tools I am finding now that can sync the two create a git repo from mercurial with a different set of commit hashes.18:27
I am trying now to take all my commits added to the repo from the first hg->git and putting them onto the new repo.18:28
How can I do that easily?18:28
← houami left18:28
→ jhaenchen joined18:28
_ikke_ MikHel: I don't think they repos are related (share the same history, because they were converted independently), right?18:30
→ thiago joined18:30
MikHel _ikke_ correct.18:31
← King_Hual left18:31
_ikke_ How many commits are you talking about?18:31
MikHel _ikke-: However if I check out the same points in the history, the files match.18:31
← regedit left18:31
MikHel We're talking of about 200 commits.18:31
_ikke_ Not sure if it's feasible, but with man git format-patch + man git am, you can basically copy commits between unrelated repositories18:32
gitinfo the git-format-patch manpage is available at https://gitirc.eu/git-format-patch.html18:32
the git-am manpage is available at https://gitirc.eu/git-am.html18:32
MikHel Can patches preserve separate commits are separate when being applied?18:32
← vdamewood left18:32
_ikke_ yes18:32
MikHel I'll try that way.18:33
_ikke_ (patches created with format-patch)18:33
← crose left18:33
← wandering_vagran left18:34
BlessJah how about git filter-branch --parent-filter?ODOC18:35
_ikke_ '?ODOC'?18:35
BlessJah is on a train18:36
BlessJah I guess it is possible, I'm not sure however how much scripting would that require18:37
MikHel git format-patch created >2700 files :) I'll try to apply them now.18:37
_ikke_ that's more than 200 commits then18:37
MikHel No, but some commits touched many files. Either that or my use of --root was incorrect18:38
Option 2.18:38
← bket left18:38
MikHel Clearly it put the complete history....18:39
I've misused the command.18:39
→ Es0teric joined18:39
_ikke_ right18:39
it doesn't create a patch per file, but a patch per commit18:39
← shinnya left18:39
← bdonnahue left18:40
← Sonderblade left18:40
→ nowhere_man joined18:40
→ MACscr|lappy joined18:40
MikHel Now I have it correctly I think.18:41
→ bket joined18:42
→ jnavila joined18:42
← iNCoNFuN left18:43
MikHel I am a bit confused on git am18:43
Can it apply the patches from the directory immediately? Is that what they mean by "Maildir" ?18:44
← Wizzup left18:44
← mikemcowie left18:44
_ikke_ Yes, but you have to supply the files I believe, not the directory18:45
← Xiti` left18:47
MikHel Doc says: git am [(<mbox> | <Maildir>)…]18:47
Let's try.18:47
→ Xiti joined18:47
_ikke_ I think that says more about the format of the files18:47
MikHel OK I have to do file by file.18:49
_ikke_ You can specify a list of files18:49
← oxymoron93 left18:49
MikHel Interesting warnings (all similar): warning: Feti.d/CMakeLists.txt has type 100755, expected 10064418:49
Maybe that file flags are the only differences between the repositories.18:49
→ sjoshi joined18:51
→ Wizzup joined18:51
← TomyWork left18:52
→ bdonnahue joined18:52
← mel00010 left18:52
→ fr33domlover joined18:54
← robattila256 left18:54
thiago 755 for CMakeLists.txt is wrong18:54
your local repository has a problem18:54
MikHel thiago: It was created by a tool. The new tool does not have 755.18:55
But I may have a bigger problem.18:55
thiago if the tool created as 755, the tool has a problem18:55
it's most likely a filesystem issue18:55
MikHel It seems the old tool may have put \cr\nl and not the new one.18:55
thiago don't use FAT for storage18:56
← crtcji left18:56
MikHel I am on Mac.18:56
thiago then use HFS or the new filesystem18:56
MikHel But some contributors are on other systems....18:56
thiago so?18:56
MikHel I am using new FS.18:56
← physikoi left18:56
thiago ok, so the tool created with the wrong permissions or something else changed it after that18:57
MikHel I don't know why the file would have 755 except it was made by an old tool that may have had a big.18:57
bug18:57
← igemnace left18:57
→ physikoi joined19:02
← muelleme left19:03
← fission6 left19:04
← carbolymer left19:05
→ invisisith joined19:07
← pks left19:09
→ pks joined19:10
← MACscr|lappy left19:10
← luist left19:12
→ mel00010 joined19:12
→ luist joined19:13
→ MACscr|lappy joined19:15
← physikoi left19:15
→ carbolymer joined19:16
→ beefjoe joined19:17
→ vrach joined19:17
→ physikoi joined19:18
→ sQVe joined19:19
← manuelschneid3r left19:19
→ venmx joined19:22
← MACscr|lappy left19:22
← physikoi left19:23
→ MACscr|lappy joined19:23
→ physikoi joined19:23
→ fission6 joined19:25
→ sameerynho joined19:25
← MACscr|lappy left19:26
← armyriad left19:26
→ MACscr|lappy joined19:27
→ armyriad joined19:27
→ Cyrum joined19:28
→ chat_ joined19:28
→ pity joined19:28
← sQVe left19:30
→ sQVe joined19:31
→ manuelschneid3r joined19:32
← physikoi left19:32
furrymcgee do you know how to add .git to another repository?19:32
_ikke_ furrymcgee: !subproject19:32
gitinfo furrymcgee: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.19:32
← sjoshi left19:33
← pity left19:33
← akushner left19:33
← venmx left19:35
← _aeris_ left19:36
furrymcgee the foo/.git file/folder is ignored by git add foo/.git19:37
→ _aeris_ joined19:37
← pfleck left19:37
_ikke_ You cannot track .git directories itself19:38
it's hardcoded to be ignored19:38
← Fernando-Basso left19:41
→ venmx joined19:43
furrymcgee thanks good to know19:44
← sQVe left19:44
furrymcgee !gitslave19:45
gitinfo gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.19:45
→ dreiss joined19:47
← synthroid left19:48
→ sQVe joined19:49
→ vdv__ joined19:50
→ duderonomy joined19:50
→ pfleck joined19:51
← xaxxon left19:51
→ xaxxon joined19:51
→ physikoi joined19:52
← sanscoeur left19:53
← vdv_ left19:53
← Cyrum left19:54
→ vdv joined19:54
→ Cyrum joined19:55
→ Cromulent|2 joined19:55
← pfleck left19:55
← vdv__ left19:56
← dreiss left19:57
← Nizumzen left19:57
→ ivokh joined19:58
← dendazen left19:58
→ Trillium1 joined19:59
→ lafleurdubien joined19:59
dakar is there a decent solution to periodically check a remote git repository for new commits, and if there are, then pull, compile, etc.?20:00
_ikke_ Just regular run git fetch?20:01
regularly*20:01
← tvw left20:01
dakar _ikke_ i thought about a shell script to git pull, ./configure, whatever20:01
was wondering if there's something nicer20:02
← LiftLeft left20:02
→ cr1mson_king joined20:02
Zarthus "compile, etc." is outside of the scope of what git does. *shrug*20:02
dakar true.20:02
Zarthus it'll depend per project what you want to do20:02
dakar fetch latest head every so often, compile the code and some other things.20:02
_ikke_ right20:02
dakar if the code changed at all, that is20:02
Zarthus generally i would advocate a package manager / ppa / what have you20:03
← ivokh left20:03
→ muelleme joined20:03
← duderonomy left20:03
dakar okay20:03
_ikke_ in combintion with a proper CI server20:03
→ sanscoeur joined20:03
_ikke_ (I'm currently looking into buildbot20:04
)20:04
← mel00010 left20:05
kilobyte proper CI is for the weak, Real Men™ use a few lines of script, some string and twine, glued with bubble gum. Usually far less work than adapting to dain bramage of existing CI programs.20:07
← muelleme left20:08
← schleppel left20:08
← Cyrum left20:09
→ Cyrum joined20:10
← cr1mson_king left20:10
→ cr1mson_king joined20:10
← cr1mson_king left20:11
→ cr1mson_king joined20:12
← Cromulent|2 left20:12
→ muelleme joined20:12
→ schleppel joined20:14
→ ivokh joined20:15
→ g00s joined20:16
← muelleme left20:18
← Worldexe left20:18
← plexigras left20:18
← MACscr|lappy left20:19
→ duderonomy joined20:19
← relipse left20:19
← ivokh left20:20
← Trillium1 left20:21
← mofai left20:21
← venmx left20:22
← duderonomy left20:22
← heyoni left20:22
→ venmx joined20:22
→ duderonomy joined20:23
← duderonomy left20:23
→ duderonomy joined20:23
← duderonomy left20:24
moritz kilobyte: that stops being true when a single machine isn't enough, usually20:24
→ duderonomy joined20:24
← duderonomy left20:25
→ ocds joined20:25
dakar moritz we're talking about 1 machine ;)20:25
→ duderonomy joined20:25
← duderonomy left20:25
→ duderonomy joined20:26
kilobyte moritz: well yeah, depends on the use case20:26
← duderonomy left20:26
→ duderonomy joined20:26
← duderonomy left20:27
→ duderonomy joined20:27
← duderonomy left20:28
→ duderonomy joined20:28
← duderonomy left20:28
→ duderonomy joined20:29
← duderonomy left20:29
→ duderonomy joined20:30
→ synthroid joined20:30
← duderonomy left20:30
← venmx left20:30
← Impaloo left20:31
← schleppel left20:31
→ Impaloo joined20:32
→ venmx joined20:32
← cr1mson_king left20:33
← mlopezviedma left20:39
← freimatz3 left20:41
← rnsanchez left20:43
← stutter_ left20:43
→ themiddleman joined20:43
← borkr left20:46
→ shinnya joined20:47
furrymcgee OC[6~20:47
← eh3 left20:47
→ madewokherd joined20:47
→ ryantrinkle joined20:49
→ djapo_ joined20:50
← djapo left20:51
← synthroid left20:52
→ borkr joined20:53
← nikheizen left20:53
→ kyan joined20:56
→ LiftLeft joined20:58
→ eh3 joined20:58
→ rnsanchez joined20:58
← physikoi left20:59
→ mikemcowie joined21:00
← jhaenchen left21:01
→ jhaenchen joined21:01
← JonnyAt left21:02
← jhaenchen left21:02
→ jhaenchen joined21:02
← PsychoBoB left21:02
→ HJJHJH joined21:03
← jhaenchen left21:03
← HJJHJH left21:03
→ physikoi joined21:04
→ jhaenchen joined21:04
← borkr left21:04
← jhaenchen left21:04
→ PsychoBoB joined21:04
→ jhaenchen joined21:05
→ crimson_king joined21:05
← invisisith left21:05
← sQVe left21:06
→ JonnyAt joined21:07
→ sat-aton joined21:08
← sat-aton left21:08
→ sat-aton joined21:08
→ relipse joined21:08
← physikoi left21:08
→ Alystair joined21:12
← satifant left21:12
→ physikoi joined21:13
→ endiruna joined21:13
← luist left21:13
← sameerynho left21:14
← relipse left21:14
← Tobbi left21:14
→ muelleme joined21:14
← fmgt left21:16
→ msp301 joined21:16
→ luist joined21:17
← shabius left21:17
← eh3 left21:17
← muelleme left21:19
→ shabius joined21:19
← jhaenchen left21:19
← physikoi left21:20
→ labh joined21:21
← cybrNaut left21:23
→ cfoch joined21:23
← shabius left21:25
← jnavila left21:25
→ NeUx joined21:27
← ocds left21:29
← Es0teric left21:31
→ btree joined21:34
← Neo4 left21:34
← greggerz left21:37
← btree left21:37
→ Have-Quick joined21:40
→ shabius joined21:40
← amirpro left21:40
← Alystair left21:42
→ average joined21:42
→ mSSM joined21:43
← venmx left21:44
average how do I throw away all commit history except for the latest?21:44
but like, not just the history, but also the refs, like all the data21:44
basically I want to compact the entire history into one commit, but not just to see one commit in git-log, I actually want to throw away the history because I don't need it and I want the Git repo to be smaller21:44
← mrkake left21:44
→ physikoi joined21:44
← mSSM left21:45
leah2 rm -rf .git; git init; git add .; git commit -m 'all in one'21:46
;)21:46
→ mikecmpbll joined21:46
→ cybrNaut joined21:47
average that's a bit more complicated because there's some unversioned files too and my .gitignores are not the best21:47
kilobyte clone --depth if you want to preserve the hash21:47
average kilobyte: interesting, so clone --depth i thought of that, it would be interesting to remove the remote too and then start over by a git-push21:47
→ mrkake joined21:47
average kilobyte: yeah, that's currently one option i would like to explore21:48
← jready left21:48
→ jready joined21:49
leah2 git checkout --orphan new-master master21:49
kilobyte kind of pointless to have pointers to commits that don't exist ANYWHERE. What about rebasing everything, squashing into a single commit?21:49
leah2 then remove all other refs and branches and gc?21:49
average leah2: that's interesting but i don't understand it21:50
leah2: please explain21:50
leah2: how does it work?21:50
leah2 it makes a new branch without parent21:50
average also how do i remove all other refs?21:50
leah2 but with contents of master21:50
← fission6 left21:50
← [Kid] left21:50
← physikoi left21:50
→ hph^ joined21:51
← shabius left21:51
leah2 git branch -d ... and git tag -d21:51
← jready left21:53
→ physikoi joined21:54
← vdv left21:55
← Khisanth left21:56
→ TOB_CyxoB joined21:56
← nurdie left21:58
← physikoi left22:01
← CheckDavid left22:02
← ferdna left22:03
gitinfo set mode: +v22:05
→ sz0 joined22:06
TOB_CyxoB Sooo, I have multiple branches with variations (one offs) of the same products, some are test branches with abandoned features on them etc... I'm trying to figure-out what set of changes is missing from a branch. I'm thinking of getting subject list (git log --format=%s) from all branches in chronological order and then run some sort of a bash merge that combines all the branch files into one super-set which I can compare to a specific branch22:06
→ dendazen joined22:06
TOB_CyxoB subject list. Short of writing such merger is there a bash command that will merge a super set of two files. Or perhaps there is a git trick that will do this??? Thanks!22:06
→ physikoi joined22:06
← paraxial left22:07
→ paraxial joined22:08
← PsychoBoB left22:08
rafasc what you described sounds like an octopus merge...22:09
TOB_CyxoB :)22:09
seriously? I'll google that :)22:09
rafasc git can merge more than one branch.22:09
git merge A B C D E...22:10
beefjoe why has github flipped22:10
rafasc beefjoe: ask #github22:10
TOB_CyxoB rafasc: management will decide what features go where, I don't want to merge it, just want to list what is available (if you know what I mean) :)22:11
← AndresInSpace left22:12
rafasc I don't.22:12
average how can I delete all the remote refs that are not in my local clone of a repository?22:12
→ Khisanth joined22:12
← bdonnahue left22:12
rafasc average: what do you mean by deleting all remote refs?22:13
do you want to delete your local remote refs22:14
average like rsync --delete22:14
TOB_CyxoB rafasc: well some products are not compatible but main code base is the same, certain things have been tried/attempted on some versions of a product and not on the other thus technically there is a super set of features that you may not want on a specific product22:14
average rafasc: deleting the remote refs, not the local ones22:14
rafasc: here's the scenario, imagine this22:14
I have my local clone A, and my remote B22:14
A was made by git clone --depth 1 (so just the latest commit from B)22:15
now I want B to be exactly like A22:15
how do I do that?22:15
← physikoi left22:15
tobiasvl pretty sure you need to unshallow A (make it equal to B in depth) and then squash all the commits together22:16
and then force push to B22:16
a shallow clone isn't actually squashed22:16
→ Copenhagen_Bram joined22:17
← BrAsS_mO- left22:17
← justanotheruser left22:18
← SCHAPiE left22:19
→ PettanShoutaKun joined22:20
PettanShoutaKun we have a repo that has like... been around forever... what commands should we/can we run to optimize it and stuff?22:21
average PettanShoutaKun: git gc22:21
PettanShoutaKun: that's one way22:21
PettanShoutaKun: but.. there's also the option to start removing commits, which is what I'm doing now for one of my repos22:22
Zarthus depends on what's in it. `git gc` would probably help, removal of big binaries in the history might.22:22
PettanShoutaKun what does git GC do?22:22
← Copenhagen_Bram left22:22
Zarthus garbage collect. man git-gc22:22
gitinfo the git-gc manpage is available at https://gitirc.eu/git-gc.html22:22
average git-gc would help you with your local clone being smaller but like..22:22
→ bvtton joined22:22
PettanShoutaKun My big concern is we have a lot of tagged commits in master that relate to versions of our product we have released I wouldn't want to lose any of those22:23
average what you really want to do is to remove commits as well22:23
← LiftLeft left22:23
→ Copenhagen_Bram joined22:23
Zarthus You can backup the old repository and "deprecate it".22:23
Start a new repository from a fresh range of commits22:23
PettanShoutaKun interesting idea22:24
so for now should I just run git gc --agressive and push master?22:24
you think that would do the trick?22:24
Zarthus no, git gc is only local.22:24
→ SCHAPiE joined22:24
→ amirpro joined22:24
PettanShoutaKun hmmm... so there's nothing I cean really do to make master/fresh checkouts better other than start a repo off of a base of commits?22:25
← kilobyte left22:25
Zarthus that's not the only solution we provided22:25
but it is the easiest one22:25
PettanShoutaKun Well you said remove commits but I wouldn't know what to remove. I don't think we commit any binaries luckily.22:26
→ jready joined22:26
Zarthus I haven't really had issues with git performance for large repositories myself.22:26
← bvtton left22:26
Zarthus even just cloning git/git from github takes only a few seconds (~15) for me.22:27
← amirpro left22:27
PettanShoutaKun Really I just keep coming across Resolving deltas: 100% (74064/74064), done. fatal: fsync error on '.git/objects/pack/tmp_idx_of18ra': Bad file descriptor fatal: index-pack failed22:27
← diogenese left22:27
→ bvtton joined22:28
PettanShoutaKun I'm just wondering if making the repo smaller or more optimized or something can help this22:28
Zarthus maybe that should have been your opener :P22:28
PettanShoutaKun Probably22:28
Zarthus i imagine it would, but it doesn't fix the problem (just works around it)22:28
PettanShoutaKun I am in a weird situation though... because I am git checking out files through jenkins on a network file share... which makes me think any number of things could really be causing that <_>22:28
Zarthus what OS/fs are you on?22:28
PettanShoutaKun Windows22:28
Zarthus that _might_ be why22:29
PettanShoutaKun NTFS, but files are checked out onto a mapped network drive22:29
Zarthus i imagine someone committed a file that's not supported by your FS. e.g. both `Test` and `test` in the same directory (ntfs is case insensitive), or some illegal windows name22:29
PettanShoutaKun sadly all the build machines are windows... even though this particular build machine doesn't actually need to be a windows box22:30
Zarthus just theories though, could be any number of things.22:30
→ amirpro joined22:30
PettanShoutaKun npm also gets fsync errors occasionally22:30
← camsbury left22:30
← jready left22:30
→ camsbury joined22:31
→ BrAsS_mOnKeY joined22:32
→ nurdie joined22:33
PettanShoutaKun I thought maybe the drive was just butt but it's supposedly on a VM backed by an SSD22:33
← Rhvs left22:35
← camsbury left22:35
→ LiftLeft joined22:36
→ diogenese joined22:36
→ physikoi joined22:36
→ pfleck joined22:37
← bvtton left22:37
← nurdie left22:38
← boombatower left22:38
→ pwnz0r joined22:38
← TOB_CyxoB left22:40
← luist left22:41
→ Rhvs joined22:41
← physikoi left22:45
← phluks left22:51
← vrach left22:57
→ DaGoaty joined22:58
← labh left23:00
← Praxi left23:00
→ treehug88 joined23:02
← themiddleman left23:03
→ muelleme joined23:03
← finalbeta left23:04
← Khisanth left23:05
← KeyJoo left23:06
← pfleck left23:07
← muelleme left23:08
→ shabius joined23:09
← felixsanz left23:10
→ felixsanz joined23:12
← _ikke_ left23:13
← pwnz0r left23:14
→ pbrewczynski joined23:14
← James0r left23:16
→ James0r joined23:16
→ ferdna joined23:17
→ _ikke_ joined23:18
→ Khisanth joined23:18
→ fstd_ joined23:18
→ m0viefreak joined23:19
← James0r left23:21
← fstd left23:21
fstd_ → fstd23:21
← xaxxon left23:23
→ z|bandito joined23:24
→ James0r joined23:25
← mattcen left23:25
← zbandito left23:26
→ noobineer joined23:27
← dege left23:27
dmc https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html23:28
← PettanShoutaKun left23:29
→ mattcen joined23:30
→ Atro_ joined23:31
→ justanotheruser joined23:31
← noobineer left23:32
← Atro left23:33
rafasc partial clones woohoo23:34
← _ikke_ left23:34
→ noobineer joined23:34
p14nd4 does that incorporate some of microsoft's changes to make massive repos more usable?23:36
← inovas left23:37
← Copenhagen_Bram left23:37
→ Copenhagen_Bram joined23:38
← Have-Quick left23:38
← mikecmpbll left23:38
→ bdonnahue joined23:39
→ duderonomy joined23:41
→ Have-Quick joined23:42
→ inovas joined23:42
← James0r left23:42
→ _ikke_ joined23:42
→ mikecmpbll joined23:48
→ James0r joined23:50
← ryantrinkle left23:52
← applecrumble left23:54
← nitric_ left23:55

Logs Search ←Prev date Next date→ Channels Documentation