IRCloggy #git 2021-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.

2021-05-18

→ mindCrime joined00:01
→ tiin57 joined00:02
→ specing_ joined00:04
→ henri joined00:08
← specing left00:08
specing_ → specing00:08
→ DevAntoine joined00:10
← DevAntoine left00:14
← Gurkenglas left00:14
← justanotheruser left00:26
← mowcat left00:27
← tiin57 left00:28
→ tiin57 joined00:31
→ tadz1k joined00:31
← m0viefreak left00:41
← monolithic left00:42
← nuala2 left00:43
← gearnode left00:43
→ nuala2 joined00:44
← SwiftMatt left00:45
← gschanuel left00:47
→ gschanuel joined00:48
← causasui left00:48
→ edlou joined00:51
→ s2013 joined00:57
← tiin57 left00:58
→ tiin57 joined01:01
← nizhm left01:03
→ long4mud joined01:03
→ abstrn joined01:08
→ nizhm joined01:08
← tejr left01:09
← jpe left01:12
→ jpe joined01:12
← Sixtine left01:12
← nizhm left01:13
→ nizhm joined01:14
← Gustavo6046 left01:14
→ Gustavo6046 joined01:15
← henri left01:17
← tiin57 left01:28
→ tiin57 joined01:32
→ drbean_ joined01:47
→ jetchisel joined01:47
← nizhm left01:48
→ nizhm joined01:48
→ nsc joined01:51
← nsc_ left01:52
← gpanders left01:54
→ gpanders joined01:55
← OnkelBlade left01:56
→ Flaghacker joined01:57
← tiin57 left01:58
← tryte left02:00
→ tryte joined02:00
← User458764 left02:01
← crose left02:01
→ tiin57 joined02:01
← gpanders left02:09
→ DevAntoine joined02:11
← DevAntoine left02:15
→ causasui joined02:19
← thomasross left02:22
← FFY00_ left02:22
→ FinnElija joined02:22
finn_elija → Guest4092902:22
FinnElija → finn_elija02:22
← Guest40929 left02:25
→ FFY00_ joined02:25
← FFY00_ left02:26
→ FFY00_ joined02:26
← tiin57 left02:28
← CryptoClub left02:28
→ tiin57 joined02:32
→ CryptoClub joined02:32
← ev left02:32
→ ev joined02:33
← causasui left02:38
→ a6a45081-2b83 joined02:42
→ tang^ joined02:47
→ gpanders joined02:49
← s2013 left02:49
← pulse left02:52
← a6a45081-2b83 left02:54
→ a6a45081-2b83 joined02:56
← tiin57 left02:58
← edlou left02:59
← AlpineLlama left03:00
→ irc_user joined03:01
→ tiin57 joined03:01
→ AlpineLlama joined03:02
→ f33f046c-a02e joined03:04
← a6a45081-2b83 left03:05
← AlpineLlama left03:06
→ AlpineLlama joined03:06
→ ghormoon_ joined03:06
← ghormoon left03:06
← mindCrime left03:08
→ SwiftMatt joined03:09
irc_user I have a master branch and a feature branch which after several commits has been merged back into master. There is one commit in the master branch that happened before the feature was merged that is exactly the same as a commit in the feature branch that I want to squash/delete/move. Is there a way to do this? I tried dropping it during an interactive rebase but that didn't seem to do anything at all.03:11
→ ferdna joined03:13
← arcatech left03:21
→ justanotheruser joined03:22
irc_user I keep trying to delete/squash it but then I log the graph and it looks exactly the same after the rebase03:24
→ arcatech joined03:24
← sybariten left03:25
← tang^ left03:27
← tiin57 left03:28
← mohab left03:28
→ mohab joined03:29
→ tiin57 joined03:31
← blue_penquin left03:32
→ blue_penquin joined03:33
← tadz1k left03:34
→ KeithAdams joined03:38
← arcatech left03:38
← mohab left03:40
→ mohab joined03:40
← sudoforge left03:40
← gschanuel left03:42
→ gschanuel joined03:42
← krofe left03:43
← bket left03:48
→ shabius_ joined03:49
← endiruna left03:50
← shabius left03:51
← Flaghacker left03:51
→ Flaghacker joined03:51
→ bket joined03:52
← hussam left03:57
← tiin57 left03:58
→ causasui joined03:59
→ hussam joined03:59
→ tiin57 joined04:02
← smaeul left04:02
→ s2013 joined04:03
→ powerhouse joined04:03
← joako left04:03
← Xenguy left04:04
→ joako joined04:04
← haritz left04:06
→ haritz joined04:06
← haritz left04:06
→ haritz joined04:06
← hussam left04:06
← gast0n left04:07
← AbleBacon left04:10
→ DevAntoine joined04:12
→ R2robot joined04:15
← DevAntoine left04:17
← causasui left04:18
ikke irc_user: did you try to revert it?04:24
man git revert04:24
gitinfo the git-revert manpage is available at https://gitirc.eu/git-revert.html04:24
→ Guest20 joined04:25
irc_user ikke: Thank you, I will read, but I should say I realized that without the commit I am trying to delete, the git history would be completely linear since that was the only commit that occured in master before I merged back, so maybe that's why it won't let me squash it?04:26
ikke !situation04:26
gitinfo Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de/` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)04:26
→ maxzor joined04:27
← tiin57 left04:28
→ sybariten joined04:30
→ tiin57 joined04:31
→ mindCrime joined04:33
← s2013 left04:35
← stats4647 left04:36
irc_user This is the exact situation, if you don't mind me anonymizing it. Commits 1 and 3 are exactly the same, and squashing/deleting commit 1 doesn't seem to do anything. https://www.irccloud.com/pastebin/CKkk1Nxj/04:36
→ stats4647 joined04:37
← stats4647 left04:41
← Gustavo6046 left04:48
← mindCrime left04:48
irc_user You know what, I think I wasn't seeing the squash because I was logging with --branches, damn.04:51
← f33f046c-a02e left04:55
← tiin57 left04:58
→ tiin57 joined05:02
→ stats4647 joined05:08
← stats4647 left05:12
← Betal left05:17
→ aakashi2001 joined05:17
irc_user Oh, I had wrongly assumed that the reflog stored all the previous states of the repo, and if you reset to one it would bring the entire repo, including all branches, to that state. But it only resets the current branch, which makes `--branches` the other branch which was not reset in the log.05:23
← hqdruxn08 left05:24
← tiin57 left05:28
→ monolithic joined05:28
→ TK__ joined05:28
← orbyt_ left05:31
→ tiin57 joined05:32
← dino82 left05:35
← madewokherd left05:36
← aakashi2001 left05:36
→ sord937 joined05:45
← Guest20 left05:48
← SwiftMatt left05:49
→ dino82 joined05:51
← dino82 left05:51
→ dino82 joined05:51
← dino82 left05:53
→ dino82 joined05:53
← dino82 left05:53
→ dino82 joined05:53
← bamdad left05:54
→ bamdad_ joined05:55
← tiin57 left05:58
← jetchisel left05:59
← thiago left06:00
→ hqdruxn08 joined06:00
→ tiin57 joined06:02
→ jetchisel joined06:02
→ zoorat joined06:06
→ darkbit joined06:11
← zoorat left06:12
→ DevAntoine joined06:12
← DevAntoine left06:17
→ contagious_meow joined06:19
← ferdna left06:19
← LordRyan left06:21
→ pizdets joined06:23
→ xrisovalantis joined06:25
→ jstein joined06:27
← tiin57 left06:28
→ salitos joined06:31
→ tiin57 joined06:31
→ clime joined06:32
← contagious_meow left06:35
← dino82 left06:35
→ v01d4lph4 joined06:35
→ mindCrime joined06:36
→ lankanmon joined06:37
→ dino82 joined06:38
← dino82 left06:38
→ dino82 joined06:38
→ DevAntoine joined06:39
← CryptoClub left06:42
→ Paradisee joined06:43
→ CryptoClub joined06:44
← dino82 left06:44
← clime left06:48
→ dino82 joined06:48
← dino82 left06:48
→ dino82 joined06:48
→ feriman joined06:49
← xissburg left06:53
← v01d4lph4 left06:53
→ snow joined06:53
→ v01d4lph4 joined06:54
← snow left06:55
→ rfuentess joined06:55
→ snow joined06:55
← powerhouse left06:56
← snow left06:57
← Lord_of_Life left06:57
→ Lord_of_Life joined06:58
→ stats4647 joined06:58
← tiin57 left06:58
→ yamz joined07:00
→ tiin57 joined07:01
← salitos left07:04
→ noidea joined07:04
← unluckyshrubber- left07:05
← stats4647 left07:07
→ LordRyan joined07:07
← yamz left07:08
→ yamz joined07:08
→ def_jam joined07:09
← eblip left07:09
← richbridger left07:10
→ richbridger joined07:14
← mindCrime left07:14
→ Aquazi joined07:19
→ Guest20 joined07:19
← [twisti] left07:19
← mohab left07:24
← tiin57 left07:28
→ tiin57 joined07:32
→ drbean- joined07:33
← drbean_ left07:33
→ contagious_meow joined07:36
← yamz left07:36
→ long4mud_ joined07:40
← long4mud left07:42
→ long4mud joined07:45
← long4mud_ left07:45
Timvde Hmm, a colleague of mine is seeing "warning: There are too many unreachable loose objects; run 'git prune' to remove them."07:49
← _nick_ left07:50
→ alexeyneudat joined07:50
→ _nick_ joined07:51
← tiin57 left07:58
← contagious_meow left08:01
→ salitos joined08:01
→ tiin57 joined08:02
← dqx left08:03
osse I suggest running git prune08:04
→ chele joined08:09
← salitos left08:10
→ salitos joined08:10
← lnxd left08:11
← gigasu_shida left08:13
→ contagious_meow joined08:13
← salitos left08:13
← howdoi left08:14
← contagious_meow left08:14
→ contagious_meow joined08:14
→ lnxd joined08:16
← contagious_meow left08:16
→ contagious_meow joined08:17
→ endiruna joined08:20
apo Sounds like your colleague rebases a lot08:21
→ jimmiehansson joined08:21
→ gearnode joined08:22
← lnxd left08:23
→ OnkelBlade joined08:24
→ clime joined08:24
rfuentess +1 to osse . Git suggestions normally are very useful08:26
→ c4017 joined08:27
← c4017_ left08:27
→ lnxd joined08:28
← tiin57 left08:28
← clime left08:30
← fabs left08:30
→ planetcall|work joined08:30
← Gigi-- left08:30
→ tiin57 joined08:31
→ fabs joined08:33
← _nick_ left08:34
← chele left08:37
→ chele joined08:37
← TK__ left08:42
→ Heisenberg joined08:43
→ c4017_ joined08:44
→ Rashad joined08:45
← c4017 left08:45
→ stats4647 joined08:46
← alexeyneudat left08:47
← stats4647 left08:50
→ mozgalom joined08:51
← mozgalom left08:52
→ clime joined08:53
→ mozgalom_ joined08:53
← tiin57 left08:58
→ User458764 joined08:58
→ tiin57 joined09:02
← feriman left09:02
→ PJBoy joined09:02
→ salitos joined09:02
← contagious_meow left09:03
← salitos left09:03
→ salitos joined09:04
← drbean- left09:04
← jaziz left09:04
→ onizu joined09:05
← User458764 left09:06
← cliluw left09:11
→ mohab joined09:11
→ unluckyshrubbery joined09:13
→ clime1 joined09:16
→ rond_ joined09:16
→ tm007 joined09:19
← clime1 left09:25
← tiin57 left09:28
← darkbit left09:31
→ tiin57 joined09:31
→ darkbit joined09:35
← hnOsmium0001 left09:35
← Guest20 left09:39
← irc_user left09:41
← monolithic left09:41
← ntwk left09:42
→ ntwk joined09:42
← swensson left09:43
→ pepa joined09:44
→ botnet joined09:45
pepa so I made a pull request in git.... a reviewer asked me to make some changed to the code....... I made and pushed those changes..... now I make a new pull request or somehow update the pull request I had already created?09:45
← botnet left09:45
→ mindCrime joined09:46
→ botnet joined09:46
henk pepa: how did you make a pull request _in git_?09:47
pepa in bitbucket09:47
→ krofe joined09:48
nedbat pepa: the pull request is probably updated automatically. Did you take a look at it on bitbucket?09:53
→ shivam_ joined09:55
→ monolithic joined09:56
← salitos left09:57
→ salitos joined09:57
← monolithic left09:57
← tiin57 left09:58
→ monolithic joined09:58
← monolithic left09:59
→ monolithic joined10:00
→ crose joined10:01
→ tiin57 joined10:01
→ feriman joined10:03
j416 henk: for reference, git does have a pull request tool (but it doesn't store them in any way afaik)10:03
→ yamz joined10:04
→ Guest20 joined10:05
← botnet left10:06
← salitos left10:07
→ klonn joined10:07
nedbat it's a fact of life here that people asking questions will blur the distinctions between git and git hosting.10:08
j416 indeed.10:08
nedbat and it would be better to not raise our eyebrows at it :)10:10
→ mowcat joined10:11
← nitrix left10:12
→ NeoCron joined10:13
← EvilJStoker left10:13
← mindCrime left10:13
→ EvilJStoker joined10:15
j416 not sure what you mean10:16
→ nitrix joined10:17
→ calcul0n_ joined10:17
← aidalgol left10:18
nedbat j416: henk's question seemed like feigned incredulity10:20
→ AbleBacon joined10:24
→ Ishutin joined10:26
← Rashad left10:27
← tiin57 left10:28
← Ishutin_ left10:29
← jtfidje left10:30
→ jtfidje joined10:30
→ tiin57 joined10:32
← untakenstupidnic left10:33
j416 ah, I thought your remark was at what I said.10:34
nedbat sorry, no10:37
← klonn left10:38
← kini left10:39
→ kini joined10:40
→ amahl joined10:49
→ olx69 joined10:49
→ michmich joined10:50
← downunder left10:51
→ downunder joined10:53
← CryptoClub left10:54
→ CryptoClub joined10:55
← feriman left10:57
→ calcul0n__ joined10:57
← calcul0n_ left10:58
← tiin57 left10:58
← lnxd left10:59
← shivam_ left11:00
→ lnxd joined11:00
→ tiin57 joined11:02
← lnxd left11:03
→ lnxd joined11:03
→ salitos joined11:03
← yamz left11:03
→ Rashad joined11:04
← duderonomy left11:04
← lnxd left11:05
→ lnxd joined11:05
henk j416: uuh, can you provide a bit more info? is it a subcommand?11:06
← lnxd left11:06
osse man git-request-pull11:06
gitinfo the git-request-pull manpage is available at https://gitirc.eu/git-request-pull.html11:06
→ lnxd joined11:06
← siers left11:06
henk j416, osse: thanks11:06
← lnxd left11:07
→ lnxd joined11:08
← lnxd left11:08
→ lnxd joined11:08
← finn_elija left11:11
→ finn_elija joined11:11
→ Benzi-Junior joined11:11
← rond_ left11:14
← Tk55 left11:16
→ shivam_ joined11:17
→ ghoti_ joined11:19
← ghoti left11:20
ghoti_ → ghoti11:20
→ mobidrop joined11:23
→ botnet joined11:24
→ awt joined11:24
← Kaivo left11:25
→ Tk55 joined11:26
→ Xenguy joined11:27
← tiin57 left11:28
→ computeiro joined11:30
→ tiin57 joined11:31
← SantiTheHuman left11:32
← palooka-jock left11:34
← salitos left11:35
→ contagious_meow joined11:35
→ SirFancyPantsOfP joined11:37
→ mellernoia joined11:39
Walex → loser_walex11:41
→ pulse joined11:46
→ riksu-raksu joined11:48
→ salitos joined11:49
→ Guest15 joined11:49
← contagious_meow left11:50
← riksteri left11:52
→ User458764 joined11:52
← tiin57 left11:58
← rustyshackleford left11:59
← botnet left11:59
→ wender joined12:01
→ tiin57 joined12:02
← salitos left12:03
→ yamz joined12:04
← computeiro left12:04
→ specing_ joined12:05
→ powerhouse joined12:05
← specing left12:08
specing_ → specing12:08
→ rewrited joined12:09
→ Technodrome joined12:09
→ dslegends joined12:10
← Marmotte left12:11
→ Marmotte joined12:11
henk I made changes to a file and I am almost certain I had those committed but they are not there. IIRC all commits, i.e. even ones that are not in any branch, are recorded somewhere in .git. I’d like to grep those to try and find my changes. How do I do that?12:13
← Aquazi left12:13
→ klonn joined12:15
osse try git fsck --lost-found12:15
→ cbergoon joined12:16
← cbergoon left12:16
→ cbergoon joined12:16
→ clime1 joined12:17
→ palooka-jock joined12:18
→ ghoti_ joined12:21
→ a6a45081-2b83 joined12:21
← ghoti left12:22
ghoti_ → ghoti12:22
→ computeiro joined12:22
henk osse: thanks, that found a lot of dangling commits12:23
← wender left12:24
← shivam_ left12:26
← tiin57 left12:28
← a6a45081-2b83 left12:30
→ tiin57 joined12:31
← cbergoon left12:32
→ drbean_ joined12:33
→ arcatech joined12:37
← sweatsuit left12:39
← dslegends left12:44
← irrgit left12:45
→ sweatsuit joined12:45
→ dslegends joined12:46
→ Gurkenglas joined12:46
→ Lord_of_Life_ joined12:49
← Lord_of_Life left12:50
Lord_of_Life_ → Lord_of_Life12:50
← Noisytoot left12:51
→ Noisytoot joined12:51
→ Aelius joined12:56
← tiin57 left12:58
→ tiin57 joined13:01
→ feriman joined13:02
→ botnet joined13:04
→ salitos joined13:04
← yamz left13:07
← xelxebar left13:08
← satifant left13:08
→ xelxebar joined13:09
→ satifant joined13:11
← Guest15 left13:13
← klonn left13:16
→ hussam joined13:16
← satifant left13:18
→ zebrag joined13:21
← clime1 left13:22
← rangergord left13:22
→ klonn joined13:22
← cpackham left13:23
← Mathijs[m]4 left13:23
← morguldir left13:23
← squirrel left13:23
← Tobi[m]2 left13:23
→ sudoforge joined13:23
← kadoban left13:23
← spacetato left13:23
← ForeverNoob[m] left13:23
← MarienvanOverbee left13:23
← ronny left13:24
← sudoforge left13:24
→ sudoforge joined13:24
→ Mathijs[m]4 joined13:25
→ satifant joined13:25
← satifant left13:25
→ satifant joined13:25
← infernix left13:26
→ cpackham joined13:27
← mowcat left13:27
→ infernix joined13:28
← tiin57 left13:28
→ kadoban joined13:28
← wallacer left13:29
← tm007 left13:29
→ morguldir joined13:29
← noahmg123 left13:29
← drupol left13:30
← itok left13:31
→ CodeSlingerPaul joined13:31
→ MarienvanOverbee joined13:31
→ spacetato joined13:31
→ squirrel joined13:31
→ tiin57 joined13:31
← dmlloyd left13:32
← tonythomas left13:32
→ ForeverNoob[m] joined13:32
← mithro left13:32
→ KnoP joined13:32
← Guest20 left13:33
← JaseW left13:33
← mustache_ride left13:33
→ drupol joined13:33
→ tonythomas joined13:34
→ ronny joined13:34
← angular_mike left13:34
→ itok joined13:34
← itok left13:36
→ rangergord joined13:36
→ Tobi[m]2 joined13:36
← drupol left13:36
→ dmlloyd joined13:37
→ itok joined13:37
→ mustache_ride joined13:37
→ drupol joined13:37
→ noahmg123 joined13:37
→ angular_mike joined13:38
→ JaseW joined13:38
→ mithro joined13:38
→ wallacer joined13:39
← mithro left13:39
← itok left13:41
→ itok joined13:42
→ karx joined13:43
→ mithro joined13:44
← drbean_ left13:48
← salitos left13:48
← shicks255 left13:49
→ salitos joined13:49
→ shicks255 joined13:49
→ AckSynAck joined13:52
← voker57 left13:53
← Technodrome left13:53
← ezakimak left13:53
→ rond_ joined13:53
← corelax left13:54
→ ezakimak joined13:54
← esc left13:55
→ esc joined13:55
← esc left13:55
→ esc joined13:55
→ thiago joined13:56
→ corelax joined13:56
← clupus left13:57
← tiin57 left13:58
→ Flaghacker_ joined13:58
← Flaghacker left13:58
Flaghacker_ → Flaghacker13:58
→ c4017__ joined13:59
← c4017_ left13:59
← jimklimov1 left13:59
← cdown left13:59
→ escherial joined13:59
→ Xenguy_ joined13:59
→ infl00p2 joined13:59
→ PipeItToDevNull5 joined13:59
→ clupus joined13:59
← AllenJB left14:00
← Unode left14:00
← LuKaRo left14:00
← YoungFrog left14:00
← markus-k_ left14:00
← mven left14:00
← yourfate left14:00
→ flying_sausages_ joined14:00
→ LiENUX joined14:00
← tec__ left14:00
→ markus-k joined14:00
→ yourfate joined14:00
→ jimklimov joined14:00
→ KeithAdams_ joined14:00
← d-fence_ left14:00
← oztunan left14:00
→ mven joined14:00
→ YoungFrog joined14:00
← YoungFrog left14:00
→ YoungFrog joined14:00
→ cluelessperson_ joined14:00
← blahdodo left14:00
→ oztunan joined14:01
→ Unode joined14:01
→ cdown joined14:01
→ Noisytoot_ joined14:01
→ blahdodo joined14:01
← senux left14:01
← shicks255 left14:01
← Xenguy left14:01
← PipeItToDevNull left14:01
← infl00p left14:01
← escherial9 left14:01
← mohab left14:01
← LiENUS left14:01
← jrm left14:01
← flying_sausages left14:01
← Noisytoot left14:01
← Anthaas left14:01
← cluelessperson left14:01
← KeithAdams left14:01
← theorangeone left14:01
→ s2013 joined14:01
PipeItToDevNull5 → PipeItToDevNull14:01
infl00p2 → infl00p14:01
KeithAdams_ → KeithAdams14:01
→ tiin57 joined14:01
→ jrm2 joined14:01
← bgs left14:01
→ AllenJB joined14:02
jrm2 → jrm14:02
→ shicks255 joined14:02
→ Anthaas joined14:02
→ theorangeone joined14:03
→ tec__ joined14:03
→ LuKaRo joined14:03
→ d-fence_ joined14:03
→ bgs joined14:03
→ mohab joined14:03
← APic left14:04
→ yamz joined14:04
← hurfdurf left14:04
→ hurfdurf joined14:05
← salitos left14:07
→ wrobinson_ joined14:09
← kristijonas_ left14:09
→ kristijonas_ joined14:10
← wrobinson left14:11
← Flaghacker left14:12
← long4mud left14:13
→ stats4647 joined14:16
→ cdown_ joined14:16
← cdown left14:18
cdown_ → cdown14:18
→ sozuba joined14:19
← Rashad left14:27
→ Anticom joined14:27
→ ghoti_ joined14:28
← tiin57 left14:28
← Anticom left14:28
→ Anticom joined14:28
← ghoti left14:28
ghoti_ → ghoti14:29
→ Guest20 joined14:29
← botnet left14:29
→ tiin57 joined14:31
→ howdoi joined14:34
→ salitos joined14:37
→ madewokherd joined14:39
← yamz left14:41
← chele left14:41
→ sfenik joined14:45
→ Thor007 joined14:48
← Thor007 left14:48
sfenik I'm seeing all kinds of conflicting information on this, not to mention a lot of the posts being really old: I'm the only one on our team currently using windows, is it correct that my autocrlf should be set to true to keep unix-style line ending on the repo?14:50
imMute sfenik: or set to false and make sure your editors are told to use LF line endings.14:52
← salitos left14:53
→ gast0n joined14:53
→ madewokherd` joined14:55
→ calcul0n_ joined14:56
← calcul0n__ left14:56
← madewokherd left14:57
← s2013 left14:57
← tiin57 left14:58
← sfenik left14:58
← stats4647 left14:59
← Guest20 left15:00
selckin best method imo to turn all automagic changes off, and make sure you use editors that know what they are doing15:01
→ tiin57 joined15:01
→ stats4647 joined15:01
→ irrgit joined15:01
← hussam left15:02
→ APic joined15:03
→ hussam joined15:04
imMute that's what I do too.15:04
→ SwiftMatt joined15:05
← rond_ left15:10
→ xissburg joined15:11
→ botnet joined15:12
→ ScottMichaud joined15:12
ScottMichaud A repo I'm working on has a problem. Somehow someone committed CRLF line endings all over the place, such that even Linux is checking out carriage returns.15:13
imMute ScottMichaud: that'll happen if you have autocrlf=false you'll have to go through and fix/commit all the line endings.15:14
ScottMichaud I tried fixing them (on Windows) in Notepad++ by replacing CRLF with LF.15:14
But when I staged them, Git said line endings will be converted from LF to CRLF but my working directory will be unchanged.15:14
When I actually commit, there's line-ending changes in GitExtensions.15:15
My local copies are still LF.15:15
What's a reliable way to 1) Convert my local copies back to CRLF and 2) Inspect what's actually on Git?15:15
← xrisovalantis left15:17
imMute what does 'git config core.autocrlf' output while in that repo?15:18
osse ScottMichaud: 1) unix2dos, for example. 2) git show HEAD:foo.txt | file -15:18
ScottMichaud git config core.autocrlf says that it's set to true.15:19
Of course that's on my machine.15:19
That's one of the annoying things about file... it never complained about CRLF15:20
Even on the commits that clearly checked out on Linux as CRLF.15:21
osse hmm15:21
ScottMichaud less -u would should ^M though15:21
would show*15:21
osse for me it either says "... with CRLF terminators", or it doesn't15:21
ScottMichaud Yeah that's part of the problem... I get inconsistent feedback.15:21
osse show:path dumps the raw thing, so you can grep ^M I suppose15:22
ScottMichaud Ah I think I found a way.15:23
osse on windows I get: http://sprunge.us/XDfP0h15:24
ScottMichaud HEAD and origin's copy of the head branch show different results.15:24
So second part (or I guess first part and we solved the second) how do I reset my line endings to as if I just cloned the repo with my given Git line ending settings (true)?15:25
→ cdown_ joined15:26
ScottMichaud (Thanks @osse btw)15:26
← sz0 left15:26
← KnoP left15:26
→ orbyt_ joined15:27
← mohab left15:27
osse i think you can simply remove all files and check them out again15:27
← michmich left15:28
← tiin57 left15:28
← noidea left15:28
→ michmich joined15:29
← cdown left15:29
cdown_ → cdown15:29
ScottMichaud Oh. lol15:30
It already converted them back to crlf. I was looking at one of the ones that wasn't broken on the commit before mine.15:30
So the commit never changed it, so its line endings were fine.15:30
So it left it as LF15:30
loser_walex → Walex15:31
ScottMichaud Yeah if I needed to fix the file, they're LF in Git and CRLF on my machine.15:31
If I didn't need to fix the file... they're LF on Git and LF on my machine.15:32
(Because they've never been changed to be checked out again.)15:32
→ tiin57 joined15:32
ScottMichaud Okay that makes sense.15:32
Thanks again!15:33
← michmich left15:33
← ScottMichaud left15:34
→ ShekharReddy joined15:37
← rfuentess left15:38
← fahadash left15:43
← AckSynAck left15:46
→ butter_ joined15:46
← SwiftMatt left15:47
→ Gustavo6046 joined15:47
← cbreak left15:49
→ cbreak joined15:54
← Trieste left15:55
← tiin57 left15:58
→ cdown_ joined15:58
→ Trieste joined16:00
← cdown left16:01
cdown_ → cdown16:01
← Anticom left16:01
→ thelounge7912 joined16:01
→ tiin57 joined16:01
→ s2013 joined16:06
→ hnOsmium0001 joined16:09
← thelounge7912 left16:10
← Techcable left16:11
← mozgalom_ left16:11
→ Techcable joined16:12
← butter_ left16:18
← klonn left16:18
→ furrymcgee joined16:19
→ LuxuryMode joined16:20
← tiin57 left16:28
← Heisenberg left16:28
→ Amol_ joined16:28
→ ghosthell joined16:28
→ tiin57 joined16:31
← random_yanek left16:32
→ jordy joined16:33
← jordy left16:33
→ jordy joined16:33
→ random_yanek joined16:39
← orbyt_ left16:41
← maxzor left16:42
→ orbyt_v7 joined16:43
← NeoCron left16:43
← ghosthell left16:44
← DevAntoine left16:44
→ DevAntoine joined16:45
← botnet left16:46
← mobidrop left16:47
← stats4647 left16:47
→ stats4647 joined16:48
← DevAntoine left16:49
→ Betal joined16:50
→ tang^ joined16:52
← stats4647 left16:53
← Amol_ left16:54
→ Heisenberg joined16:54
← Heisenberg left16:56
← specing left16:57
← tiin57 left16:58
→ specing joined17:00
← indy left17:01
→ tiin57 joined17:02
→ mohab joined17:02
→ rustyshackleford joined17:03
→ Guest20 joined17:07
→ stats4647 joined17:07
→ klonn joined17:15
→ NImNtNineVlt joined17:15
→ samsara joined17:22
→ cliluw joined17:25
→ Epx998 joined17:25
← Guest20 left17:27
← jim left17:27
→ Guest20 joined17:28
← tiin57 left17:28
→ SwiftMatt joined17:29
→ tiin57 joined17:32
← pepa left17:32
→ emet-selch joined17:37
← NImNtNineVlt left17:37
← emet-selch left17:37
→ emet-selch joined17:39
→ DevAntoine joined17:40
← flying_sausages_ left17:40
← v01d4lph4 left17:41
→ john_johnk joined17:42
→ cdown_ joined17:44
← DevAntoine left17:44
← cdown left17:46
cdown_ → cdown17:46
→ calcul0n__ joined17:49
→ flying_sausages joined17:49
→ bn_work joined17:51
← calcul0n_ left17:52
← Paradisee left17:53
→ salitos joined17:55
← salitos left17:56
→ salitos joined17:56
← SirFancyPantsOfP left17:57
← tiin57 left17:58
→ SirFancyPantsOfP joined17:58
→ mowcat joined17:59
→ tiin57 joined18:01
← salitos left18:01
→ contagious_meow joined18:01
→ heww362 joined18:03
← OnkelBlade left18:04
← lnxd left18:04
← emet-selch left18:06
→ hjkl joined18:08
← qgTG left18:10
cybrNaut there is a quite large project, and I just want to fork, add 1 line of code, and do a PR. It's a gitea forge. I know the /normal/ way is to fork, 'git clone', make change, 'git add', 'git commit', 'git push', PR in GUI. But the 'git clone' is huge. So instead I forked and made the change in Gitea to avoid the 'git clone'18:10
that worked, but now others have made changes and again I have just one SLOC to change18:11
→ qgTG joined18:11
BtbN You need to rebase the commit then18:11
ikke cybrNaut: git clone --depth=N18:11
cybrNaut i can't pull the same trick, because my version is now old18:11
ikke where N is a number18:11
cybrNaut hmm.. might work. so i do a shallow clone of my fork, then do a 'git pull'?18:13
(git pull to sync with the upstream repo)18:13
ikke git pull is not a sync command18:13
you need to fetch from upstream to get the latest changes18:14
← ShekharReddy left18:16
cybrNaut so does --depth=1 just grab the latest version of every object? That's still quite big. IIRC, i can also limit the objects.18:18
→ rafasc joined18:18
→ henri joined18:19
j416 cybrNaut: something like --filter=blob:none18:19
but it'd still need to fetch them for the checkout.18:19
how large is this repo anyway18:20
← henri left18:21
← stats4647 left18:22
→ henri joined18:22
cybrNaut it's over 1gb. It's not so much a problem on my end, but the forge is fussy and crashes ~25% into the download18:22
so i'm trying to work around a bug in the forge18:23
→ stats4647 joined18:23
j416 what is "the forge"?18:23
ikke a forge is a generic term for a git (or other vcs) host18:24
cybrNaut git-clone man page doesn't mention --filter.. my Stretch version may be too old18:24
git.nogafam.es18:24
j416 ikke: ah18:24
never heard this term18:24
← sozuba left18:25
→ gigasu_shida joined18:25
→ KnoP joined18:27
← tiin57 left18:28
→ tiin57 joined18:32
→ eb0t joined18:32
cybrNaut so --depth=1 is still too big, and i guess partial clone is impossible with my version, which apparently lacks --filter18:32
→ _nick_ joined18:32
← def_jam left18:33
ikke "A painless self-hosted git service"18:33
← Guest20 left18:33
ikke It's apparently not painless18:33
and a service is not self-hosted :P18:33
I guess that's the default gitea page18:34
j416 cybrNaut: do you have access to the server?18:36
cybrNaut i have a user account, but i'm not the admin and don't have physical access18:36
j416 hum. too bad.18:37
imagining that the server perhaps has too little ram to compress the data18:37
just a hunch.18:37
← SwiftMatt left18:38
← riksu-raksu left18:39
cybrNaut mirroring to an onion host apparently fixed the problem for some people: https://git.nogafam.es/deCloudflare/deCloudflare/issues/1818:42
← contagious_meow left18:45
→ englosh joined18:45
englosh if I do `git config --global init.defaultBranch main` and then do `git init` and then `git status`, why does it say "On branch master"?18:45
ikke git --version18:46
englosh git version 2.27.018:47
ikke you need at least 2.3018:47
englosh seems like this feature is very new18:48
ikke yes18:48
englosh I don't even have that package version18:48
ikke You can do git symbolic-ref HEAD refs/heads/main to change it18:49
→ duderonomy joined18:49
englosh ah ok18:50
← hussam left18:52
→ hussam joined18:54
j416 or simply rename it afterwards18:54
(git branch -m)18:54
← planetcall|work left18:57
← tiin57 left18:58
← hussam left18:58
← Gustavo6046 left19:00
→ tiin57 joined19:02
← meropyri left19:02
→ meropyri joined19:02
← olx69 left19:05
→ dmr104 joined19:05
dmr104 I have copied an pasted my public key to github. But I cannot ssh -vt [email@hidden.address]19:06
dminuoso That's a github question, then.19:07
ikke what is the name of your public key file?19:07
→ fission6 joined19:07
dmr104 I used my noreply email addresss from github19:10
← s2013 left19:10
dmr104 should I have specified ed25519 when using ssh-add?19:10
← _nick_ left19:11
ikke the e-mail address is irrelevant19:11
dmr104 what do you mean by the name of the public key file?19:11
→ _nick_ joined19:12
ikke the name on disk19:12
filename19:12
j416 dmr104: what's the error and what did you expect?19:12
dmr104: any reason why you're running ssh directly rather than via git?19:13
→ lnxd joined19:13
→ schlesser joined19:13
osse to test19:13
dmr104 oh. id_ed25519_github_dennis.pub19:13
ikke ok, but you did add that key to the ssh agent?19:14
→ TK__ joined19:14
dmr104 j416: I tried git fetch via ssh protocol. no joy.19:14
ikke If ssh is not working, then git operations won't work either19:14
dmr104 ikke: yes I added to ssh-add but with no options19:14
j416 fwiw, ssh github.com says denied for me, but git clone works fine with the same key19:15
← CryptoClub left19:15
osse try ssh -vvv and see what keys it considers19:15
my guess is it only tries id_rsa19:15
dmr104 well I tried already with -v and it appears to try my key first lists public key19:16
ikke osse: it should try keys the agent knows about as well19:16
→ CryptoClub joined19:17
ikke dmr104: does ssh-add -L list it?19:17
j416 ah, duh19:18
user must be git of course.19:18
what about, ssh [email@hidden.address]19:18
ikke right19:19
ssh -T [email@hidden.address]19:19
the username is always git19:19
dmr104 yes [email@hidden.address] works19:20
j416 problem solved then19:20
ikke yup19:20
but what happens on fetch?19:20
git remote -v19:20
dmr104 why did git fetch from a private github repo work?19:20
← _nick_ left19:20
ikke make sure you use [email@hidden.address] there as well19:20
gitinfo set mode: +v19:21
← heww362 left19:21
dmr104 not work sorry19:21
ikke verify your remote19:21
schlesser Hey guys, is there a way to clone a specific folder from a monorepo?19:21
← gschanuel left19:22
→ m0viefreak joined19:22
→ gschanuel joined19:22
dmr104 brilliant! works! thank people19:23
must go now. cheers.19:23
ikke o/19:23
j416 \o19:23
← dmr104 left19:24
ikke schlesser: there is not direct support for it yet19:25
there is working being done19:25
some rough features that are there: git clone --filter=blob:none19:25
man git sparse-checkout19:26
gitinfo the git-sparse-checkout manpage is available at https://gitirc.eu/git-sparse-checkout.html19:26
→ mindCrime joined19:26
→ ghoti_ joined19:28
← tiin57 left19:28
← ghoti left19:28
ghoti_ → ghoti19:28
schlesser ikke thanks19:30
→ tiin57 joined19:31
← awt left19:34
← schlesser left19:35
← zebrag left19:38
← jimmiehansson left19:38
→ DevAntoine joined19:41
← Benzi-Junior left19:42
→ zebrag joined19:42
← fission6 left19:43
→ cation21- joined19:44
← cation21 left19:46
→ bvdw joined19:48
cation21- → cation2119:48
→ stats464_ joined19:50
← hjkl left19:52
← stats4647 left19:53
← gast0n left19:57
→ CybwrMonkwy joined19:57
← tiin57 left19:58
→ Gustavo6046 joined19:58
← samsara left20:00
← DevAntoine left20:01
→ tiin57 joined20:01
→ indy joined20:08
← endiruna left20:08
→ gast0n joined20:13
→ jim joined20:15
← CybwrMonkwy left20:18
← klonn left20:19
→ causasui joined20:19
→ endiruna joined20:21
→ dbehmer joined20:25
← furrymcgee left20:26
→ a6a45081-2b83 joined20:26
← sudoforge left20:27
← tiin57 left20:28
→ tiin57 joined20:31
→ jaziz joined20:32
→ Darcidride joined20:32
← moldorcoder7 left20:38
→ moldorcoder7 joined20:39
→ ash_worksi joined20:47
← LuxuryMode left20:49
← SirFancyPantsOfP left20:52
← Fissure left20:53
→ contagious_meow joined20:53
← contagious_meow left20:54
→ contagious_meow joined20:54
→ endiruna1 joined20:56
← tiin57 left20:58
→ sudoforge joined20:58
← endiruna left20:58
→ gordonfish- joined20:59
← henri left20:59
← mellernoia left21:01
→ tiin57 joined21:01
← endiruna1 left21:01
← gordonfish left21:01
→ Fissure joined21:04
→ thomasross joined21:04
← lawid left21:06
→ lawid joined21:07
→ DevAntoine joined21:11
← rafasc left21:12
← mohab left21:12
← onizu left21:14
→ endiruna1 joined21:15
← DevAntoine left21:16
← karx left21:17
← dbehmer left21:17
← abstrn left21:18
← englosh left21:20
→ royal_screwup21 joined21:23
← tiin57 left21:28
→ C0nundrum joined21:30
→ tiin57 joined21:32
→ mohab joined21:32
← krofe left21:33
← mohab left21:33
← BUSY left21:33
→ mohab joined21:33
→ dextercd joined21:34
→ jaquatix joined21:35
→ DevAntoine joined21:36
→ salitos joined21:40
→ jaquatix_ joined21:40
← salitos left21:40
→ salitos joined21:41
← DevAntoine left21:41
← jaquatix left21:41
→ abstrn joined21:41
← salitos left21:42
→ salitos joined21:42
← contagious_meow left21:43
← mowcat left21:44
← Darcidride left21:45
← john_johnk left21:46
← orbyt_v7 left21:47
→ Kr4kke joined21:51
← TK__ left21:54
→ nvmd joined21:55
← sord937 left21:57
← tiin57 left21:58
→ DevAntoine joined22:01
→ tiin57 joined22:02
← jordy left22:05
← DevAntoine left22:05
← gearnode left22:05
→ Darcidride joined22:06
← dextercd left22:06
→ henri joined22:06
→ gearnode joined22:06
← Betal left22:09
→ Betal joined22:09
← dviola left22:10
← gschanuel left22:10
→ gschanuel joined22:11
← jaziz left22:12
→ jaziz joined22:12
→ DevAntoine joined22:13
→ dviola joined22:17
← DevAntoine left22:18
→ chenin joined22:18
← zebrag left22:20
← KnoP left22:21
← jaziz left22:22
← nvmd left22:22
← chenin left22:25
→ kupi joined22:26
→ DevAntoine joined22:26
← mindCrime left22:26
← tiin57 left22:28
→ jaziz joined22:28
Xenguy_ → Xenguy22:29
← DevAntoine left22:30
→ tiin57 joined22:31
← pizdets left22:33
→ pizdets joined22:33
← royal_screwup21 left22:34
→ royal_screwup21 joined22:34
→ TK__ joined22:34
← calcul0n__ left22:34
→ ferdna joined22:38
→ DevAntoine joined22:38
← royal_screwup21 left22:39
→ yamz joined22:40
← Gurkenglas left22:40
← DevAntoine left22:43
← salitos left22:43
← clime left22:44
← duderonomy left22:44
→ pizdets_ joined22:48
← pizdets left22:49
→ SwiftMatt joined22:53
← Darcidride left22:56
← tiin57 left22:58
← stats464_ left22:59
→ stats4647 joined23:00
→ tiin57 joined23:01
→ DevAntoine joined23:03
← stats4647 left23:05
← DevAntoine left23:08
← amahl left23:08
← igemnace left23:09
→ salitos joined23:11
← salitos left23:11
→ salitos joined23:12
← salitos left23:13
→ salitos joined23:14
← salitos left23:14
← yamz left23:14
→ salitos joined23:15
shalok Supposing I cherry-picked 5 commits from a different branch but had to resolve some merge conflicts. Is there some way to diff the 5 commits on the other branch against the 5 equivalent (albeit modified) commits on my current branch ignoring all other changes between the branches?23:19
← salitos left23:19
→ salitos joined23:20
← salitos left23:21
→ salitos joined23:22
← salitos left23:22
→ salitos joined23:22
→ royal_screwup21 joined23:23
← ronny left23:25
← kb1000 left23:25
← kalbasit[m] left23:25
← blue_penquin left23:26
← spacetato left23:26
← Mathijs[m]4 left23:26
← silviof left23:26
← CryptoClub left23:27
← rednaZ[m] left23:27
← danielcg[m] left23:27
← C0nundrum left23:27
← tiin57 left23:28
← royal_screwup21 left23:28
→ CryptoClub joined23:29
← pizdets_ left23:29
→ pizdets_ joined23:30
← pizdets_ left23:30
← dslegends left23:30
→ stats4647 joined23:30
← ChrisLane left23:30
→ ChrisLane joined23:31
→ pizdets joined23:31
← dviola left23:31
→ dviola joined23:31
→ tiin57 joined23:31
← PJBoy left23:31
← stats4647 left23:33
→ stats4647 joined23:33
← stats4647 left23:36
→ stats4647 joined23:37
→ ronny joined23:37
← jaquatix_ left23:38
← CodeSlingerPaul left23:38
← henri left23:40
← gschanuel left23:41
→ gschanuel joined23:41
← jstein left23:43
→ kb1000 joined23:43
→ kalbasit[m] joined23:44
→ Mathijs[m]4 joined23:45
→ spacetato joined23:45
→ blue_penquin joined23:45
→ rednaZ[m] joined23:46
→ silviof joined23:46
→ orbyt_v7 joined23:47
shalok To answer my own question: git range-diff23:48
It's relatively new though. Requires at least 2.20.0 and has also been improved since then.23:49
→ danielcg[m] joined23:53
→ mindCrime joined23:55
← tiin57 left23:58

Logs Search ←Prev date Next date→ Channels Documentation