IRCloggy #git 2024-05-20

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.

2024-05-20

← lucasta left00:00
← schilive left00:06
→ cixx joined00:07
← Noisytoot left00:16
← cixx left00:17
→ Noisytoot joined00:19
→ lucasta joined00:20
← weko left00:30
← henry40408 left00:31
→ henry40408 joined00:32
← cpackham left00:34
→ cpackham joined00:35
→ cixx joined00:35
→ gvg__ joined00:53
← gvg left00:54
← user_____ left00:55
← Guru_DE left01:02
→ ptrck joined01:02
→ nopjmp_ joined01:03
→ Guru_DE joined01:03
← navi left01:08
← bindu left01:11
← vrach left01:14
→ bindu joined01:20
← cixx left01:29
→ whatsupdoc joined01:31
→ cdown joined01:52
← xdminsy left02:05
→ xdminsy joined02:05
← gsi left02:08
→ gsi joined02:09
→ dermoth joined02:17
→ heebeekey joined02:20
→ konsolebox joined02:21
← lucasta left02:23
→ konsolebox_ joined02:27
← konsolebox left02:27
← aiyunyuner left02:35
→ _xor0 joined02:35
← _xor left02:37
→ aiyunyuner joined02:37
→ _xor joined02:39
← _xor0 left02:41
← aiyunyuner left02:41
→ user_____ joined02:41
→ aiyunyuner joined02:43
← aiyunyuner left02:46
→ aiyunyuner joined02:48
← aiyunyuner left02:52
→ aiyunyuner joined02:54
← aiyunyuner left02:56
← fflam left02:58
→ aiyunyuner joined02:58
← Betal left02:58
→ fflam joined03:00
← limon left03:06
← aiyunyuner left03:07
← thiago left03:07
→ thiago joined03:09
→ aiyunyuner joined03:09
← aiyunyuner left03:14
→ aiyunyuner joined03:16
← henry40408 left03:18
→ henry40408 joined03:19
→ pebble joined03:19
← aiyunyuner left03:20
→ aiyunyuner joined03:22
← aiyunyuner left03:23
→ fstd_ joined03:24
→ aiyunyuner joined03:25
← aiyunyuner left03:25
← xdminsy left03:27
fstd_ → fstd03:28
→ aiyunyuner joined03:28
← aiyunyuner left03:32
→ xdminsy joined03:33
→ aiyunyuner joined03:34
← aiyunyuner left03:36
→ aiyunyuner joined03:38
← aiyunyuner left03:39
→ aiyunyuner joined03:41
← epicout_ left03:42
← aiyunyuner left03:44
→ aiyunyuner joined03:46
→ fdan joined03:53
→ ssserpent joined03:58
← aiyunyuner left04:00
← user_____ left04:01
← cpackham left04:01
→ cpackham joined04:02
→ aiyunyuner joined04:02
← aiyunyuner left04:03
→ aiyunyuner joined04:05
← aiyunyuner left04:07
→ aiyunyuner joined04:09
← aiyunyuner left04:11
→ aiyunyuner joined04:13
← jgh2 left04:13
← FH_thecat left04:13
← aiyunyuner left04:15
→ aiyunyuner joined04:17
← aiyunyuner left04:19
← defjam left04:20
← Game11454 left04:21
→ aiyunyuner joined04:21
→ Game11454 joined04:22
← LiENUS left04:22
→ LiENUS joined04:23
← aiyunyuner left04:24
→ limon joined04:25
→ Gary_Sinise joined04:26
→ aiyunyuner joined04:26
← whatsupdoc left04:29
← fonini left04:29
← aiyunyuner left04:30
→ aiyunyuner joined04:30
→ hbautista_ joined04:31
← Game11454 left04:31
← Mordag left04:31
← aiyunyuner left04:31
→ Game11454 joined04:33
→ defjam joined04:33
→ aiyunyuner joined04:34
← aiyunyuner left04:36
→ aiyunyuner joined04:37
← defjam left04:37
→ jgh2 joined04:38
← aiyunyuner left04:39
← fdan left04:39
← pebble left04:40
→ aiyunyuner joined04:41
← wyclif left04:43
← aiyunyuner left04:46
← jgh2 left04:47
→ aiyunyuner joined04:48
← bket left04:49
← aiyunyuner left04:49
→ defjam joined04:49
→ germ joined04:51
→ aiyunyuner joined04:51
→ bket joined04:52
→ wyclif joined04:54
← defjam left04:55
← pac1 left04:55
→ EvilDMP joined05:00
← aiyunyuner left05:02
→ junyx joined05:03
→ aiyunyuner joined05:04
← aiyunyuner left05:06
← thiago left05:06
→ aiyunyuner joined05:08
← aiyunyuner left05:15
→ aiyunyuner joined05:17
← aiyunyuner left05:22
→ FH_thecat joined05:24
→ aiyunyuner joined05:24
→ defjam joined05:26
← aiyunyuner left05:27
→ aiyunyuner joined05:29
chuanshi ./405:29
← reset left05:32
← aiyunyuner left05:32
← defjam left05:33
→ aiyunyuner joined05:34
← aiyunyuner left05:35
← EvilDMP left05:36
→ aiyunyuner joined05:37
← aiyunyuner left05:38
→ EvilDMP joined05:38
→ aiyunyuner joined05:40
← cpackham left05:40
← EvilDMP left05:41
→ EvilDMP joined05:43
→ aiyunyuner5 joined05:44
← aiyunyuner5 left05:46
← aiyunyuner left05:46
→ defjam joined05:47
→ aiyunyuner joined05:48
← EvilDMP left05:48
→ EvilDMP joined05:50
← EvilDMP left05:50
← aiyunyuner left05:50
← defjam left05:51
→ aiyunyuner joined05:52
→ EvilDMP joined05:53
← aiyunyuner left05:53
← EvilDMP left05:53
→ rahl joined05:54
→ aiyunyuner joined05:55
→ EvilDMP joined05:57
← aO2V left05:58
← aiyunyuner left05:58
→ aiyunyuner joined06:00
← aiyunyuner left06:01
→ aiyunyuner joined06:03
→ defjam joined06:06
← skapata left06:11
← defjam left06:11
→ defjam joined06:12
← aiyunyuner left06:12
← EvilDMP left06:12
→ aiyunyuner joined06:14
→ EvilDMP joined06:14
→ euouae joined06:16
euouae Hello how can I work with a git repo through ssh?06:16
e.g. I have a local host and a remote host and I connect via ssh and both have a copy of a git repo. I want to commit locally and push to remote06:16
should I use sshfs?06:16
← aiyunyuner left06:17
← defjam left06:18
→ aiyunyuner joined06:19
← EvilDMP left06:20
← euouae left06:20
→ EvilDMP joined06:21
→ auci joined06:22
← aiyunyuner left06:22
← EvilDMP left06:24
→ aiyunyuner joined06:24
→ EvilDMP joined06:25
← aiyunyuner left06:27
← EvilDMP left06:28
→ aiyunyuner joined06:29
← auci left06:30
← aiyunyuner left06:30
→ defjam joined06:31
→ aiyunyuner joined06:32
→ mailman joined06:33
← mailman left06:33
→ dsrt^ joined06:34
← jfsimon1981 left06:35
→ EvilDMP joined06:35
→ jfsimon1981 joined06:36
← defjam left06:36
← aiyunyuner left06:36
→ aiyunyuner joined06:38
← EvilDMP left06:39
← aiyunyuner left06:39
→ EvilDMP joined06:40
← EvilDMP left06:40
→ aiyunyuner joined06:41
→ EvilDMP joined06:42
← aiyunyuner left06:44
→ MGF_Fabio joined06:44
← EvilDMP left06:45
→ aiyunyuner joined06:46
→ EvilDMP joined06:46
→ euouae joined06:47
euouae Okay I figured it out, git knows about ssh://06:47
another question is, how can I sign commits in the remote repo without putting my private key in the remote repo?06:47
→ defjam joined06:48
→ dviola joined06:49
← aiyunyuner left06:49
gsish you don't _work_ in that remote repo, you only push to it or fetch from it, after work has happened locally06:50
so signing would have happened locally06:51
→ aiyunyuner joined06:51
gsish (in theory you could push to something that's not bare, but that'd be rare, and you'd have to know what you are doing there)06:53
← aiyunyuner left06:53
gsish (start with the simple setup first, one remote that is bare, one or several repos that sync to it, exchange via the remote)06:53
← defjam left06:53
← EvilDMP left06:55
→ aiyunyuner joined06:55
→ EvilDMP joined06:56
euouae I can't use a bare repo because I need the files on the remote06:56
← junyx left06:56
← aiyunyuner left06:57
euouae I also can't just work locally only because some commands (that generate files) are only available remotely06:57
one solution I have right now is to replay the commits locally06:57
← EvilDMP left06:59
→ aiyunyuner joined06:59
← Gary_Sinise left06:59
→ EvilDMP joined07:00
← aiyunyuner left07:01
gsish why do you "need the files on the remote"?07:01
← EvilDMP left07:01
gsish git is a version control tool, not a deployment tool07:01
and you can have the files elsewhere if you see that as just another repo which syncs to the "central" remote07:02
otherwise, if you insist in using a non-bare remote, then ... find out how to do that, and accept the limitations and consequences that come with that setup07:02
→ aiyunyuner joined07:03
euouae yeah in a proper setup I agree that deployment and VCS are separate07:04
I'd be generating tarballs of version tags then07:04
← aiyunyuner left07:05
euouae but the issue would persist. anyway I guess I can't remotely sign stuff07:05
→ xx joined07:05
→ defjam joined07:06
← hbautista_ left07:06
→ aiyunyuner joined07:07
→ EvilDMP joined07:09
→ mailman joined07:10
← EvilDMP left07:10
← aiyunyuner left07:11
← defjam left07:11
→ EvilDMP joined07:11
← EvilDMP left07:12
gsish if some systems let you, then (am to understand that) it'd be because forges love to create the illusion that you could work on the repo remotely through their UI07:12
but that'd not be a git feature, it'd be a forge's extension, mixing remote storage and file manipulation and amending the repo without going through your local system07:13
→ aiyunyuner joined07:13
gsish in other words, you'd have the remote storage (bare) and the remote "work space" (like your local repo, just not local to you), and something that glues them together07:14
→ EvilDMP joined07:14
← EvilDMP left07:14
→ defjam joined07:14
← mailman left07:17
→ EvilDMP joined07:17
← aiyunyuner left07:17
euouae yeah they create the illusion, I understand that07:18
← EvilDMP left07:18
euouae but I'm not using a forge, I'm using a git repo on a remote that has some file-generation tools and some build procedures07:18
I want to sign those generated files locally, so I have to do a bit of a dance...07:19
→ zetef joined07:19
→ aiyunyuner joined07:19
← defjam left07:19
→ EvilDMP joined07:21
← aiyunyuner left07:21
← EvilDMP left07:21
→ aiyunyuner joined07:23
→ EvilDMP joined07:25
← aiyunyuner left07:27
gsish but signing files (generated build output) and signing commits are two different things, aren't they?07:28
→ aiyunyuner joined07:29
← aiyunyuner left07:31
→ defjam joined07:32
→ john_johnk joined07:33
→ Edward_Brown joined07:33
→ aiyunyuner joined07:33
← aiyunyuner left07:36
← defjam left07:37
→ aiyunyuner joined07:38
euouae I'm not signing generated build output07:40
I'm signing generated configuration files07:40
← aiyunyuner left07:41
→ aiyunyuner joined07:43
→ danse-nr3 joined07:44
euouae it's weird. maybe it doesn't matter. :) maybe I shouldn't be committing generated files even if they're configuration files. who knows. I need to think about it some more07:44
but I can think of imaginary scenarios where what I'm trying to do applies:07:44
if you somehow ssh into a host with a git repo but you *cant* transmit files outside that host... you may still want to sign remotely your changes without storing your privkey in the host.07:45
(and by *cant* I mean for legal reasons)07:45
← wyclif left07:45
euouae Now technically transmission occurs since you're viewing the files on ssh... but yeah. I'm just conjuring situations here; not sure if actually applicable to real life.07:46
← john_johnk left07:47
← aiyunyuner left07:49
→ defjam joined07:49
→ aiyunyuner joined07:51
← defjam left07:55
← aiyunyuner left07:57
→ aiyunyuner joined07:59
→ defjam joined08:07
← aiyunyuner left08:11
← defjam left08:12
→ aiyunyuner joined08:13
← aiyunyuner left08:15
← memset left08:16
→ Left_Turn joined08:16
→ aiyunyuner joined08:17
→ memset joined08:17
← aiyunyuner left08:19
← chiselfuse left08:19
→ chiselfuse joined08:20
→ jmd joined08:20
→ aiyunyuner joined08:21
← aiyunyuner left08:23
→ defjam joined08:24
→ aiyunyuner joined08:25
← aiyunyuner left08:27
→ aiyunyuner joined08:29
← defjam left08:29
← aiyunyuner left08:32
→ aiyunyuner joined08:34
← dermoth left08:36
← aiyunyuner left08:37
→ dermoth joined08:38
euouae well, the reason I want to commit generated configuration files is because of reproducibility08:38
Well, doesn't matter. I control the repo myself and I don't actually need to sign anything anyway. I was just wondering.08:39
→ john_johnk joined08:39
→ aiyunyuner joined08:39
← aiyunyuner left08:41
→ aiyunyuner joined08:43
→ defjam joined08:44
← aiyunyuner left08:45
→ aiyunyuner joined08:47
← defjam left08:48
← aiyunyuner left08:49
→ aiyunyuner joined08:51
← Edward_Brown left08:54
gsish you still can commit generated content and their signatures if you want to08:57
and you can sign commits AFAICS08:57
though when either of that happens on the remote machine, it means that signing will be done remotely, similary08:58
one of them would be a git specific question, the other isn't08:58
← aiyunyuner left08:59
→ aiyunyuner joined09:01
← zetef left09:01
← aiyunyuner left09:04
→ aiyunyuner joined09:06
← aiyunyuner left09:10
→ aiyunyuner joined09:12
euouae I am not sure how to sign remotely09:14
Oh -- you mean I need the privkey in the remote host... I don't want to dothat09:14
← aiyunyuner left09:14
euouae aha. <https://benjamintoll.com/2023/06/07/on-gpg-agent-forwarding/>.09:15
→ hexnewbie joined09:15
euouae So that's how it's done. nice!09:16
→ aiyunyuner joined09:16
euouae es09:17
← aiyunyuner left09:18
→ hgl joined09:18
bookworm do note that you need reasonable trust in the remote, else the forwarding is a very bad idea09:19
→ aiyunyuner joined09:20
→ defjam joined09:20
→ navi joined09:22
← aiyunyuner left09:24
→ aiyunyuner joined09:26
← defjam left09:26
← aiyunyuner left09:28
→ savolla joined09:28
→ aiyunyuner joined09:30
← robo left09:31
← danse-nr3 left09:31
→ robo joined09:31
→ danse-nr3 joined09:31
← aiyunyuner left09:32
→ daniel3 joined09:32
cheater if i have a repository url, what is the best way to turn that into a single, emailable, compressed file that contains all remote branches?09:33
ikke man git-bundle09:34
gitinfo the git-bundle manpage is available at https://gitirc.eu/git-bundle.html09:34
→ aiyunyuner joined09:34
ikke But that does require you to clone the repo first09:34
← foul_owl left09:36
← aiyunyuner left09:36
euouae bookworm: what do you mean? can't signatures always be checked? or are you saying it can make me sign stuff I didn't intend?09:36
bookworm if you forward the agent, anyone with root on the box can sign arbitrary stuff, depending on how you use cred caching / tokens etc09:38
→ aiyunyuner joined09:38
bookworm but even if you don't cache, gpg isn't good at telling you what you are signing, all you get is a pw prompt with no auth09:38
euouae thanks.09:39
← Left_Turn left09:40
← aiyunyuner left09:40
→ Left_Turn joined09:40
→ defjam joined09:40
→ aiyunyuner joined09:42
← aiyunyuner left09:43
→ aiyunyuner joined09:45
→ Traneptora joined09:46
← aiyunyuner left09:47
← keypusher left09:48
→ aiyunyuner joined09:49
← aiyunyuner left09:51
→ aiyunyuner joined09:53
← aiyunyuner left09:56
→ peirik_ joined09:56
→ aiyunyuner joined09:58
→ foul_owl joined09:59
→ keypusher joined09:59
← aiyunyuner left10:00
→ aiyunyuner joined10:02
← aiyunyuner left10:07
→ aiyunyuner joined10:09
← aiyunyuner left10:10
→ aiyunyuner joined10:12
← aiyunyuner left10:14
→ gryf joined10:14
← john_johnk left10:14
→ aiyunyuner joined10:16
← aiyunyuner left10:17
→ aiyunyuner joined10:19
← aiyunyuner left10:21
→ aiyunyuner joined10:23
← aiyunyuner left10:25
→ aiyunyuner joined10:27
← aiyunyuner left10:29
→ aiyunyuner joined10:31
← aiyunyuner left10:32
→ aiyunyuner joined10:34
← aiyunyuner left10:36
→ zetef joined10:38
→ aiyunyuner joined10:38
← aiyunyuner left10:41
→ aiyunyuner joined10:43
← FinnElija left10:44
← aiyunyuner left10:45
→ aiyunyuner joined10:47
← aiyunyuner left10:48
← peirik_ left10:48
→ aiyunyuner joined10:50
→ FinnElija joined10:50
← savolla left10:51
← aiyunyuner left10:52
→ savolla joined10:52
→ aiyunyuner joined10:54
← jmd left10:55
← aiyunyuner left10:56
→ Ox7C5 joined10:58
→ aiyunyuner joined10:58
← daniel3 left10:59
← aiyunyuner left11:00
→ Aiden55 joined11:02
→ aiyunyuner joined11:02
← aiyunyuner left11:03
← cdown left11:04
→ Lord_of_Life_ joined11:04
← Lord_of_Life left11:05
← jfsimon1981 left11:05
→ aiyunyuner joined11:05
→ jfsimon1981 joined11:05
← aiyunyuner left11:07
→ fstd_ joined11:07
Lord_of_Life_ → Lord_of_Life11:07
← savolla left11:07
← fstd left11:07
fstd_ → fstd11:08
→ savolla joined11:09
→ aiyunyuner joined11:09
← aiyunyuner left11:11
← savolla left11:12
→ aiyunyuner joined11:13
← aiyunyuner left11:15
← zetef left11:16
→ aiyunyuner joined11:17
← danse-nr3 left11:19
→ gsekulski joined11:19
← aiyunyuner left11:20
→ aiyunyuner joined11:22
← gsekulski left11:23
← aiyunyuner left11:24
→ savolla joined11:24
→ aiyunyuner joined11:26
← aiyunyuner left11:28
← ssserpent left11:28
→ aiyunyuner joined11:30
← aiyunyuner left11:32
→ aiyunyuner joined11:34
→ ocra8 joined11:34
← aiyunyuner left11:36
→ aiyunyuner joined11:38
← aiyunyuner left11:40
← dsimic left11:41
→ gsekulski joined11:42
→ aiyunyuner joined11:42
→ dsimic joined11:43
← aiyunyuner left11:44
→ aiyunyuner joined11:46
← aiyunyuner left11:50
→ aiyunyuner joined11:52
← aiyunyuner left11:54
→ aiyunyuner joined11:56
← aiyunyuner left11:58
→ blacknova joined12:00
→ aiyunyuner joined12:00
← aiyunyuner left12:01
→ printfdebugging joined12:02
← euouae left12:03
→ aiyunyuner joined12:03
← aiyunyuner left12:05
cheater ikke: at this rate, if i'm compressing stuff, might as well compress the clone12:07
← gsekulski left12:07
→ jmd joined12:07
← j`ey left12:07
→ aiyunyuner joined12:07
← aiyunyuner left12:10
→ aiyunyuner joined12:12
← aiyunyuner left12:14
→ aiyunyuner joined12:16
← aiyunyuner left12:17
→ aiyunyuner joined12:19
← aiyunyuner left12:21
→ john_johnk joined12:22
→ aiyunyuner joined12:23
← aiyunyuner left12:24
→ lojik joined12:25
→ aiyunyuner joined12:27
← aiyunyuner left12:28
→ fonini joined12:29
← fonini left12:29
dob1 checking out a tag is the same as checkout a specific commit right? so I can checkout a tag, create a new branch from this tag and working on it12:29
→ fonini joined12:30
→ aiyunyuner joined12:30
← aiyunyuner left12:31
→ aiyunyuner joined12:33
jbo_ → jbo12:33
← jmd left12:34
← aiyunyuner left12:35
→ jmd joined12:37
→ aiyunyuner joined12:37
← aiyunyuner left12:38
→ danse-nr3 joined12:39
→ aiyunyuner joined12:40
→ Vonter joined12:41
← aiyunyuner left12:42
→ aiyunyuner joined12:44
← aiyunyuner left12:45
ikke Yes12:46
→ aiyunyuner joined12:47
← aiyunyuner left12:49
→ gsekulski joined12:51
→ aiyunyuner joined12:51
→ redbool joined12:53
← aiyunyuner left12:53
→ redbool_ joined12:53
← redbool left12:53
← redbool_ left12:53
→ redbool joined12:53
→ jgh2 joined12:54
→ aiyunyuner joined12:55
← aiyunyuner left12:56
← memset left12:57
→ aiyunyuner joined12:58
← rustyshackleford left12:59
← aiyunyuner left13:00
→ cdown joined13:01
→ aiyunyuner joined13:02
← aiyunyuner left13:04
→ aiyunyuner joined13:06
← aiyunyuner left13:07
→ memset joined13:09
→ aiyunyuner joined13:09
← aiyunyuner left13:11
→ aiyunyuner joined13:13
← aiyunyuner left13:15
← jgh2 left13:17
→ aiyunyuner joined13:17
← aiyunyuner left13:19
→ JordiGH joined13:19
→ aiyunyuner joined13:21
← aiyunyuner left13:23
← ocra8 left13:23
→ aiyunyuner joined13:25
← cdown left13:26
← Murr left13:27
← aiyunyuner left13:27
← memset left13:27
→ memset joined13:27
→ aiyunyuner joined13:29
→ delay joined13:31
← aiyunyuner left13:32
→ aiyunyuner joined13:34
← aiyunyuner left13:35
→ aiyunyuner joined13:37
← aiyunyuner left13:39
→ aiyunyuner joined13:41
← aiyunyuner left13:42
→ aiyunyuner joined13:44
← aiyunyuner left13:47
→ aiyunyuner joined13:49
← defjam left13:50
← aiyunyuner left13:51
← xx left13:53
→ aiyunyuner joined13:53
← aiyunyuner left13:55
→ xx joined13:55
→ aiyunyuner joined13:57
← aiyunyuner left13:59
→ aiyunyuner joined14:01
→ B-J joined14:03
→ defjam joined14:04
← aiyunyuner left14:04
← B-J left14:05
→ matheusmoreira joined14:06
→ aiyunyuner joined14:06
← aiyunyuner left14:07
→ aiyunyuner joined14:09
← defjam left14:09
→ cbreak joined14:09
← printfdebugging left14:11
← aiyunyuner left14:12
→ aiyunyuner joined14:14
← aiyunyuner left14:15
→ defjam joined14:16
→ printfdebugging joined14:17
→ aiyunyuner joined14:17
← aiyunyuner left14:18
→ pebble joined14:18
← danse-nr3 left14:20
→ aiyunyuner joined14:20
← defjam left14:21
← aiyunyuner left14:22
→ thiago joined14:23
→ aiyunyuner joined14:24
← aiyunyuner left14:26
← printfdebugging left14:28
→ aiyunyuner joined14:28
→ rustyshackleford joined14:29
← aiyunyuner left14:29
→ defjam joined14:31
→ aiyunyuner joined14:31
← aiyunyuner left14:33
→ zetef joined14:34
→ aiyunyuner joined14:35
→ danse-nr3 joined14:36
→ gh34 joined14:37
← aiyunyuner left14:37
→ aiyunyuner joined14:39
← pebble left14:40
← aiyunyuner left14:41
→ pebble joined14:41
→ cptaffe joined14:42
→ aiyunyuner joined14:43
← aiyunyuner left14:44
→ aiyunyuner joined14:46
← aiyunyuner left14:49
→ aiyunyuner joined14:51
← gsekulski left14:51
← aiyunyuner left14:53
→ aiyunyuner joined14:55
→ ocra8 joined14:56
← jfsimon1981 left14:56
→ jfsimon1981 joined14:57
← aiyunyuner left14:57
→ themill joined14:57
→ dustinm joined14:58
→ Thanzex0 joined14:58
← cbreak left15:03
→ jensen joined15:04
→ cbreak joined15:06
← cbreak left15:06
→ cbreak joined15:08
← cbreak left15:08
← henry40408 left15:12
→ henry40408 joined15:12
→ cbreak joined15:15
← jfsimon1981 left15:16
→ masoudd joined15:16
→ jfsimon1981 joined15:18
← john_johnk left15:25
→ masber joined15:35
masber hi, for some unknonws reason, I did a git commit and now seems like my git repo is corrupted?15:35
❯ git status15:35
fatal: unable to read 41d45593cbbde062cbc6404f24cf3dcebbd1a7ec15:35
grawity what kind of filesystem/disk/device is it on?15:36
masber fatal: bad object 41d45593cbbde062cbc6404f24cf3dcebbd1a7ec15:36
the default ubuntu uses15:37
let me check15:37
grawity is WSL involved?15:37
masber ext415:38
no windows involved, this is linux installation, not even dual boot15:39
no vm, no container15:39
← masber left15:39
grawity do you have any warnings/errors in `dmesg`, then?15:39
→ masber joined15:40
grawity do you have any warnings/errors in `dmesg`, then?15:40
masber let me check15:41
→ junyx joined15:41
→ duxsco joined15:43
masber nothing in dmesg that rings the bell15:44
just some spotify denied messages15:44
← MGF_Fabio left15:45
grawity does `git ls-files | grep 41d4` show which file that was supposed to be?15:45
masber no, output is empty15:45
← masber left15:45
→ masber joined15:46
masber I can't even see that commit id in the git log15:46
grawity most likely that's not a commit id, it's a blob (file) id15:46
masber should I just make a small change to any file and try to commit again?15:47
grawity I would move .git/objects/41/d4559... off to the side (or even rm it if it somehow ended up as a 0-byte file), then run a `git fsck` to check if anything from the commit history is missing (or if it's just an 'added'/staged file)15:47
masber ok15:48
→ gsekulski joined15:49
masber there is no such file15:50
grawity does git fsck complain?15:51
masber I mean, `find .git/objects/ -name "d4559*"` returns nothing15:51
yes fsck complains https://dpaste.org/t2Pjw/raw15:52
grawity move .git/index aside and check again, both `git status` and `git fsck`15:52
→ acidbong joined15:53
masber git fsck not does not complain anymore after moving index somewhere else15:54
grawity if fsck is fine, `git reset` will build a new index and you can probably continue working from there15:55
masber ❯ git fsck15:55
Checking object directories: 100% (256/256), done.15:55
Checking objects: 100% (6667/6667), done.15:55
yep15:56
grawity I don't 100% understand the internals of "cache-tree" (another name for index, really) but it seems like only some stuff that was staged but not yet commited that went missing15:56
i.e. the actual commit history is fine so you can carry on from there15:56
masber thank you very much, that was scary15:56
grawity tbh what's scary is that it happened at all. normally files don't just disappear, even from within .git15:57
masber yes...15:57
grawity well, as long as you still have the working files, recovering from a damaged commit wouldn't have been much harder anyway, it'd be mostly finding an older commit ID and rolling back to that -- making the new commit disappear -- and just re-doing the commit again15:59
← chuanshi left16:00
→ skapata joined16:02
→ Haozilla joined16:04
→ kyber joined16:04
← JordiGH left16:05
→ chuanshi_ joined16:05
→ hbautista_ joined16:07
→ JordiGH joined16:08
← Haozilla left16:09
→ qgnox joined16:09
→ cixx joined16:17
← JordiGH left16:18
→ bn_work joined16:18
← masber left16:20
→ printfdebugging joined16:20
→ whatsupdoc joined16:22
← Aiden55 left16:23
← danse-nr3 left16:27
→ danse-nr3 joined16:27
bn_work Hi, git 2.24.3, 2-person team (I maintain + 2nd jr "dev"). Jr. "dev" only creates topic branches which myself and other senior devs review prior to merging to main. I have my pulls set to rebase by default. Q: I had a topic branch that had several changes (including a re-merging from main into it back on 2024-03-27), unfortunately none of these 5 commits were pushed (I don't think the jr. dev pushed anything). Now today when I `git16:28
pull`-ed I notice the merge commit has now disappeared and all my other commits have been re-applied with today's date. Q2: What happened to the merge commit?? Q3: How do I get my original commit dates back?16:28
→ hwpplayer1 joined16:29
→ Aiden55 joined16:31
→ davidsenk joined16:32
← pebble left16:33
→ pebble joined16:34
→ JordiGH joined16:35
→ ZMarkGC joined16:36
← junyx left16:37
← hwpplayer1 left16:38
→ hwpplayer1 joined16:41
← zetef left16:42
→ junyx joined16:44
← fling left16:48
← chiselfuse left16:48
→ quizzi joined16:48
→ ueberall joined16:48
→ Benett joined16:48
→ fling joined16:49
→ chiselfuse joined16:49
→ farn_ joined16:49
← hbautista_ left16:59
← delay left17:04
→ hamburgler joined17:10
→ john_johnk joined17:15
← danse-nr3 left17:15
← masoudd left17:16
← gsekulski left17:17
→ PantelicGR joined17:20
→ hdh joined17:23
← blacknova left17:29
→ masoudd joined17:30
← cixx left17:31
← john_johnk left17:31
← junyx left17:31
← masoudd left17:32
→ masoudd joined17:33
→ gsekulski joined17:33
← EvilDMP left17:35
← ghost43 left17:37
← xx left17:37
← fling left17:37
← bindu left17:37
← gildasio left17:37
← FinnElija left17:37
← chiselfuse left17:37
→ bindu joined17:38
→ xx joined17:39
← bindu left17:39
→ fling joined17:40
→ bindu joined17:40
→ ghost43 joined17:41
→ chiselfuse joined17:42
→ gildasio joined17:42
→ FinnElija joined17:43
→ danse-nr3 joined17:46
← FinnElija left17:49
← gsekulski left17:50
→ FinnElija joined17:50
← gildasio left17:52
→ gildasio joined17:53
← danse-nr3 left17:54
← ocra8 left18:00
→ Betal joined18:01
← qgnox left18:06
← Ox7C5 left18:10
← defjam left18:13
← kyber left18:24
→ defjam joined18:25
→ ocra8 joined18:26
→ qgnox joined18:28
→ rsx joined18:28
→ michele joined18:30
← defjam left18:30
← jfsimon1981 left18:31
→ jfsimon1981 joined18:31
← JordiGH left18:34
← duxsco left18:35
→ bagatur joined18:36
→ tirnanog joined18:38
→ duxsco joined18:40
← duxsco left18:40
← matheusmoreira left18:49
→ matheusmoreira joined18:53
→ sadome joined18:54
← sadome left18:54
→ thiago_ joined18:54
← thiago left18:57
→ defjam joined18:59
← matheusmoreira left19:00
← masoudd left19:00
← jfsimon1981 left19:01
→ duxsco joined19:01
→ jfsimon1981 joined19:01
← duxsco left19:03
← printfdebugging left19:03
→ printfdebugging joined19:03
← printfdebugging left19:07
→ mud joined19:07
→ printfdebugging joined19:07
→ rigid joined19:08
→ playonverbs_ joined19:08
← thiago_ left19:09
→ thiago joined19:13
→ duxsco joined19:14
→ sam113102 joined19:16
sam113102 → sam11310119:18
← thiago left19:19
← Vonter left19:20
← pebble left19:20
→ Vonter joined19:22
→ thiago joined19:23
→ beber_ joined19:23
→ matheusmoreira joined19:28
→ k_sze joined19:32
k_sze What's the correct way to locally remove a branch that I have fetched but not checked out, and that seems to have disappeared from the remote?19:36
← defjam left19:38
k_sze Just delete the corresponding ref file from `.git/refs/`?19:39
ikke k_sze: either git fetch --prune <remote> to automatically remove any remote tracking branch that was removed from the remote, or git branch -dr <remote>/<name>19:39
→ AmR joined19:39
jast k_sze: the easy way to clean up everything is "git fetch --prune", but you can also do "git branch -r -d origin/mybranch"19:39
k_sze thanks19:39
← savolla left19:41
→ savolla joined19:45
→ user_____ joined19:48
← savolla left19:49
→ kus joined19:50
← rsx left19:52
→ thuna` joined19:55
→ JordiGH joined20:00
→ gsekulski joined20:01
← qgnox left20:02
← gsekulski left20:05
→ defjam joined20:09
Aiden55 → pausadd20:15
← defjam left20:15
← Left_Turn left20:18
→ theoceaniscool joined20:20
→ zetef joined20:23
→ joakimk joined20:23
→ Left_Turn joined20:25
← tirnanog left20:25
→ defjam joined20:30
← konsolebox_ left20:32
→ tirnanog joined20:33
← user_____ left20:33
← bagatur left20:34
→ user_____ joined20:36
→ cpackham joined20:37
→ gsekulski joined20:37
← gsekulski left20:42
→ gsekulski joined20:42
← duxsco left20:44
→ joakimk40 joined20:46
← thiago left20:47
→ EvilDMP joined20:49
← joakimk left20:49
→ Coop joined20:50
pausadd → Ocupado20:56
→ AmR_ joined21:00
← AmR left21:01
AmR_ → AmR21:01
→ matheusm1reira joined21:02
← matheusmoreira left21:05
→ cabazon12 joined21:08
← matheusm1reira left21:08
← AmR left21:13
← cabazon12 left21:20
→ Murr joined21:22
← defjam left21:24
→ defjam joined21:26
← zetef left21:33
← misanthropos left21:35
→ thiago joined21:37
→ Flow joined21:43
← hwpplayer1 left21:45
bn_work so anyone have thoughts on my predicament? :|21:46
weaksauce what is your predicament bn_work21:49
← ocra8 left21:50
← user_____ left21:54
bn_work weaksauce: posted it here 5 hours and 20 mins ago (ok to repost?)21:57
weaksauce yeah should be fine21:58
bookworm bn_work: merge commits go away unless you instruct rebase to keep em (--rebase-merges)22:03
and you can get it back from the reflog, then retry22:03
← jmd left22:04
bookworm as for the date... the author date won't change, the commit date will22:04
← gh34 left22:06
← thiago left22:06
→ Zumo joined22:09
→ oikos joined22:13
→ misanthropos joined22:15
← theoceaniscool left22:16
← PantelicGR left22:16
← joakimk40 left22:18
→ delay joined22:29
→ ferdna joined22:33
← Lord_of_Life left22:38
→ Lord_of_Life joined22:39
→ reset joined22:40
← reset left22:40
→ reset joined22:41
← m0viefreak left22:43
← reset left22:46
bn_work bookworm: ok, how do I use the reflog to get back the merge commit?22:54
← xx left22:57
→ reset joined22:58
← Left_Turn left23:00
→ snedd joined23:00
← cpackham left23:03
weaksauce bn_work `git reflog` shows you were the head changed positions. you can create a branch on where the head was before it went south23:04
just use the hash of the commit where you want it23:04
← snedd left23:05
bn_work weaksauce: ok, then is there a way to re-apply the local changes with the original commit dates?23:05
(still a bit confused why the merge commit got wiped)23:06
weaksauce i am not sure but i never use pull because of this kind of stuff happening23:06
you might be able to rebase? and use something like --committer-date-is-author-dat23:08
--committer-date-is-author-date23:08
above my paygrade and you should probably have some backups going on23:08
bn_work nothing has been pushed yet23:09
rebase always seems a safer way VS merge conflicts, that's why I have it setup that way, but didn't realize a merge commit would disappear if that was done.23:15
or commit dates getting "wiped out"23:15
← oikos left23:17
→ oikos` joined23:18
→ thiago joined23:21
→ oikos`` joined23:24
← oikos` left23:26
← thiago left23:27
→ thiago joined23:31
← Nixkernal left23:32
→ Gary_Sinise joined23:36
← delay left23:37
Ocupado → pausadd23:43
→ delay joined23:43
← jkl left23:44
→ jkl joined23:44
← delay left23:45
→ AmR joined23:46
← kus left23:54
→ Erisa joined23:55

Logs Search ←Prev date Next date→ Channels Documentation