IRCloggy #git 2021-01-31

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-01-31

← theoceaniscool left00:02
← tiin57 left00:06
→ filip[m] joined00:06
→ tiin57 joined00:09
← mowcat left00:13
← benfelin left00:15
→ Hello71 joined00:21
← nomadicmathmo left00:26
→ Technodrome joined00:26
← g00s left00:29
kevr i left an interactive rebase, it's still in progress, can i open the editor again to change order/drop etc?00:29
if so, how?00:30
Hello71 what does "left" mean00:35
← tiin57 left00:35
← Newami left00:37
→ tiin57 joined00:39
← jstein left00:43
← wrobinson left00:44
← superleaf1995 left00:45
← LuxuryMode left00:45
→ gnomadik joined00:48
→ shush joined00:50
→ wrobinson joined00:51
→ vdamewood joined00:53
← yrzr955 left00:53
← shush left00:55
→ vinleod joined01:00
← dextercd left01:00
← cbreak left01:00
← vdamewood left01:00
vinleod → vdamewood01:05
← tiin57 left01:05
→ tiin57 joined01:09
← mindCrime left01:13
← ferdna left01:14
← Betal left01:19
← LearningPython left01:19
→ gnomadik_ joined01:22
← calcul0n__ left01:22
← gnomadik left01:23
← PJBoy left01:23
→ xelxebar_ joined01:23
← blahdodo left01:24
→ shush joined01:24
← xelxebar left01:24
← arcatech left01:26
← gnomadik_ left01:26
→ blahdodo joined01:28
← AnAverageHuman left01:29
← shush left01:30
← Narrat left01:31
→ sudoforge joined01:34
← snits_ left01:35
← tiin57 left01:36
→ snits joined01:37
→ mindCrime joined01:38
→ tiin57 joined01:39
→ arcatech joined01:46
← skered left01:47
→ gnomadik joined01:48
→ ahr3n joined01:50
← gnomadik left01:51
← merpnderp left01:52
← howell_ left01:52
← coffeejunk left01:52
← LasseVK left01:52
→ hamburgler joined01:52
← wisbit left01:53
→ merpnderp joined01:53
→ LasseVK joined01:53
→ coffeejunk joined01:54
→ howell_ joined01:55
→ wisbit joined01:55
← d1b left01:58
→ d1b joined01:59
→ klonn joined02:02
← klonn left02:04
← tiin57 left02:05
← oxymoron93 left02:07
→ ferdna joined02:07
→ tiin57 joined02:08
← DiffieHellman left02:13
→ nsc joined02:15
nsc → Guest77602:15
← Technodrome left02:17
← Guest33231 left02:17
← jenia left02:19
→ skered joined02:21
← ferdna left02:32
→ Technodrome joined02:35
← tiin57 left02:35
→ tiin57 joined02:38
← shailangsa left02:43
← Gustavo6046 left02:45
← sh9 left02:47
← F0rTex left02:49
→ _Warl0ck joined02:49
→ F0rTex joined02:50
→ Gustavo6046 joined02:51
→ Shailangsa_ joined02:54
→ AnAverageHuman joined02:55
→ kalbasit_ joined02:57
→ Muimi joined02:58
← kalbasit_ left03:02
← rosco_y left03:04
← tiin57 left03:05
→ powerhouse joined03:08
← powerhouse left03:08
← thiago left03:09
→ tiin57 joined03:09
← ahr3n left03:10
→ rf` joined03:14
← envex left03:14
→ drbean joined03:18
→ FH_thecat joined03:18
← rf` left03:21
→ envex joined03:21
→ Codaraxis_ joined03:23
← Codaraxis__ left03:26
→ shush joined03:31
← shush left03:32
← tiin57 left03:35
← downunder left03:36
→ ahr3n joined03:36
→ downunder joined03:38
→ tiin57 joined03:38
→ FinnElija joined03:41
finn_elija → Guest4116903:41
FinnElija → finn_elija03:41
→ xirhtogal joined03:41
← lagothrix left03:41
xirhtogal → lagothrix03:41
← Guest41169 left03:44
→ snowkidimd joined03:48
← Gustavo6046 left03:50
← Aquazi left03:51
← catt left03:53
→ Gustavo6046 joined03:53
← Gustavo6046 left03:54
→ catt joined03:55
→ Gustavo6046 joined03:55
→ snowkidi_ joined03:59
← snowkidimd left04:00
← yonder left04:00
← AnAverageHuman left04:02
← tiin57 left04:05
→ AnAverageHuman joined04:07
→ ferdna joined04:08
→ tiin57 joined04:09
→ smackdab joined04:10
← Shailangsa_ left04:13
→ Guest20 joined04:14
→ shailangsa joined04:20
← Guest20 left04:21
← cliluw left04:21
→ cliluw joined04:22
→ Guest20 joined04:24
← gigasu_shida left04:30
→ gigasu_shida joined04:30
← wisbit left04:30
← wornt left04:32
→ wornt joined04:33
→ wisbit joined04:34
← tiin57 left04:35
→ tiin57 joined04:38
← mindCrime left04:49
→ mindCrime joined04:54
← Xenguy left04:54
← wornt left04:57
→ Betal joined04:58
← catt left05:00
← zebrag left05:02
← skered left05:03
← tiin57 left05:05
← pedahzur left05:05
→ tiin57 joined05:09
← bn_work left05:12
→ catt joined05:18
→ Lyqyd joined05:20
← Guest20 left05:21
← cliluw left05:24
→ cliluw joined05:25
→ g00s joined05:29
→ shush joined05:33
← tiin57 left05:35
← shush left05:37
→ Guest20 joined05:37
→ tiin57 joined05:39
→ mirrorbird joined05:58
← smackdab left06:03
← tiin57 left06:05
← ahr3n left06:07
→ tiin57 joined06:09
→ ahr3n joined06:10
→ YuGiOhJCJ joined06:11
← AnAverageHuman left06:13
→ RoriconKnight joined06:16
→ Codaraxis__ joined06:17
← cjohnson left06:17
← orbyt_ left06:17
← madewokherd left06:18
← Codaraxis_ left06:20
← Guest20 left06:21
← dviola left06:27
→ dviola joined06:28
← tiin57 left06:35
→ tiin57 joined06:39
→ toolbox joined06:42
→ Guest20 joined06:45
← Technodrome left06:51
← ahr3n left07:05
← tiin57 left07:05
→ orbyt_ joined07:07
← Lyqyd left07:08
→ tiin57 joined07:09
→ ahr3n joined07:10
← mannin left07:10
→ iskander joined07:15
← iskander- left07:17
→ chovy joined07:18
chovy i have 2 commits and i need to reset the repo so it only has one commit. how do i do?07:18
← ahr3n left07:19
→ ahr3n joined07:19
← g00s left07:23
← arcatech left07:24
← snowkidi_ left07:25
→ yrzr955 joined07:26
← wisbit left07:27
← txtsd left07:29
→ wisbit joined07:29
→ snowkidimd joined07:30
ikke Do you have uncomitted changes that you need to keep?07:30
← tiin57 left07:35
→ iskander- joined07:38
→ feriman joined07:38
→ tiin57 joined07:39
← iskander left07:41
→ txtsd joined07:41
← luke-jr left07:46
← orbyt_ left07:47
→ luke-jr joined07:49
→ g00s joined07:52
← g00s left07:52
← venmx left07:55
→ g00s joined08:00
← unluckyshrubbery left08:02
→ iskander joined08:03
← iskander- left08:04
→ Heirlung joined08:04
← Goplat left08:05
← tiin57 left08:05
→ venmx joined08:07
→ Mattiaslndstrm joined08:08
→ tiin57 joined08:09
← venmx left08:11
← snowkidimd left08:18
← Guest20 left08:18
→ Technodrome joined08:20
← epoll left08:22
← mindCrime left08:22
→ mindCrime joined08:22
→ epoll joined08:22
← nickmass left08:23
→ nickmass joined08:24
→ venmx joined08:24
← venmx left08:28
← Mat001 left08:33
→ ajnasz joined08:33
← tiin57 left08:35
ajnasz Hi! I'm trying to implement finding the difference between refereneces in golang, like `git log master..devel`, but so far I find it too slow. I tried to figure out by inspecting the source code, and also finding documentation but with no luck so far. Can anyone point me to a documentation about what is the proper way of the implementation?08:37
← YuGiOhJCJ left08:37
→ tiin57 joined08:39
→ OnkelBlade joined08:39
→ mbalmer joined08:40
→ cim209 joined08:43
→ saveNexit joined08:44
← FH_thecat left08:46
← kerframil left08:48
← sudoforge left08:58
→ jla joined09:00
← vdamewood left09:00
← tiin57 left09:05
← Betal left09:08
→ tiin57 joined09:08
← iskander left09:11
→ iskander- joined09:11
→ jnavila joined09:11
← Maxdamantus left09:12
→ Maxdamantus joined09:13
← cd left09:14
← ferdna left09:16
← drbean left09:18
← Technodrome left09:19
← feriman left09:22
← kini left09:23
→ krkini joined09:23
← chovy left09:25
← xelxebar_ left09:28
→ xelxebar joined09:28
← tiin57 left09:35
→ unluckyshrubbery joined09:37
→ tiin57 joined09:38
← jla left09:38
← ahr3n left09:41
← hamburgler left09:46
→ ahr3n joined09:46
j416 ajnasz: 'git log master..devel' does not diff; did you mean 'git diff'?09:56
← uehhtnefa^ left10:00
→ dimi1947 joined10:01
→ gpanders joined10:03
← tiin57 left10:05
→ PaulePanter joined10:06
→ p-core joined10:08
→ tiin57 joined10:09
← hnOsmium0001 left10:09
ajnasz j416: I mean getting commits which are not in master but only in master10:15
*not in master but only in devel10:16
→ clime joined10:21
→ Technodrome joined10:22
j416 ajnasz: why is it slow?10:23
← ajnasz left10:23
← cristian_c left10:24
→ cbreak joined10:24
→ venmx joined10:24
← gigasu_shida left10:25
→ FH_thecat joined10:25
← p-core left10:25
→ ajnasz joined10:25
← Lord_of_Life left10:26
→ Lord_of_Life joined10:27
← venmx left10:29
→ powerhouse joined10:30
→ calcul0n__ joined10:31
← dimi1947 left10:33
← nikivi left10:34
← tiin57 left10:35
→ tsrt^ joined10:38
→ tiin57 joined10:39
← thebope left10:42
← saveNexit left10:43
→ venmx joined10:43
→ rsx joined10:44
← ajnasz left10:45
→ ajnasz joined10:46
→ DiffieHellman joined10:47
→ itp_student|26 joined10:48
← jesusjesse left10:48
← venmx left10:49
← justanotheruser left10:52
→ rond_ joined10:53
→ theoceaniscool joined10:57
→ PJBoy joined10:59
→ bashke joined11:01
← mindCrime left11:01
← tiin57 left11:05
← itp_student|26 left11:07
← ajnasz left11:09
→ tiin57 joined11:09
→ orhun joined11:09
→ ajnasz joined11:11
← OnkelBlade left11:11
← rond_ left11:24
→ rond_ joined11:27
← rond_ left11:27
← Technodrome left11:29
→ venmx joined11:29
→ no_gravity joined11:34
← venmx left11:34
no_gravity Hello! Look like when you search in git log the search is not case insensitive. How can you make it case insensitive?11:34
← tiin57 left11:35
j416 no_gravity: -i11:38
no_gravity j416: I think that would make some git commands case insensitive but not the pager.11:39
j416 do you mean less?11:39
→ tiin57 joined11:39
no_gravity When I do "git log -i" and then search via /foo<enter> it finds foo but not Foo.11:39
j416 still -i then, when in less11:39
ikke man less: -i or --ignore-case11:39
You can type '-i' while less is running, like j416 said11:40
no_gravity j416: Typing -i interactively works, yes. But I want it to be the default.11:40
j416 no_gravity: you can probably set that then, core.pager.11:40
→ jenia joined11:40
no_gravity j416: "core.pager"?11:41
j416 man git-config11:41
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html11:41
no_gravity This seems to work: export GIT_PAGER='less -i'; git log11:42
Maybe I should put "export GIT_PAGER" into my bashrc?11:42
j416 no_gravity: as I tried to hint above, you can set it in .gitconfig11:43
← barteks2x left11:43
j416 no_gravity: git config --global core.pager "less -i"11:43
no_gravity Hmm..11:43
I wonder if that is better then to put it into the bashr.11:43
I backup my bashrc, so that is a plus of the bashrc approach.11:43
ikke You might also want to add -FRX11:44
j416 depends on whether or not you want that to be the default for less regardless, or only for git11:44
ikke to get the default git behavior11:44
j416 yes, FRX11:44
no_gravity j416: How do you mean? I would think "export GIT_PAGER='less -i'" only applies to git.11:44
ikke: What does FRX do?11:44
j416 true, sorry11:44
man less look for -F, -R, -X11:45
no_gravity I see.11:45
So I will put this into my bashrc: export GIT_PAGER='less -iFRX'11:46
Another plus of the bashrc approach is that I can put a comment in on what it does.11:46
← ackyshake left11:48
j416 (git config file supports comments, too)11:49
no_gravity Yeah, but I am not used to peek around there.11:50
j416 I typically put my comments regarding git config in a commit message11:50
→ feriman joined11:51
no_gravity Ok, thanks for the infos!11:52
← no_gravity left11:52
→ l joined11:54
l → Guest4693011:55
→ wootehfoot joined11:57
← shokohsc left12:00
← g00s left12:00
gitinfo set mode: +v12:01
Guest46930 First time on. Trying to work through Pro Git and having a problem with the ruby script in the Git Internals chapter. Running Windows 10 Git Bash and getting a Errno::EBADF (Bad file descriptor) when I try to run the first line (content = "what is up, doc?"). error message ends with "Maybe IRS bug!" Any ideas?12:01
← TulaZula left12:03
→ shokohsc joined12:04
j416 Guest46930: what part of it? do you have a link?12:04
is it this https://git-scm.com/book/en/v2/Git-Internals-Git-Objects12:04
← tiin57 left12:05
j416 you might want to try #ruby or so for that question.12:05
→ Technodrome joined12:06
→ tiin57 joined12:09
← calcul0n__ left12:09
→ calcul0n__ joined12:09
Guest46930 file:///C:/Users/Larry/Documents/progit.pdf#page=447&zoom=auto,-214,45412:12
← dmc left12:14
→ dmc joined12:14
→ benfelin joined12:16
Guest46930 sorry, bad link12:17
→ vorona joined12:19
Guest46930 it is in the Git Objects sub-chapter but under the Object Storage section. I can't link to it12:23
the code is...$ irb12:23
>> content = "what is up, doc?"12:23
=> "what is up, doc?"12:23
→ drbean joined12:23
Guest46930 except when i do it, I get12:24
Errno::EBADF (Bad file descriptor)12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/input-method.rb:42:in `winsize'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/input-method.rb:42:in `winsize'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:753:in `output_value'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:545:in `block (2 levels) in eval_input'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:704:in `signal_status'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:538:in `block in eval_input'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/ruby-lex.rb:166:in `block (2 levels) in each_top_level_statement'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/ruby-lex.rb:151:in `loop'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/ruby-lex.rb:151:in `block in each_top_level_statement'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/ruby-lex.rb:150:in `catch'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb/ruby-lex.rb:150:in `each_top_level_statement'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:537:in `eval_input'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:472:in `block in run'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:471:in `catch'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:471:in `run'12:24
from C:/Ruby27-x64/lib/ruby/2.7.0/irb.rb:400:in `start'12:24
Maybe IRB bug!12:24
I can run it on my Ubuntu distro, but I get a different error farther down in the script12:26
← crose left12:27
Guest46930 it is a ruby error, but I'm pretty sure it has to do with the environment (Windows/WSL/Git Bash)12:27
I can't be the first one to have this issue ?12:28
j416 Guest46930: that's still a ruby question; I think you'll have better luck in #ruby12:32
or, if you think it's an issue with git-bash specifically, I would guess that the mailing list might have a better response12:33
← tiin57 left12:35
→ ADG1089__ joined12:39
→ tiin57 joined12:39
← Mattiaslndstrm left12:53
← vishal left12:56
→ vishal joined12:58
→ riksteri joined12:59
→ klonn joined13:02
← tiin57 left13:05
→ tiin57 joined13:09
→ Ignacy joined13:12
→ venmx joined13:15
nedbat i'm running a tool to upgrade my code. It produces some syntax errors that i can fix manually. I'd like this to be two commits, but I'd also like to avoid an unrunnable state in the "git bisect" lineage. This feels like "sub-commits", which I know isn't a thing. How do people deal with this?13:16
→ testwurst joined13:17
j416 nedbat: I'd value runnable commits over the granularity and instead document the fixes in the commit message if needed13:18
→ hans6 joined13:18
ikke there is indeed no such thing as subcommits13:18
nedbat j416: if I do it as a github pull request and squash the commits, then the old commits will still be there i guess.13:18
ikke yes, but no connection13:19
j416 they'd eventually go away13:19
ikke not as long as the original branch is still there13:19
j416 nod13:19
nedbat j416: i'm not sure they will. github keeps pull request info13:19
j416 not sure if github keeps a reference13:19
right13:19
→ perrier-jouet joined13:19
j416 but I wouldn't trust that a reference from a github PR keep my commits alive13:20
nedbat j416: i just tried it in a repo, i checked out a pull request from 2014.13:21
j416: but i know what you mean. a more pure facility would be better13:21
← rustyshackleford left13:21
← perrier-jouet left13:24
← testwurst left13:24
→ Mat001 joined13:30
← wootehfoot left13:30
← tiin57 left13:35
→ Guest20 joined13:37
→ tiin57 joined13:38
← Guest46930 left13:38
← iskander- left13:40
→ iskander joined13:40
← sweatsuit left13:40
← ajnasz left13:41
← fling left13:42
→ iskander- joined13:43
→ adlternative joined13:44
→ fling joined13:44
← iskander left13:45
→ OnkelBlade joined13:45
→ sweatsuit joined13:47
→ iskander joined13:48
← iskander- left13:49
← OnkelBlade left13:50
→ redcaptrickster joined13:50
← redcaptrickster left13:53
← drbean left13:54
→ mirrorbird_ joined13:56
← mirrorbird left13:56
← iskander left13:57
→ Lartza joined13:57
→ iskander- joined13:57
← ahr3n left14:01
← mirrorbird_ left14:02
→ miczac joined14:03
→ cristian_c joined14:04
← tiin57 left14:05
→ ahr3n joined14:05
→ rjsalts_ joined14:06
→ tiin57 joined14:08
→ iskander joined14:14
→ iskander| joined14:15
→ perrier-jouet joined14:15
← iskander- left14:16
← klonn left14:16
→ mirrorbird_ joined14:17
→ sgn1 joined14:18
← iskander left14:19
← sgn left14:21
← Guest20 left14:21
← hans6 left14:26
→ hans6 joined14:26
← hans6 left14:26
→ hans2 joined14:27
← hans2 left14:28
→ testwurst joined14:30
→ zebrag joined14:31
← tiin57 left14:35
← dviola left14:36
← krkini left14:36
→ dviola joined14:37
← venmx left14:38
→ kini joined14:38
→ tiin57 joined14:39
← jenia left14:42
canton7 nedbat, I'd do that as 2 commits in a branch. Bisect won't care about the stuff in the branch unless it figures out that the merge commit was the source of the breakage14:43
nedbat canton7: you mean leave the two commits on the branch, then merge the branch, and bisect won't explore the branch?14:44
canton7 nedbat, correct: it will explore the branch only if it finds that the merge commit which merged the branch into your main branch was the source of the problem it's looking for14:44
(IIRC)14:45
j416 canton7: I always wondered how that worked. thanks14:46
canton7 I wrote this almost a decade ago, apparently... https://gist.github.com/canton7/373712614:47
← fling left14:47
→ linuxguru joined14:48
j416 thanks.14:48
→ fling joined14:48
canton7 Interestingly it looks like it checked F before E, but presumably it only checked F because M1 was bad, so I might not be entirely right there14:49
→ iNs_ joined14:50
← iNs left14:50
→ shush joined14:51
← shush left14:53
ikke Yeah, there is a feature request for a first-parent based bisect14:54
← linuxguru left14:55
→ venmx joined14:56
← feriman left14:58
nedbat canton7: this is a reason to prefer merges to rebases14:59
→ feriman joined14:59
ikke repeat after me: rebase and merge are not mutually exclusive :P15:01
→ rosco_y joined15:01
← venmx left15:01
→ venmx joined15:02
nedbat ikke: right, i meant when I know I might be in this situation15:04
← tiin57 left15:05
canton7 Yeah, I would never rebase a feature branch and then merge it in using a fast-forward merge. no-ff merges from feature branches only!15:06
ikke same15:08
→ tiin57 joined15:08
→ naftilos76 joined15:09
→ vicfred joined15:14
→ john_johnk joined15:17
→ RaceCondition joined15:18
→ Aquazi joined15:18
elibrokeit does your feature branch have only 1 commit on it, though15:18
ikke sometimes, sometimes not15:18
elibrokeit (I think this is an important factor in determining whether to use --no-ff)15:20
ikke I tend to default to --no-ff, no matter whether it's 1 or 100 commits15:22
← dviola left15:22
→ dviola joined15:23
→ OnkelBlade joined15:25
← dviola left15:25
→ dviola joined15:26
→ cd joined15:27
← tiin57 left15:35
→ Newami joined15:36
← RoriconKnight left15:37
→ tiin57 joined15:39
← RaceCondition left15:39
← Kaivo left15:42
→ madewokherd joined15:42
← Technodrome left15:45
← testwurst left15:45
← Newami left15:45
→ yonder joined15:45
→ level3 joined15:46
→ onmeac joined15:48
→ Technodrome joined15:49
← shokohsc left15:54
→ teut joined15:58
← wisbit left16:01
← onmeac left16:02
→ wisbit joined16:02
→ shokohsc joined16:04
← tiin57 left16:05
→ thiago joined16:06
← wisbit left16:08
→ dukedook[m] joined16:08
← adlternative left16:08
→ wisbit joined16:08
→ adlternaitve123 joined16:08
→ tiin57 joined16:09
→ klonn joined16:09
← shabius left16:12
← dukedook[m] left16:13
→ jenia joined16:13
→ BrunoSpr joined16:13
→ rapha joined16:14
rapha hi all16:14
when i create a new local git repo and force push it somewhere, will the remote repo essentially get overwritten or will it still retain all previously pushed revisions?16:15
→ sudoforge joined16:20
→ Melchizedek6309 joined16:20
← mirrorbird_ left16:20
← Melchizedek6809 left16:22
bremner generally force push destroys history16:27
it is possible for the remote repository to have a reflog, but it mostly won't16:27
rapha: ^16:28
← mven left16:28
← clime left16:29
← sudoforge left16:30
← sgn1 left16:33
→ wootehfoot joined16:33
→ jstein joined16:34
← tiin57 left16:35
→ mven joined16:36
→ AnAverageHuman joined16:37
→ sgn joined16:38
rapha okay, thank you bremner16:38
→ tiin57 joined16:38
← vorona left16:40
→ skered joined16:42
→ jla joined16:45
← ssiyad left16:46
→ miczac_ joined16:47
← miczac left16:49
← rsx left16:52
← theoceaniscool left16:53
→ Guest20 joined16:53
← mven left16:54
→ shush joined16:54
← BrunoSpr left16:55
→ mven joined16:57
→ Metalsutton joined16:57
← shush left16:58
→ roflin joined16:58
→ sudoforge joined16:58
→ Betal joined17:02
← ahr3n left17:03
← mven left17:04
← OnkelBlade left17:05
← tiin57 left17:05
→ theoceaniscool joined17:06
Chipzz heh, I'm having a very weird problem17:06
I'm in the middle of a rebase17:06
I try to run git rebase --continue17:06
but git says I have unstaged changes (which is false)17:06
git status shows all changes are added17:07
→ mven joined17:07
→ worc3131 joined17:07
Chipzz but git rebase --continue refuses to let me proceed17:07
j416 Chipzz: do you have ignored files?17:08
Chipzz nope17:08
how I got into this situation was this:17:08
j416 did you run commit?17:08
Chipzz I did an interactive rebase to split up a commit17:08
→ tiin57 joined17:09
Chipzz then I made some changes, and ran git commit --amend to amend the commit before the one I was editing17:09
that went fine17:09
but now I cannot proceed with the rest of what I'm trying to do, even though all changes are staged and my working tree is clean17:10
hmmmm I think I know what went wrong17:13
→ orbyt_ joined17:16
← adlternaitve123 left17:19
→ ssiyad joined17:19
→ Narrat joined17:20
→ arcatech joined17:23
→ Yarrbeard joined17:26
← jla left17:26
→ jla joined17:27
← HumanG33k left17:27
→ HumanG33k joined17:27
← Technodrome left17:29
← worc3131 left17:30
nkuttler hm, i have a repo snaphot and don't know which commit it is in. i have clone the repo again and move the .git directory into the snapshot.. is there an easy way to figure out the commit of the snapshot?17:34
cloned and moved17:34
j416 nkuttler: not really; you could create a commit from what you have, see what root tree that creates, and then search the commit log for that tree17:35
← endiruna4 left17:35
← tiin57 left17:35
nkuttler j416: thanks. just found a changelog, that will help to narrow it down by a lot17:35
← riksteri left17:35
← jla left17:36
→ jla joined17:36
→ sgn1 joined17:38
→ tiin57 joined17:39
← sgn left17:40
→ kalbasit_ joined17:41
← klonn left17:42
← sim590 left17:43
← jla left17:45
← arcatech left17:46
→ OnkelBlade joined17:50
← kalbasit_ left17:51
→ Goplat joined17:52
← wootehfoot left17:52
→ ahr3n joined17:56
→ sfenik joined17:56
← orbyt_ left17:58
← toolbox left17:58
→ ackyshake joined17:58
← Metalsutton left17:59
→ crose joined18:00
→ jla joined18:01
← OnkelBlade left18:03
← tiin57 left18:05
← fiQ2 left18:05
→ thomas_25 joined18:06
← perrier-jouet left18:07
→ tiin57 joined18:08
← Guest20 left18:09
→ fiQ2 joined18:09
→ Mattiaslndstrm joined18:10
← AnAverageHuman left18:11
← Muimi left18:12
→ AnAverageHuman joined18:16
← thomas_25 left18:17
← yrzr955 left18:17
→ yrzr955 joined18:18
← cods left18:19
→ fax joined18:19
→ cods joined18:20
→ klonn joined18:20
→ mat001_ joined18:20
← Ignacy left18:21
← Mattiaslndstrm left18:23
→ mullins joined18:25
→ calcul0n_ joined18:29
← calcul0n__ left18:29
→ thomas_25 joined18:32
→ ajnasz joined18:32
→ Technodrome joined18:33
→ hnOsmium0001 joined18:33
→ Ignacy joined18:34
← tiin57 left18:35
→ perrier-jouet joined18:38
→ tiin57 joined18:38
→ Sadeukko joined18:39
→ gonzo joined18:41
← teut left18:44
→ tanuki joined18:45
→ gioyik joined18:46
→ clime joined18:47
→ arcatech joined18:49
→ jesusjesse joined18:50
← klonn left18:51
← powerhouse left18:52
→ worc3131 joined18:52
← mat001_ left18:54
→ kalbasit_ joined19:00
← ajnasz left19:02
← arcatech left19:03
← tejr left19:03
→ tejr joined19:04
← tanuki left19:04
← FH_thecat left19:04
→ ajnasz joined19:04
← xelxebar left19:05
← yrzr955 left19:05
→ yrzr955 joined19:05
← tiin57 left19:05
← kalbasit_ left19:07
→ arcatech joined19:07
→ tiin57 joined19:09
← gonzo left19:09
→ bwoebi joined19:10
→ xelxebar joined19:10
← arcatech left19:10
← Ignacy left19:10
bwoebi Hey, is that a known or fixed issue, that autopacking triggered during parallel git fetch in multiple git worktrees (pointing to the same bare repo) can corrupt the bare repo (git fsck reports thousands of missing and dangling objects)19:12
(happened with 2.27, thus not 100% up to date … just before I file a bug…)19:13
← worc3131 left19:13
→ kalbasit_ joined19:13
→ retrospectacus joined19:15
→ rustyshackleford joined19:18
ikke bwoebi: I think I saw something passing on the mailing list in that regard19:19
→ mat001_ joined19:29
bwoebi ikke: hm, Couldn't find anything regarding a race except a possible nullpointer race condition, but had no segfaults in that regard … hm.19:29
← kalbasit_ left19:30
→ klonn joined19:32
← mat001_ left19:33
← ahr3n left19:34
→ orbyt_ joined19:35
← tiin57 left19:35
← Technodrome left19:37
→ tiin57 joined19:39
← ackyshake left19:40
→ mindCrime joined19:41
← miczac_ left19:42
→ Technodrome joined19:48
→ BrunoSpr joined19:55
→ mat001_ joined20:01
→ ahr3n joined20:04
→ kurkale6ka joined20:05
← tiin57 left20:05
← mat001_ left20:06
→ OnkelBlade joined20:06
→ shabius joined20:08
→ tiin57 joined20:09
← jla left20:10
← BrunoSpr left20:12
→ Eryn_1983_FL joined20:13
→ BrunoSpr joined20:14
← dragestil left20:15
← naftilos76 left20:17
← ajnasz left20:22
← skered left20:23
→ kalbasit_ joined20:33
→ kalbasit__ joined20:33
← kurkale6ka left20:33
→ kurkale6ka joined20:34
← tiin57 left20:35
← kurkale6ka left20:35
→ skered joined20:36
← Eryn_1983_FL left20:36
→ xelxebar_ joined20:36
→ Eryn_1983_FL joined20:37
← kalbasit_ left20:37
← xelxebar left20:37
← milkt left20:38
→ tiin57 joined20:39
→ kurkale6ka joined20:39
← kurkale6ka left20:39
→ mat001_ joined20:40
← mat001_ left20:45
← MIF left20:47
→ milkt joined20:48
← ahr3n left20:48
→ teut joined20:49
← fax left20:53
→ fax joined20:53
← kalbasit__ left20:55
← Gustavo6046 left20:55
← Shentino left20:56
→ ferdna joined20:56
→ Shentino joined20:56
→ Gustavo6046 joined21:05
← tiin57 left21:05
← Gustavo6046 left21:08
← BrunoSpr left21:08
→ tiin57 joined21:09
← john_johnk left21:10
→ Gustavo6046 joined21:12
← mindCrime left21:13
→ MIF joined21:14
→ mindCrime joined21:14
MIF → Guest9413121:14
← Guest94131 left21:15
→ Guest94131 joined21:15
Guest94131 → MIF21:16
→ jasbrg joined21:16
→ mat001_ joined21:16
← ADG1089__ left21:18
← mat001_ left21:21
→ jla joined21:23
← theorangeone left21:27
→ theorangeone joined21:28
→ rndusr joined21:28
← klonn left21:28
← rndusr left21:28
← jla left21:29
→ randomuser joined21:30
gitinfo set mode: +v21:30
randomuser ah21:30
randomuser → rndusr21:30
→ Mattiaslndstrm joined21:32
rndusr is there a specific oid I should use to get all commits in a repository? I'm trying to get a tree (```git_tree```) of all commits21:32
→ mowcat joined21:33
← Technodrome left21:34
ikke rndusr: I guess you can diff against an empty tree (4b825dc642cb6eb9a060e54bf8d69288fbee4904)21:34
Hmm, no. thats more related to diffing21:35
→ ahr3n joined21:35
← tiin57 left21:35
rndusr I get the feeling this is not best practice. is there something else that is recommended?21:35
ikke rndusr: what do you want to achieve21:35
← mven left21:35
→ TulaZula joined21:36
rndusr ikke: I'd just to make a simple `git log`, as a introduction21:36
ikke 21:36
git log works by starting at some commit21:37
usually HEAD21:37
rndusr ah21:37
ikke and then traverse down21:37
rndusr is there a way to get HEAD, then?21:37
ikke git rev-parse HEAD21:37
→ tiin57 joined21:38
rndusr oh21:39
rndusr is very stupid21:39
→ muhaha joined21:40
rndusr I was talking about libgit221:42
rndusr very very stupid21:42
muhaha guys? not directly related to git, but seems that https://github.com/grafana/gitlab-datasource was deleted , i need to search some recent fork? any idea how to do it ? ( i am expecting that this will be in paid tier in gitlab in the future :X )21:44
arahael2 → arahael21:45
← wallacer left21:48
→ gigasu_shida joined21:49
→ wallacer joined21:50
→ arcatech joined21:51
→ mat001_ joined21:52
→ sim590 joined21:53
← teut left21:54
← mat001_ left21:56
← tiin57 left22:05
← Gustavo6046 left22:05
← ahr3n left22:06
← Mattiaslndstrm left22:08
→ tiin57 joined22:09
← jnavila left22:09
hololeap muhaha: do you have a local copy of it?22:16
muhaha hololeap no:(22:17
← lawid left22:19
→ lawid joined22:21
← fflam left22:23
← gioyik left22:24
muhaha seem there is no internet archive that is storing github projects...22:24
← vostok4 left22:24
→ fflam joined22:24
→ vostok4 joined22:24
← vostok4 left22:24
→ vostok4 joined22:24
← feriman left22:24
→ radu2425 joined22:25
← radu242 left22:27
radu2425 → radu24222:27
→ g00s joined22:32
← Eryn_1983_FL left22:35
← tiin57 left22:35
→ wallacer_ joined22:37
→ tiin57 joined22:38
← wallacer left22:38
→ wallacer joined22:40
← wallacer_ left22:41
← herren left22:44
← theoceaniscool left22:46
→ Nitrousoxide joined22:48
→ naftilos76 joined22:51
→ shush joined22:51
hololeap yeah, that's a bummer22:54
i'm trying out git-cola, and there's an option called "Start Interactive Rebase". it says "Select New Upstream" and has "@{upstream}" as the default. i've never used git rebase like this. what does it mean?22:56
← cluelessperson left23:00
← OnkelBlade left23:00
→ cluelessperson joined23:01
→ igemnace joined23:02
← muhaha left23:04
← cluelessperson left23:04
→ cluelessperson joined23:05
← tiin57 left23:05
→ sfenik_ joined23:05
→ mat001_ joined23:05
← sfenik left23:08
← shush left23:09
→ tiin57 joined23:09
← g00s left23:10
← mat001_ left23:10
← cluelessperson left23:11
→ cluelessperson joined23:12
← mullins left23:17
← mowcat left23:20
→ worc3131 joined23:20
← naftilos76 left23:24
← worc3131 left23:26
← orbyt_ left23:28
→ fazel[m] joined23:30
→ sfenik__ joined23:30
→ oriba joined23:32
→ oprypin joined23:33
→ shush joined23:33
← sfenik_ left23:33
← zebrag left23:33
cluelessperson is there a command to neatly pull down a git repo checked out to a specific reference?23:34
← jenia left23:34
cluelessperson whether that be a commit or tag / branch ?23:34
→ zebrag joined23:34
← tiin57 left23:35
← shush left23:37
→ tiin57 joined23:39
→ gast0n joined23:45
cbreak clone it, then check out the thing you want23:47
j416 cluelessperson: you can use clone -b to have it checkout a specific branch or tag after cloning23:49
← Narrat left23:51
← arcatech left23:53
imMute hololeap: it's whatever the upstream tracking branch is for that local branch.23:56
→ Nitrousoxide_ joined23:58
→ Muimi joined23:58
→ smackdab joined23:59

Logs Search ←Prev date Next date→ Channels Documentation