| 2019-08-25 |
| ← Crocodillian left | 00:00 |
| → Crocodillian joined | 00:00 |
| ← de-facto left | 00:01 |
| → de-facto joined | 00:01 |
| → invisbl joined | 00:02 |
| ← leeN left | 00:02 |
| ← libertyprime left | 00:04 |
| ← ExeciN left | 00:05 |
| ← invisbl left | 00:06 |
| → null1337 joined | 00:08 |
| ← wootehfoot left | 00:09 |
| ← malina left | 00:12 |
|
Viking667
| Ah well. Problem resolved, though not the way I wanted. | 00:12 |
|
| "resolving" the problem put my tree two commits ahead of remote, which wasn't the idea. | 00:12 |
|
| Back another time, and really, sorry about the upset feeling I had. you guys do a good job. | 00:14 |
| → malina joined | 00:17 |
| ← mowcat left | 00:21 |
| ← null1337 left | 00:22 |
| ← mase-tech left | 00:24 |
| ← rkta left | 00:25 |
| → rkta joined | 00:25 |
| ← pie_ left | 00:25 |
| ← AtumT left | 00:28 |
| → null1337 joined | 00:28 |
| ← null1337 left | 00:28 |
| → null1337 joined | 00:29 |
| ← rafasc left | 00:31 |
| → kerframil joined | 00:35 |
| ← diogenese left | 00:37 |
| → cd joined | 00:38 |
| → Tie-1000 joined | 00:41 |
| ← TomyLobo left | 00:46 |
| → libertyprime joined | 00:46 |
| ← malina left | 00:55 |
| ← Stoot left | 00:55 |
| → impermanence joined | 01:03 |
| ← caskd left | 01:05 |
| → learningc joined | 01:08 |
| ← sgn left | 01:08 |
| → sgn joined | 01:08 |
| ← _xor left | 01:15 |
| → finn0 joined | 01:16 |
| → _xor joined | 01:23 |
| ← sgn left | 01:24 |
| → sgn joined | 01:26 |
| ← cd left | 01:28 |
| → tufteddeer joined | 01:28 |
| ← MoziM left | 01:30 |
| Shentino__ → Shentino | 01:34 |
| → malina joined | 01:36 |
| → cd joined | 01:37 |
| ← malina left | 01:39 |
| → caskd joined | 01:41 |
| ← learningc left | 01:46 |
| ← MACscr left | 01:49 |
| ← Murr left | 01:52 |
| → Murr joined | 01:53 |
| ← tufteddeer left | 01:54 |
| → tufteddeer joined | 01:54 |
| → MoziM joined | 01:54 |
| ← magic_ninja left | 01:55 |
| ← _xor left | 01:56 |
| → _xor joined | 01:57 |
| ← F0rTex left | 01:58 |
| → F0rTex joined | 01:59 |
| ← _xor left | 02:00 |
| effprime → Hunterk | 02:00 |
| → _xor joined | 02:01 |
| ← null1337 left | 02:01 |
| Hunterk → PipeItToDevSda1 | 02:02 |
| ← fflam left | 02:02 |
| PipeItToDevSda1 → effprime | 02:03 |
| → null1337 joined | 02:03 |
| ← orbyt_ left | 02:04 |
| → fflam joined | 02:05 |
| ← MoziM left | 02:06 |
| → MoziM joined | 02:08 |
| ← oatmealraisin left | 02:09 |
| → diogenese joined | 02:10 |
| ← null1337 left | 02:11 |
| ← tufteddeer left | 02:15 |
| → null1337 joined | 02:16 |
| ← m0viefreak left | 02:19 |
| ← khisanth_ left | 02:23 |
| ← Tie-1000 left | 02:28 |
| → Tie-1000 joined | 02:28 |
| → learningc joined | 02:30 |
| ← MoziM left | 02:30 |
| → magic_ninja joined | 02:32 |
| → MoziM joined | 02:34 |
| → fphilipe_ joined | 02:38 |
| ← impermanence left | 02:39 |
| ← lagothrix left | 02:42 |
| → lagothrix joined | 02:42 |
| ← fphilipe_ left | 02:43 |
| → khisanth_ joined | 02:44 |
| ← Cabanossi left | 02:45 |
| ← libertyprime left | 02:51 |
| ← MoziM left | 02:51 |
| ← magic_ninja left | 02:55 |
| → Cabanossi joined | 02:55 |
| → magic_ninja joined | 02:57 |
| → macroprep joined | 02:57 |
| → libertyprime joined | 03:02 |
| ← nowhere_man left | 03:08 |
| ← RoriconKnight left | 03:10 |
| → RoriconKnight joined | 03:11 |
| ← learningc left | 03:15 |
| → learningc joined | 03:23 |
| → invisbl joined | 03:31 |
| ← invisbl left | 03:36 |
| ← magic_ninja left | 03:37 |
| → macroprep_ joined | 03:38 |
| → magic_ninja joined | 03:39 |
| → causa_sui joined | 03:39 |
| → surfist joined | 03:41 |
| ← macroprep left | 03:42 |
| → invisbl joined | 03:43 |
|
Viking667
| hm. That's interesting. I forked a project, and want to keep it up to date with the parent, but I'm being told I shouldn't use git pull for that, as it creates "merge commits". How else do I keep the two synchronised? | 03:44 |
|
| The only other way I've seen (so far) also involves git merge (git fetch --upstream) | 03:49 |
|
thiago
| git rebase | 03:53 |
|
| or git pull --rebase | 03:54 |
| ← learningc left | 03:54 |
| ← macroprep_ left | 03:56 |
| → sjohnson joined | 03:58 |
| → fatalhalt joined | 04:02 |
| → z|bandito joined | 04:10 |
| ← magic_ninja left | 04:11 |
| → tufteddeer joined | 04:12 |
| → magic_ninja joined | 04:13 |
|
Viking667
| okay. Will that adjust my commits counter if I'm already x ahead? | 04:13 |
|
| (sorry I'm late in replying, there's a bit going on here) | 04:15 |
| → MoziM joined | 04:17 |
| → dre_ joined | 04:17 |
| ← freeman42x left | 04:18 |
| → learningc joined | 04:24 |
| ← finn0 left | 04:27 |
| ← Anthaas left | 04:32 |
| → Anthaas joined | 04:33 |
| → gioyik joined | 04:35 |
| ← cd left | 04:38 |
| ← invisbl left | 04:38 |
| → YuGiOhJCJ joined | 04:43 |
| ← learningc left | 04:49 |
| ← veegee left | 04:54 |
| ← RoriconKnight left | 05:00 |
| → pks_ joined | 05:02 |
| ← pks left | 05:03 |
| pks_ → pks | 05:03 |
| → learningc joined | 05:08 |
| ← Goplat left | 05:13 |
| → orbyt_ joined | 05:20 |
| → podlech joined | 05:21 |
| ← iam730 left | 05:27 |
| ← learningc left | 05:28 |
| ← dre_ left | 05:28 |
| ← hcit left | 05:31 |
| ← fxrs left | 05:32 |
| → learningc joined | 05:33 |
| ← Whiskey left | 05:37 |
| → g00s joined | 05:38 |
| ← Cabanossi left | 05:39 |
| → Whiskey joined | 05:43 |
| ← telling left | 05:46 |
| → finn0 joined | 05:48 |
| ← fling left | 05:48 |
| → dviola joined | 05:49 |
| → telling joined | 05:53 |
| → Cabanossi joined | 05:53 |
| ← libertyprime left | 05:53 |
| → fling joined | 05:54 |
| ← thiago left | 05:58 |
| → dartmouthed joined | 06:11 |
| ← podlech left | 06:13 |
| → podlech joined | 06:13 |
| ← learningc left | 06:16 |
| → learningc joined | 06:23 |
| ← learningc left | 06:25 |
| → Mattiaslndstrm joined | 06:32 |
| ← dviola left | 06:32 |
| → pyfgcr joined | 06:37 |
| ← fatalhalt left | 06:39 |
| ← BonusPlay left | 06:44 |
| → BonusPlay joined | 06:44 |
| → jottr joined | 06:45 |
| ← g00s left | 06:52 |
| ← jottr left | 06:52 |
| ← gioyik left | 06:57 |
| → g00s joined | 07:04 |
| ← tufteddeer left | 07:05 |
| → tufteddeer joined | 07:06 |
| → n3wborn joined | 07:06 |
| ← alystair left | 07:09 |
| ← SleePy left | 07:16 |
| ← snappy left | 07:16 |
| ← kini left | 07:16 |
| ← boshhead left | 07:16 |
| ← stux|RC-only left | 07:17 |
| ← mu left | 07:17 |
| → boshhead joined | 07:17 |
| → mu joined | 07:18 |
| → snappy joined | 07:19 |
| → SleePy joined | 07:19 |
| ← _xor left | 07:20 |
| → kini joined | 07:23 |
| ← tufteddeer left | 07:27 |
| → tufteddeer joined | 07:27 |
| ← yonder left | 07:29 |
| ← pyfgcr left | 07:40 |
| → feriman joined | 07:41 |
| ← podlech left | 07:43 |
| ← magic_ninja left | 07:48 |
| → theoceaniscool joined | 07:49 |
| → magic_ninja joined | 07:50 |
| ← g00s left | 07:54 |
| → g00s joined | 07:54 |
| → xcm joined | 07:58 |
| → crose joined | 07:58 |
| → libertyprime joined | 08:15 |
| → jottr joined | 08:18 |
| → ExeciN joined | 08:20 |
| → czart joined | 08:33 |
| → AfroThundr|main joined | 08:45 |
| ← orbyt_ left | 08:46 |
| ← g00s left | 08:47 |
| → PityDaFool joined | 08:48 |
| ← AfroThundr|main left | 08:49 |
| ← theoceaniscool left | 08:53 |
| ← n3wborn left | 08:54 |
| → theoceaniscool joined | 09:00 |
| → randomdude999 joined | 09:01 |
|
j416
| Viking667: we already talked about this yesterday | 09:06 |
|
| Viking667: try it and see™ :) | 09:06 |
|
| Viking667: I'd also recommend reading about Git's object model, it'll make this more clear to you | 09:07 |
| ← TomTom left | 09:10 |
| ← plasticle left | 09:14 |
| → nuala joined | 09:31 |
| → macroprep joined | 09:32 |
| → nabil__ joined | 09:32 |
| ← Tie-1000 left | 09:32 |
| ← nabil_ left | 09:36 |
| ← nuala left | 09:37 |
| ← dartmouthed left | 09:41 |
| ← czart left | 09:44 |
| → Tie-1000 joined | 09:46 |
| → Piraty joined | 09:50 |
|
Piraty
| how can i address the next commit of a ref (say: a tag)? <ref>^1 and <ref>~1 both seem to mean the previous commit | 09:51 |
|
BtbN
| A commit only has a parent, no children. | 09:53 |
|
| Well, technically it has, but it does not keep track of them. | 09:53 |
|
Piraty
| no double-linked list? | 09:54 |
|
| i always assumed... | 09:55 |
|
BtbN
| How would that work? A commits hash would change each time a child changes if it would keep track. | 09:55 |
|
Piraty
| not necessarily, but it's quite some overhead | 09:56 |
|
| thanks BtbN | 09:56 |
| → TomTom joined | 10:01 |
| → dartmouthed joined | 10:13 |
| ← Raging_Hog left | 10:22 |
| → Raging_Hog joined | 10:23 |
| → ave_milia joined | 10:28 |
| ← Tie-1000 left | 10:34 |
| → malina joined | 10:34 |
| → cdown joined | 10:36 |
| → clime joined | 10:38 |
| → cdown_ joined | 10:40 |
| ← cdown left | 10:42 |
| → Aquazi joined | 10:43 |
| cdown_ → cdown | 10:43 |
| ← jottr left | 10:47 |
| → fphilipe_ joined | 10:49 |
| ← igemnace left | 10:50 |
| → pie_ joined | 10:52 |
| → localhorse joined | 10:55 |
| ← Inline left | 10:55 |
| → jottr joined | 10:58 |
| ← feriman left | 10:59 |
| ← fphilipe_ left | 10:59 |
| ← jottr left | 11:11 |
| ← Hello71 left | 11:12 |
| ← causa_sui left | 11:15 |
| ← Viking667 left | 11:18 |
| → fstd_ joined | 11:23 |
| → greatgatsby joined | 11:23 |
|
_ikke_
| There is also not a well defined order of children | 11:24 |
| ← fstd left | 11:27 |
| fstd_ → fstd | 11:27 |
| → Hello71 joined | 11:28 |
| → Fernando-Basso joined | 11:30 |
| → nuala joined | 11:32 |
| → abraxxas joined | 11:33 |
| → SkarmoutsosV joined | 11:33 |
| ← random_y1 left | 11:34 |
| → Tie-1000 joined | 11:38 |
| ← kjartan left | 11:38 |
| → kjartan joined | 11:39 |
| → arinov joined | 11:42 |
| → savolla joined | 11:43 |
| → random_y1 joined | 11:46 |
| ← Tie-1000 left | 11:48 |
| → Tie-1000 joined | 11:49 |
| → fphilipe_ joined | 11:50 |
| → AtumT joined | 11:52 |
| ← savolla left | 12:02 |
| → random_yanek joined | 12:06 |
| ← cdown left | 12:07 |
| ← duderonomy left | 12:07 |
| → cdown joined | 12:07 |
| ← random_y1 left | 12:08 |
| ← vishal left | 12:11 |
| → vishal joined | 12:16 |
| → jottr joined | 12:17 |
| ← Murr left | 12:18 |
| → bladodo joined | 12:19 |
| → Murr joined | 12:19 |
| ← cdown left | 12:20 |
| ← clime left | 12:21 |
|
bladodo
| Hello, I am new to git. I cloned a repo (using git clone url) some weeks ago and now I would like to update the local clone and see the new changes. What commands shall I try ? | 12:21 |
|
_ikke_
| first git fetch to get the latest changes | 12:23 |
|
| (that won't update your working tree yet) | 12:24 |
| ← finn0 left | 12:25 |
| ← jottr left | 12:26 |
| → leeN joined | 12:29 |
|
bladodo
| does git fetch need sudo ? | 12:29 |
|
_ikke_
| no | 12:30 |
|
bladodo
| anyway, I tried it with sudo git fetch, and did not show anything. So, that means there is no update. right ? | 12:30 |
|
_ikke_
| Do not use sudo for git operations | 12:30 |
|
bladodo
| without sudo, I got 'error: cannot open .git/FETCH_HEAD: Permission denied' | 12:31 |
|
_ikke_
| Probably because you already used sudo earlier | 12:31 |
|
bladodo
| I think I did not use during cloning. maybe mistakenly I did but not sure | 12:31 |
|
nedbat
| bladodo: pro-tip: never use sudo unless you are sure you need it | 12:31 |
|
_ikke_
| bladodo: sudo chown -R <user>: .git | 12:32 |
|
nedbat
| bladodo: or remove the clone and do it again | 12:32 |
|
Peng_
| also pro-tip: do not mess up sudo chown -R commands | 12:32 |
|
| or any other sudo, chown, or -R commands, really | 12:32 |
| ← xelxebar left | 12:32 |
| ← rmsvc left | 12:32 |
| ← de-facto left | 12:33 |
| ← ghost43 left | 12:33 |
|
bladodo
| hmm, among the files in .git, I see only FETCH_HEAD owner is root and the other files are with my normal user | 12:33 |
|
_ikke_
| You probably ran git fetch / git pull as sudo earlier then | 12:34 |
| ← Hello71 left | 12:34 |
| ← tombusby left | 12:34 |
|
_ikke_
| (as root)\ | 12:34 |
|
bladodo
| could be my mistake | 12:34 |
|
nedbat
| bladodo: do you have any work on the local machine that isn't on the remote? | 12:36 |
| → ghost43 joined | 12:36 |
|
bladodo
| well, I am not modifying any code locally. I just wanted to see the differences between my local clone and the remote repo | 12:37 |
| → de-facto joined | 12:38 |
|
nedbat
| bladodo: i'm suggesting the easiest way to make this right is to delete your local clone and re-clone. But don't do that if you have local changes that aren' | 12:38 |
|
| t on the remote | 12:38 |
| → rmsvc joined | 12:38 |
| → xelxebar joined | 12:38 |
| → Hello71 joined | 12:40 |
| ← Piraty left | 12:40 |
| ← cbreak left | 12:42 |
|
wyoung
| bladodo: Can you chown it back to your user? | 12:42 |
| ← kerframil left | 12:42 |
| → tombusby joined | 12:42 |
| → cbreak joined | 12:43 |
| → finn0 joined | 12:47 |
|
wyoung
| Or just do what nedbat. She knows what she is talking about. | 12:50 |
| ← TomTom left | 12:50 |
|
bladodo
| ok | 12:52 |
| → _xor joined | 12:54 |
|
bladodo
| so, git fetch shows some output. How shall I check the changes at file level ? | 12:55 |
|
nedbat
| bladodo: git log # will show what's happened | 12:58 |
|
bladodo
| thanks a lot :) | 13:01 |
| ← bladodo left | 13:03 |
| → kerframil joined | 13:07 |
| ← finn0 left | 13:11 |
| → arinov_ joined | 13:12 |
| ← arinov_ left | 13:13 |
| ← Murr left | 13:13 |
| → arinov_ joined | 13:13 |
| ← arinov left | 13:14 |
| → Murr joined | 13:14 |
| arinov_ → arinov | 13:15 |
|
ave_milia
| I recently asked to which extend git relies on stat() when deciding whether the file has beed modified, because surely timestamps can be unreliable. this document describes one such group of problems and its solution: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/technical/racy-git.html | 13:15 |
| ← nuala left | 13:16 |
| ← kerframil left | 13:19 |
| ← pie_ left | 13:21 |
| ← Murr left | 13:21 |
| → Murr joined | 13:22 |
| ← Hello71 left | 13:23 |
| → wootehfoot joined | 13:27 |
| → kerframil joined | 13:30 |
| ← SkarmoutsosV left | 13:31 |
| → pie_ joined | 13:32 |
| ← kerframil left | 13:32 |
| → kerframil joined | 13:32 |
| ← arinov left | 13:36 |
| ← Envil left | 13:37 |
| ← kerframil left | 13:37 |
| → arinov joined | 13:38 |
| → igemnace joined | 13:39 |
| → Hello71 joined | 13:39 |
| → shaarad joined | 13:39 |
| ← shaarad left | 13:40 |
| → shaarad joined | 13:42 |
| → kerframil joined | 13:44 |
| → Envil joined | 13:44 |
| ← Fernando-Basso left | 13:46 |
| ← ExeciN left | 13:46 |
| ← randomdude999 left | 13:48 |
| → thefatma joined | 13:48 |
| ← Murr left | 13:56 |
| → randomdude999 joined | 13:57 |
| → Murr joined | 13:57 |
| ← arinov left | 13:58 |
| → Newami joined | 14:02 |
| ← sgn left | 14:04 |
| ← libertyprime left | 14:10 |
| → ExeciN joined | 14:12 |
| ← Aquazi left | 14:14 |
| ← riotz left | 14:14 |
| ← wootehfoot left | 14:16 |
| → fxrs joined | 14:17 |
| → riotz joined | 14:19 |
| → sgen joined | 14:19 |
| ← shaarad left | 14:20 |
| ← fxrs left | 14:23 |
| → fxrs joined | 14:24 |
| ← jimender2 left | 14:25 |
| → shaarad joined | 14:29 |
| → kp__ joined | 14:31 |
| ← barteks2x left | 14:32 |
| ← macroprep left | 14:32 |
| ← greatgatsby left | 14:37 |
| → aw1 joined | 14:37 |
| ← sgen left | 14:39 |
| ← kezimo left | 14:41 |
| → wootehfoot joined | 14:44 |
| → finn0 joined | 14:46 |
| ← YuGiOhJCJ left | 14:46 |
| ← pie_ left | 14:55 |
| → Inline joined | 14:58 |
| → pie_ joined | 14:59 |
| → jottr joined | 15:02 |
| → horribleprogram joined | 15:04 |
| → max12345 joined | 15:08 |
| ← inkbottle left | 15:09 |
|
max12345
| hello all. I my repo is corrupted somehow. good news is I have multiple back ups so nothing will be lost, it's just annoying. I have my remote on an SD card. I can't push because one objects local in empty and I can't pull because an object remote is empty. | 15:09 |
|
| I looked at some solutions on stackoverflow, but I think I just don't know enough about how git works to solve this effectively. Is there a specific part of some manual that you can recommend? | 15:10 |
|
| it's nothing critical either, so if all else fails I can just copy all the code and start a completely new history. | 15:11 |
| ← thefatma left | 15:12 |
| → thiago joined | 15:14 |
| ← Newami left | 15:15 |
| → nuala joined | 15:17 |
| → azwieg103 joined | 15:19 |
| → Fernando-Basso joined | 15:22 |
| ← azwieg103 left | 15:24 |
| ← BrianBlaze left | 15:27 |
| → BrianBlaze joined | 15:38 |
| ← rmsvc left | 15:38 |
| → TomTom joined | 15:46 |
| → thefatma joined | 15:47 |
| → nabil_ joined | 15:48 |
| → inkbottle joined | 15:49 |
| ← apetresc left | 15:50 |
| ← nabil__ left | 15:51 |
| ← finn0 left | 15:51 |
| ← Tie-1000 left | 15:53 |
| → Tie-1000 joined | 15:53 |
| → apetresc joined | 15:55 |
| ← shaarad left | 15:56 |
| ← nabil_ left | 15:57 |
| ← abraxxas left | 15:59 |
| → shaarad joined | 15:59 |
| ← jottr left | 16:01 |
| ← Tie-1000 left | 16:02 |
| ← pie_ left | 16:03 |
| → Tie-1000 joined | 16:03 |
| → rafasc joined | 16:04 |
| ← rafasc left | 16:04 |
| → rafasc joined | 16:05 |
| → pie_ joined | 16:06 |
| → yonder joined | 16:07 |
| ← hellauer left | 16:10 |
| → oatmealraisin joined | 16:13 |
| → jottr joined | 16:13 |
| → dijitol joined | 16:14 |
| ← dijitol left | 16:14 |
| ← max12345 left | 16:18 |
| ← jottr left | 16:18 |
| ← nuala left | 16:22 |
| → welovfree joined | 16:24 |
| ← welovfree left | 16:24 |
| → aw1_ joined | 16:27 |
| ← ave_milia left | 16:29 |
| ← aw1 left | 16:29 |
| → ave_milia joined | 16:29 |
| → greatgatsby joined | 16:30 |
| → mikedd joined | 16:34 |
| → gareppa joined | 16:35 |
| → paws_ joined | 16:40 |
| → plasticle joined | 16:42 |
| ← gareppa left | 16:44 |
| ← mns left | 16:45 |
| ← justanotheruser left | 16:47 |
| ← pie_ left | 16:49 |
| → eb0t joined | 17:01 |
| → eblip joined | 17:02 |
| ← eb0t_ left | 17:02 |
| ← def_jam left | 17:02 |
| → justanotheruser joined | 17:03 |
| ← omnireq left | 17:04 |
| → omnireq joined | 17:05 |
| → rmsvc joined | 17:08 |
| → Aquazi joined | 17:11 |
| → pie_ joined | 17:14 |
| ← jnewt left | 17:18 |
| ← pie_ left | 17:19 |
| ← rafasc left | 17:21 |
| → mns joined | 17:27 |
| → shicks2525 joined | 17:30 |
| ← aw1_ left | 17:31 |
| → KnoP joined | 17:36 |
| ← greatgatsby left | 17:38 |
| ← KnoP left | 17:40 |
| ← magic_ninja left | 17:41 |
| → kezimo joined | 17:41 |
| ← malina left | 17:41 |
| ← mns left | 17:42 |
| ← shaarad left | 17:43 |
| → magic_ninja joined | 17:43 |
| → malina joined | 17:45 |
| → yokisuci joined | 17:52 |
| → shaarad joined | 17:52 |
| ← oatmealraisin left | 18:02 |
| ← magic_ninja left | 18:02 |
| → pie_ joined | 18:03 |
| → Atlenohen joined | 18:03 |
| → davidlt joined | 18:04 |
| → feriman joined | 18:04 |
| → greatgatsby joined | 18:04 |
|
davidlt
| Is "--no-show-signatures" supported? I seems that works for me with 2.21.0, but not 2.22.0 | 18:04 |
|
| git log command | 18:04 |
| → magic_ninja joined | 18:05 |
| → Freshnuts joined | 18:06 |
| ← meLon left | 18:07 |
| → alystair joined | 18:08 |
| → mns joined | 18:08 |
| → SkarmoutsosV joined | 18:09 |
| → meLon joined | 18:10 |
| ← ExeciN left | 18:13 |
| → clime joined | 18:16 |
| ← pie_ left | 18:17 |
| → rafasc joined | 18:18 |
|
j416
| davidlt: which command? | 18:20 |
|
davidlt
| j416, git log, but looking the source seems I always had a typo "signatures" (s at the end) | 18:20 |
|
| seems that until 2.22.0 was happy to accept that | 18:20 |
|
j416
| :) | 18:21 |
|
| interesting. | 18:21 |
| ← Fernando-Basso left | 18:26 |
| → rsrx joined | 18:27 |
| ← greatgatsby left | 18:32 |
| ← omnireq left | 18:47 |
| ← wootehfoot left | 18:50 |
| justache → justache2 | 18:52 |
| → GreyXor joined | 18:53 |
| justache2 → justache | 18:53 |
|
GreyXor
| hello, how can i use git to change file owner ? | 18:53 |
| ← shaarad left | 18:53 |
|
_ikke_
| Git does not do any of that | 18:54 |
| → shaarad joined | 18:56 |
| → cd joined | 19:00 |
| → rudrab joined | 19:02 |
| ← Raging_Hog left | 19:03 |
| → nowhere_man joined | 19:03 |
|
GreyXor
| or a command that run an executable | 19:03 |
| ← kezimo left | 19:15 |
| ← TomTom left | 19:16 |
| ← malina left | 19:16 |
| ← Mattiaslndstrm left | 19:18 |
| → troulouliou_dev joined | 19:19 |
| ← rsrx left | 19:21 |
| ← nowhere_man left | 19:21 |
| → AaronMT joined | 19:21 |
| ← rudrab left | 19:22 |
| ← shaarad left | 19:25 |
| ← Tie-1000 left | 19:26 |
| → orbyt_ joined | 19:26 |
| → Tie-1000 joined | 19:27 |
| → Narrat joined | 19:29 |
| → fling_ joined | 19:29 |
| ← clime left | 19:30 |
| ← fling left | 19:32 |
| fling_ → fling | 19:32 |
|
rafasc
| GreyXor: what's the problem you are trying to solve? | 19:34 |
| → mase-tech joined | 19:34 |
|
GreyXor
| rafasc, escape a shell | 19:34 |
|
rafasc
| not sure what you mean with that.. | 19:35 |
|
GreyXor
| i'm in a shell jail. and i only can use git with sudo to go out (it's a game). with git commit i can enter in vim. then i can execute !/bin/bash to go out. solved | 19:37 |
|
rafasc
| wringing a hook could be another possibility. | 19:39 |
|
GreyXor
| rafasc, it was my second idea, but git commit more quick to do | 19:41 |
| → Newami joined | 19:41 |
| ← Newami left | 19:41 |
| ← Murr left | 19:42 |
| ← troulouliou_dev left | 19:43 |
| → Murr joined | 19:43 |
| ← mikedd left | 19:44 |
| ← AaronMT left | 19:44 |
|
rafasc
| it's quicker because vim has a easy way to shell out, yeah. | 19:44 |
| ← kerframil left | 19:45 |
|
rafasc
| GreyXor: another thing you can try: put the command in the PATH named git-shell-out and call it with git shell-out. | 19:45 |
| ← igemnace left | 19:46 |
|
GreyXor
| git shell-pit is not accepted | 19:46 |
|
rafasc
| Nvm, you probably cannot change the path.. | 19:46 |
|
GreyXor
| or disabled? idk | 19:46 |
| ← feriman left | 19:47 |
| → igemnace joined | 19:48 |
| → feriman joined | 19:49 |
|
rafasc
| maybe aliases as well.. the !f(){...};f | 19:50 |
| ← CarlFK left | 19:51 |
| ← planigan left | 19:54 |
| → cdown joined | 19:58 |
| ← meLon left | 20:01 |
| → jnewt joined | 20:02 |
| ← kjartan left | 20:03 |
| → meLon joined | 20:04 |
| → kjartan joined | 20:05 |
| → freeman42x joined | 20:06 |
| → duderonomy joined | 20:07 |
| ← SkarmoutsosV left | 20:09 |
| ← null1337 left | 20:12 |
| ← GreyXor left | 20:12 |
| → Stoot joined | 20:14 |
| → null1337 joined | 20:15 |
| ← feriman left | 20:15 |
| ← randomdude999 left | 20:18 |
| → randomdude999_ joined | 20:18 |
| randomdude999_ → randomdude999 | 20:18 |
| ← Tie-1000 left | 20:19 |
| → feriman joined | 20:19 |
| → Tie-1000 joined | 20:21 |
| ← de-facto left | 20:21 |
| ← null1337 left | 20:21 |
| → jottr joined | 20:22 |
| → planigan joined | 20:22 |
| ← lmariscal left | 20:25 |
| → Fernando-Basso joined | 20:25 |
| ← jottr left | 20:27 |
| ← Fernando-Basso left | 20:27 |
| → Fernando-Basso joined | 20:27 |
| → greatgatsby joined | 20:27 |
| ← magic_ninja left | 20:28 |
| ← randomdude999 left | 20:28 |
| → randomdude999 joined | 20:29 |
| ← yokisuci left | 20:30 |
| → magic_ninja joined | 20:30 |
| → lmariscal joined | 20:31 |
| ← xace left | 20:34 |
| → yokisuci joined | 20:36 |
| ← randomdude999 left | 20:37 |
| → randomdude999 joined | 20:37 |
| → jottr joined | 20:38 |
| ← randomdude999 left | 20:38 |
| → randomdude999 joined | 20:39 |
| ← yokisuci left | 20:39 |
| ← jstimm left | 20:41 |
| ← feriman left | 20:42 |
| → causa_sui joined | 20:43 |
| ← jottr left | 20:43 |
| → feriman joined | 20:48 |
| → troulouliou_div2 joined | 20:49 |
| ← randomdude999 left | 20:49 |
| → randomdude999 joined | 20:50 |
| → n3wborn joined | 20:52 |
| ← d^sh left | 20:54 |
| → d^sh joined | 20:56 |
| ← meribold left | 20:56 |
| → meribold joined | 20:56 |
| ← randomdude999 left | 21:00 |
| → nuala joined | 21:01 |
| ← tufteddeer left | 21:06 |
| → oatmealraisin joined | 21:06 |
| → tufteddeer joined | 21:07 |
| ← feriman left | 21:10 |
| ← alystair left | 21:12 |
| → jottr joined | 21:13 |
| ← magic_ninja left | 21:14 |
| → shabius_ joined | 21:16 |
| → magic_ninja joined | 21:17 |
| → ExeciN joined | 21:17 |
| ← shabius left | 21:18 |
| ← jottr left | 21:19 |
| → malina joined | 21:19 |
| → m0viefreak joined | 21:22 |
| → ricks_ joined | 21:22 |
| → mowcat joined | 21:22 |
|
ricks_
| Hey there. I downloaded a linux tarball and intend to push it to GItHUB with my own changes. however, I"ve run into a snaggle | 21:23 |
|
| I use an alternate repo to host my patchset, so I used 'git remote add patches www.isopale.com' | 21:23 |
|
| SOrry btw, let me know if you'd prefer me to have spearate messages or onre big one | 21:24 |
| → yokisuci joined | 21:24 |
| ← horribleprogram left | 21:25 |
|
ricks_
| Anyways, I remote added it no problem, fetched ti too. But it ended in the top level directory rather than directory of its own. So Then the rest is a blur but now my original locla repo's HEAD is stuck on the remote HEAD | 21:25 |
|
| How would I go about changing that if I didn't define HEAD in te first place? LOL. Brb. Let me check if I can do that. | 21:26 |
| → abraxxas joined | 21:26 |
|
rafasc
| ricks_: what do you mean by 'define HEAD' ? | 21:33 |
|
ricks_
| I iam assuming 'HEAD' is how I would be able to determine what repo a branch belongs to | 21:34 |
|
| since name clobber | 21:34 |
|
rafasc
| if you want to fetch something into its own directory, you'll need to use either submodules or subtrees. | 21:34 |
| ← mase-tech left | 21:35 |
|
ricks_
| pikachu face | 21:35 |
|
| Should I nuke this and remove the remote brnach? | 21:35 |
|
| I'll read about subm/t and come back thank you | 21:36 |
|
rafasc
| ricks_: HEAD is what defines what you have checked out. | 21:36 |
|
ricks_
| SO HEAD is more of a check rather than what determines what's going to happen? | 21:36 |
|
rafasc
| It's not a check. When HEAD resolves to 'master', it means you have master checked out. | 21:37 |
| → lungaro__ joined | 21:37 |
|
ricks_
| RIghto. So my current local repo master has been replaced by the remote | 21:37 |
|
rafasc
| ricks_: just for clarification, the 'name clobbering' is avoided on fetch, because it fetches branches into their own namespaces. | 21:39 |
|
ricks_
| While I figure out submodules; I have an identical branch to master. Would running 'git rebase <branc>' while on master work | 21:39 |
|
rafasc
| if you fetch master from remote1, you get remote1/master. | 21:39 |
|
ricks_
| oh that's a new thing to me, thank you | 21:39 |
| ← lungaro_ left | 21:39 |
| ← Inline left | 21:40 |
|
rafasc
| ricks_: No, rebase would not work because your trees mismatch. | 21:40 |
| ← xcm left | 21:41 |
|
ricks_
| > (no branch, rebasing master) | 21:41 |
|
| you're a wizard | 21:41 |
| → xcm joined | 21:41 |
|
ricks_
| What is the preferred method to revert commits? | 21:41 |
| ← greatgatsby left | 21:42 |
|
rafasc
| !revert | 21:42 |
|
gitinfo
| That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]? | 21:42 |
| ← leeN left | 21:43 |
|
ricks_
| Preface: apologies if it seems like I am ignore parts of youor message, I am still new to this so I don't know how to answer them | 21:45 |
|
| Ideally I just want to revert it to the very first commit, and I would like to discard all changes | 21:45 |
|
| Then use a sub[module][tree][etc] to clone a single folder to use as a quilt series source | 21:46 |
|
rafasc
| may I bikeshed a bit? | 21:47 |
|
| why do you want to track diffs inside git? | 21:47 |
|
ricks_
| the floor is yours | 21:47 |
|
| so right now in my local repo i untarred a kernel | 21:49 |
|
rafasc
| I think it would be better if you made commits from those patches. Then have a branch to represent a series, or tags for single ones. | 21:49 |
|
ricks_
| i have a remote repo on github where I can update it separate from this kernel. the end goal is to be able to fetch updates for the patchsets and have it automatically updated for the kernel tree (this kernel tree being the untarred local repo kernel) | 21:50 |
|
rafasc
| (in the future, you could either merge these branches, or cherry-pick the commits, to apply them individually) | 21:50 |
|
ricks_
| SO what I'm reading is that remote repos aren't meant for what I'm doing right now | 21:51 |
|
| Wait, I would add the remote branch *to* commit...is that right? | 21:52 |
| ← magic_ninja left | 21:52 |
|
rafasc
| remotes are for tracking another clone of the repository, not to track a directory of unrelated files. | 21:52 |
| ← tufteddeer left | 21:53 |
| ← abraxxas left | 21:53 |
| → tufteddeer joined | 21:54 |
|
rafasc
| ricks_: let me see if I understand your scenario. | 21:54 |
| → magic_ninja joined | 21:54 |
|
rafasc
| you have a kernel tar ball from some place. | 21:55 |
|
| and you want to track changes from said tarball? | 21:56 |
|
| to apply on your own kernel? | 21:56 |
|
ricks_
| oh no | 21:56 |
|
| hm | 21:56 |
|
| I'll do a little doodle for you in dpaste | 21:56 |
| → pie_ joined | 21:57 |
| ← nuala left | 22:04 |
| → omnireq joined | 22:04 |
| ← misuto left | 22:05 |
| ← kh31d4r left | 22:05 |
|
ricks_
| rafasc, I *think* this is relevant: https://dpaste.de/4Aaq | 22:05 |
|
| So what my major malfunction may have been was I am following https://www.kernel.org/doc/man-pages/linux-next.html, which is meant to patch over the original repo.. I do not want to do that, and prefer to have the patche files ready to be applied | 22:07 |
|
rafasc
| ricks_: is github.com/oidfjos.git a clone of the kernel? | 22:07 |
|
ricks_
| That is a placeholder for a folder of *.patch files | 22:09 |
|
rafasc
| then git isn't the right tool for this job. | 22:09 |
|
ricks_
| Please explain, I do not understand | 22:09 |
| ← ave_milia left | 22:09 |
|
ricks_
| Sorry to interrupt so early, but I intend to upload the tarball I had so I wouldn't have to clone a tag which owuld be slower. Is it bad practice to not work on the kernel itself, even for personal use? | 22:11 |
|
| (unzipped tarball) | 22:11 |
|
rafasc
| clone a tag would be slower? That can be easily fixed by doing shallow clones for example. | 22:12 |
|
| you're trying to force a patch-workflow into git, which is more suited for a commits workflow. | 22:12 |
|
| It can be done, but I do not see the point. | 22:13 |
| ← Narrat left | 22:13 |
| ← tufteddeer left | 22:14 |
|
rafasc
| If you're willing to sacrifice the layout of the github.com/oidfjos.git repo, (no readmes, just a patch/ directory with the patches, and maybe the readme inside), you can simplify this quite a lot by doing git merge --allow-unrelated-histories. | 22:14 |
| → tufteddeer joined | 22:15 |
|
ricks_
| hm | 22:15 |
|
rafasc
| but otherwise, you'll need to use submodules/subtrees to have control over the place they get included in the other repo. | 22:15 |
|
ricks_
| I'm hearing you, and what I can understand is what what I'm currently doing is the hard way with no benefit | 22:15 |
|
rafasc
| But why not just apply the patches, making commits out of them? Any person interested could fetch from you and cherry-pick the commits. | 22:16 |
|
ricks_
| In your opinion, git clone a tag with depth of 1? How do shallow forks work | 22:16 |
|
| Interesting | 22:16 |
|
rafasc
| it basically clones the files and N commits of history. (But has some limitations) | 22:17 |
|
ricks_
| If sequential order is important, would that affect the utility of using commits like that? | 22:17 |
|
| Thanks btw, this is all really helpful | 22:17 |
|
rafasc
| if sequencial order is important, make a branch out of them. | 22:18 |
|
| users would use $git rebase --onto my_target <first-commit-in-sequence> branch-with-last-commit-in-sequence | 22:19 |
|
| this basically would apply the commits in the same order you made them.. | 22:19 |
| → jottr joined | 22:20 |
| → misuto joined | 22:21 |
|
ricks_
| I see. This is whY I choose to use Quilt instead, but if you don't mind me asking, do people prefer your method in most cases? I've been using tags instead of branches so I wouldn't have too many branches to sort through for incremental patches but obviously taggin has its limitations | 22:22 |
| → LaScoumoune_ joined | 22:22 |
| → kh31d4r joined | 22:23 |
|
ricks_
| I'm going to have to look into rebasing as well. Now that I think about it, rebasinw with commits would be much faster, although I wonder how that would affect quilt | 22:23 |
| ← crose left | 22:26 |
|
ricks_
| Alright I'm going to clone a tag with depth 1 and see how it works out with submodules | 22:26 |
|
rafasc
| if you go with the clone approach, you don't need submodules. | 22:27 |
|
| if you insist about having the .patch files, (files that you can generate from commits with git format-patch, gidd diff, etc), you'll have to do it to accommodate the tree mismatch. | 22:28 |
| → jubal joined | 22:28 |
|
rafasc
| I'll have to go, maybe wait someone else chime in. | 22:29 |
|
ricks_
| Tree mismatch? | 22:29 |
|
| I'm intending for the patchset to only be gor a specific kernel version | 22:29 |
|
| Anyways | 22:29 |
|
| Thanks a lot for the help friend | 22:29 |
|
| +rafasc, | 22:29 |
| ← jubal_ left | 22:30 |
| ← LaScoumoune_ left | 22:32 |
|
ricks_
| I wonder if this means anything? https://dpaste.de/tUUH | 22:33 |
| ← qotta left | 22:35 |
| → alystair joined | 22:36 |
| ← tribly left | 22:40 |
| ← paws_ left | 22:40 |
| → tribly joined | 22:41 |
|
ricks_
| When intending to fork via cli.....nevermind. I'll fork it and clone it from my repo | 22:43 |
| ← jubal left | 22:43 |
| ← tufteddeer left | 22:45 |
| → tufteddeer joined | 22:45 |
| → jubal joined | 22:46 |
| ← jottr left | 22:51 |
| ← yokisuci left | 22:52 |
| ← theoceaniscool left | 22:57 |
| ← cdown left | 23:01 |
| ← Aquazi left | 23:01 |
| ← localhorse left | 23:03 |
| ← tufteddeer left | 23:05 |
| → tufteddeer joined | 23:06 |
| ← Fernando-Basso left | 23:13 |
| ← supernovah left | 23:17 |
| → camsbury joined | 23:18 |
| → libertyprime joined | 23:20 |
| ← justanotheruser left | 23:20 |
|
rafasc
| ricks_: by three mismatch I mean that the files you're putting in the repo (*.patch) do not match the files in the kernel (*.c etc) | 23:21 |
| → justanotheruser joined | 23:21 |
|
rafasc
| ricks_: there are a couple of things to note. | 23:21 |
|
| you have a branch named remove 'rm' | 23:22 |
|
| you probably created it trying to delete a branch. | 23:22 |
| → arinov joined | 23:23 |
|
ricks_
| yes! | 23:23 |
|
rafasc
| also, you are in what we call 'Detached HEAD state' | 23:23 |
|
ricks_
| how the heck did you find me | 23:23 |
|
| wait | 23:23 |
|
| I posted a log earlier | 23:23 |
|
rafasc
| and probably in the middle of a rebase: * (no branch, rebasing master) | 23:24 |
|
ricks_
| sorry for the confusion. I;ve since renoved it | 23:24 |
|
| yeah I wasn't able ti cancel that for some rreason | 23:25 |
|
| I'm nuking it and cloning a fork now | 23:25 |
| ← Whiskey left | 23:25 |
|
rafasc
| git rebase --abort | 23:26 |
|
ricks_
| yeah it didn;t do anything, i gave a knack for breaking things | 23:26 |
| ← camsbury left | 23:26 |
| ← m0viefreak left | 23:27 |
|
ricks_
| RE: mismatch I'll double chec, I've beeen using these since 5.2,0 | 23:32 |
|
rafasc
| Maybe another way you could about this, keeping the patch approach. (with submodules) | 23:33 |
|
| make a repository with your patches, in any way you like, then add the kernel as a submodule. | 23:34 |
| ← n3wborn left | 23:34 |
|
rafasc
| that way, you can can specify the kernel version you intend. And people can clone with --shallow-submodules | 23:35 |
|
| that way, they'll only need to transfer the kernel you're targeting, and not the history of the kernel. | 23:35 |
|
| and if they want to do it in another kernel version, they could just change the submodule to the appropriate version. | 23:36 |
| → im0nde joined | 23:37 |
| ← im0nde_ left | 23:38 |
|
rafasc
| but tracking patches in git is a bit of an anti-pattern. | 23:39 |
| → morozovm joined | 23:39 |
| ← arinov left | 23:40 |
| → Whiskey- joined | 23:42 |
| ← morozovm left | 23:44 |
| ← dartmouthed left | 23:51 |
|
squirrel
| hi, i don't seem to be able to fetch remote branches. `git remote -v` correctly lists a github repo for fetch and push, and `git fetch --all -v` says that master is up to date but lists no other branches, what am i doing wrong? | 23:59 |