IRCloggy #git 2022-01-09

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.

2022-01-09

← jstein left00:00
→ Xenguy_ joined00:01
→ rgrinberg joined00:03
← Xenguy left00:04
→ daoudr joined00:08
← pyeveryt_ left00:11
anandn → anandn[away]00:15
← anandn[away] left00:15
← TonyStone left00:17
← ThePhilgrim left00:17
→ anandn joined00:20
← ramblebamble left00:22
→ pretty_dumm_guy joined00:29
→ chenqisu1 joined00:29
← dextercd left00:30
← TheCatBehemoth left00:33
→ duxsco joined00:34
→ jazzy joined00:35
← Vonter left00:35
← maxzor__ left00:40
← xx left00:46
← goldfish left00:46
→ Xenguy joined00:48
← DrowningElysium left00:50
← Xenguy_ left00:51
→ Vonter joined00:53
← Novi left00:54
← boxframes left00:57
→ Novi joined00:57
→ maxzor__ joined00:58
← xkuru left01:05
→ Kilroy joined01:08
→ anaveragehuman joined01:09
dirigible_ → dirigible01:12
← dirigible left01:12
← srinidhi left01:13
→ pyevery__ joined01:17
← algae left01:17
← duxsco left01:18
→ dirigible joined01:19
← tulpa_ left01:20
→ srinidhi joined01:22
← pyevery__ left01:23
← rgrinberg left01:25
→ rgrinberg joined01:27
← rgrinberg left01:27
← Jong left01:34
← Vonter left01:35
← Gurkenglas left01:37
→ Vonter joined01:37
← daoudr left01:42
→ algae joined01:59
← bluesm left02:00
→ led_belly joined02:00
← fikran left02:00
→ fikran joined02:02
→ bkay joined02:03
→ vysn joined02:04
← beshr left02:04
← maxzor__ left02:05
← justIrresolute left02:05
→ TonyStone joined02:06
→ justIrresolute joined02:06
← TonyStone left02:11
→ TonyStone joined02:11
← travisghansen left02:20
→ travisghansen joined02:21
→ locrian9 joined02:22
← cliluw left02:23
→ cliluw joined02:23
→ pyevery__ joined02:26
→ trafficjam joined02:27
trafficjam hey guys, how can i ssh pull none-master branches on a github repo i own?02:27
i cloned the public repo on a new system, but i can't see any branches other than master02:28
and i added a new ssh key to my laptop and added it to the github ssh keys page, but that doesn't seem to have fixed it02:28
→ imp joined02:30
trafficjam also added the Id_rsa_custom to ~/.ssh/config, but still no change02:31
is there some other command i have to run?02:31
do i have to clone it after updating .ssh/config?02:32
packet_lozenge Just checkout the branch you want to switch to02:33
→ Maxattax97 joined02:34
→ bin101_ joined02:34
packet_lozenge Git should automatically create a local branch that's correctly linked to the remote branch02:34
← bin101 left02:34
trafficjam packet_lozenge: ah so the branch is there, but `git branch` just wont show it until i checkout it out first?02:36
← pyevery__ left02:36
packet_lozenge Right. That command only shows branches that have been created locally02:37
trafficjam oh ok, thanks, and is there a way of listing all branches on github, in my terminal?02:37
packet_lozenge You need the -a flag to see all branches - local and remote02:37
trafficjam perfect, thanks man02:38
packet_lozenge As for your SSH issue, you can try ssh -v -T [email@hidden.address] to see what keys it's trying to use with github02:39
I suspect that perhaps your ssh configuration isn't correct02:39
→ Jong joined02:43
→ junebug joined02:46
← junebug left02:47
← natewrench123456 left02:47
← TonyStone left02:55
→ TonyStone joined02:56
← Yruama left02:58
→ user1 joined03:00
→ rgrinberg joined03:01
← justIrresolute left03:05
→ justIrresolute joined03:06
→ pyevery__ joined03:11
drew I am trying to sign my commits but I get error: gpg failed to sign the data03:16
← dsrt^ left03:16
drew how do I troubleshoot where gpg is going wrong?03:16
I can see my key in gpg --list-secret-keys03:16
← cdown left03:17
→ black_13 joined03:22
← shailangsa left03:27
← locrian9 left03:27
← black_13 left03:29
anandn → anandn[away]03:33
← anandn[away] left03:33
← ChmEarl left03:34
→ anandn joined03:39
← anandn left03:39
→ anandn joined03:40
← gast0n left03:44
← led_belly left03:46
→ led_belly joined03:49
← hbautista left03:52
→ hbautista joined03:54
→ shailangsa joined03:54
→ Xenguy_ joined03:58
← hbautista left04:00
← Xenguy left04:01
← skapata left04:01
→ hbautista joined04:03
→ locrian9 joined04:04
← justIrresolute left04:05
← hbautista left04:06
→ justIrresolute joined04:06
→ hbautista joined04:06
← fikran left04:09
→ fikran joined04:11
← algae left04:12
→ Pseudocrat joined04:12
← jab416171 left04:14
← pyevery__ left04:18
→ pyevery__ joined04:19
→ jab416171 joined04:20
→ Xenguy__ joined04:23
← pyevery__ left04:23
← Xenguy_ left04:26
→ Xenguy joined04:27
← Xenguy__ left04:29
→ bytehackr joined04:32
→ xx joined04:36
← vakera_pingveno left04:36
→ gco joined04:39
← tyson2 left04:47
→ madewokherd` joined04:50
← madewokherd left04:52
→ Xenguy_ joined04:54
← Xenguy left04:56
→ pyeveryt_ joined04:56
→ boxframes joined04:57
← R2robot left04:57
← rgrinberg left04:59
→ Xenguy joined04:59
→ dsrt^ joined04:59
→ rgrinberg joined05:00
← Xenguy_ left05:00
→ Xenguy_ joined05:02
← Xenguy left05:04
← justIrresolute left05:05
← srinidhi left05:05
← vishal left05:05
→ justIrresolute joined05:06
← pyeveryt_ left05:06
→ vishal joined05:07
← JanC left05:08
→ JanC joined05:08
← anaveragehuman left05:13
← trafficjam left05:19
→ parv joined05:32
← great_taste left05:32
← Murr left05:33
→ Murr joined05:33
← Vonter left05:36
→ Vonter joined05:37
← rgrinberg left05:41
→ murii joined05:42
→ dflick joined05:43
→ pyevery__ joined05:43
→ Xenguy__ joined05:46
← murii left05:47
→ trafficjam joined05:47
← Xenguy_ left05:48
← pyevery__ left05:49
← trafficjam left05:50
→ Xenguy_ joined05:50
→ whatsupdoc joined05:51
→ Xenguy joined05:53
← Xenguy__ left05:53
← Xenguy_ left05:54
← BSaboia left05:55
← Thanatermesis left05:57
← defjam left05:58
→ defjam joined06:00
→ Xenguy_ joined06:01
→ maxzor__ joined06:03
← Xenguy left06:04
→ rgrinberg joined06:04
← gco left06:05
→ srinidhi joined06:08
→ Xenguy__ joined06:09
← Xenguy_ left06:11
← fikran left06:18
→ BSaboia joined06:19
→ fikran joined06:20
→ kenanmarasli joined06:23
← rgrinberg left06:25
→ bt-01 joined06:26
← bytehackr left06:32
→ rgrinberg joined06:32
← zebrag left06:32
← Vonter left06:38
← stef204 left06:43
→ FH_thecat joined06:46
← FH_thecat left06:50
→ FH_thecat joined06:50
← rgrinberg left06:51
← YoungFrog left06:52
→ YoungFrog joined06:52
→ Xenguy_ joined06:53
← Xenguy__ left06:56
← BSaboia left06:57
→ Xenguy__ joined06:58
← Xenguy_ left07:00
→ Xenguy joined07:01
← Xenguy__ left07:02
← Maxattax97 left07:02
→ igemnace joined07:04
→ BSaboia joined07:05
← tirnanog left07:07
→ Vonter joined07:09
← bket left07:11
→ bket joined07:13
← Betal left07:13
← Vonter left07:14
→ rgrinberg joined07:15
→ pyeveryt_ joined07:15
→ Vonter joined07:16
← pyeveryt_ left07:17
→ Xenguy_ joined07:24
← Pseudocrat left07:25
← Xenguy left07:26
→ R2robot joined07:30
→ Brumaire joined07:38
→ Lemuria joined07:41
← Lemuria left07:41
→ xmyst joined07:44
← pretty_dumm_guy left07:44
→ Pseudocrat joined07:44
← BSaboia left07:44
→ pyevery__ joined07:46
← pyevery__ left07:48
michele- → michele08:03
← unluckyshrubbery left08:04
→ murii joined08:05
← hoochmonger left08:05
← Vonter left08:07
→ Xenguy joined08:14
← Pseudocrat left08:15
← Xenguy_ left08:16
→ palasso joined08:20
← theoceaniscool left08:22
→ ankithans joined08:23
← hbautista left08:23
→ hbautista joined08:24
← ankithans left08:25
→ meator joined08:27
← fikran left08:28
→ Vonter joined08:28
→ fikran joined08:30
← alex88 left08:31
← xmyst left08:32
→ alex88 joined08:33
← Vonter left08:34
→ theoceaniscool joined08:35
→ Vonter joined08:36
→ Guest23 joined08:36
← Guest23 left08:37
→ pyevery__ joined08:39
← pyevery__ left08:40
→ Pseudocrat joined08:43
← theoceaniscool left08:44
← hbautista left08:47
→ hbautista joined08:47
← howdoi left08:47
← rgrinberg left08:48
← Pseudocrat left08:48
← bt-01 left08:51
← hbautista left08:56
→ theoceaniscool joined09:02
→ abu joined09:02
→ roadie joined09:02
← justIrresolute left09:05
→ justIrresolute joined09:06
→ rsx joined09:07
→ ___nick___ joined09:07
→ spare joined09:15
← Vonter left09:15
→ Xenguy_ joined09:16
→ Pseudocrat joined09:16
→ feriman joined09:17
← Xenguy left09:19
← Pseudocrat left09:21
→ ubique joined09:23
→ Xenguy__ joined09:26
← Xenguy_ left09:29
→ moti86 joined09:31
← Murr left09:33
→ Murr joined09:33
← moti86 left09:34
→ Gurkenglas joined09:35
← anandn left09:35
→ TheCatBehemoth joined09:39
← yanmaani left09:40
→ anandn joined09:42
→ yanmaani joined09:46
→ carl- joined09:48
→ Camilo joined09:48
→ unluckyshrubbery joined09:49
→ Pseudocrat joined09:50
← shailangsa left09:53
← Pseudocrat left09:56
← ubique left10:03
→ Xenguy_ joined10:06
← Rashad left10:08
→ Rashad joined10:08
← Xenguy__ left10:08
← FH_thecat left10:12
→ shailangsa joined10:18
← maxzor__ left10:19
→ bt-01 joined10:22
JumpinBa| → JumpinBanana10:23
← locrian9 left10:27
← Oblomov left10:27
→ Pseudocrat joined10:27
→ john_johnk joined10:31
→ Vonter joined10:32
← Pseudocrat left10:32
→ Lord_of_Life_ joined10:34
← Lord_of_Life left10:36
← fikran left10:37
Lord_of_Life_ → Lord_of_Life10:37
→ fikran joined10:39
→ ircs joined10:40
→ pyeveryt_ joined10:41
← anandn left10:43
→ OnkelTem joined10:43
→ Xenguy__ joined10:43
← bloody left10:44
← Xenguy_ left10:45
→ Pseudocrat joined10:46
← pyeveryt_ left10:46
← abu left10:47
← Pseudocrat left10:51
← ircs left10:52
← feriman left10:52
→ feriman joined10:53
→ Oblomov joined10:54
→ furrymcgee joined10:55
→ coot joined10:56
→ hseg joined10:57
← stats4647 left10:58
← yanmaani left10:58
hseg Hi. Have a bunch of feature branches I want to rebase on top of master and ff-merge master to10:58
atm, am doing rebase --onto=master origin/master; fetch . feature:master; switch master; branch -d feature10:59
→ stats4647 joined10:59
hseg but that's getting annoying fast with my long branch names10:59
any ideas of a better way?10:59
→ yanmaani joined11:00
j416 hseg: why --onto?11:00
hseg bc I've been bitten in the past with rebase not doing what I expected, so I tend to be more verbose with it nowadays11:01
← dsrt^ left11:01
j416 I see.11:01
specifying it each and every time seems just as dangerous though; it's not like a fix for everything :)11:02
use it when you need it11:02
→ dsrt^ joined11:02
hseg ofc not, but it does what I want frequently enough for me11:02
j416 git checkout master && git pull && git checkout feature && git rebase master && git merge feature11:03
then for each11:03
→ Pseudocrat joined11:03
j416 git checkout feature2 && git rebase master && git checkout master && git merge feature211:03
?11:03
← stats4647 left11:03
→ ramblebamble joined11:03
j416 you can tab-complete branch names.11:04
and you can use "-" to mean the thing you had checked out last11:04
so you can "git checkout master && git merge -"11:04
hseg oh, that looks like it might work, trying for next feature, a moment11:05
ramblebamble j416, where can I read about this - meaning the last branch checked out thing?11:06
j416 ramblebamble: man gitrevisions11:06
gitinfo ramblebamble: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html11:06
ramblebamble cheers11:07
that is the only regret I have looking at git, it is so vast/comples and well documented, but finding some jewels/information proves quite difficult at times11:08
j416 ah, doesn't mention it clearly11:08
man git-checkout11:08
gitinfo the git-checkout manpage is available at https://gitirc.eu/git-checkout.html11:08
j416 > You can use the @{-N} syntax to refer to the N-th last branch/commit checked out using "git checkout" operation. You may also specify - which is synonymous to @{-1}.11:08
and the gitrevisions man page explains the @{-N} synta11:09
x11:09
ramblebamble That one I actually encountered with HEAD@{} and stash@{}11:09
j416 note that @{N} is not @{-N}11:09
ramblebamble so If I read this correctly @{N} referrs to the Nth commit prior to , in this case, HEAD while @{-N} referrs to the Nth branch checked out prior the current one?11:12
→ cdown joined11:16
ramblebamble currently browsing through the gitrevisions manpage, will definitely investigate some of those queries in some repo with complex history, I just have one last question, j416, how do I know the layout of the commit-ordering? e.g. in the manpages G = A^^^ = A~3, where is apparently the ancestor all the way to the left in the tree while B^2 is the 2nd from the left so E. How can I infer the ordering of11:17
those commits looking at a repository?11:17
j416 ramblebamble: the commits form a graph where a commit has zero or more parents11:18
hseg sure -- but given a merge M, what's M^ ?11:19
ramblebamble exactly or what is M^311:19
j416 M^ is M^1, the first parent of the merge commit11:19
M^3 would be unusual, the third parent (of an octopus merge)11:19
ramblebamble ok how do I deduce which one is the first parent?11:19
j416 M^1 is the first parent11:19
the branch which you merged M^2 into11:20
(or commit)11:20
ramblebamble ok let me back of and ask differently, looking at a history-graph(git log --graph --oneline --all) what lets me determin the first parent of commit X, without actually trying a query like git show X^11:21
So How do I see it?11:21
j416 given "git checkout master && git merge --no-ff feature", there's a new merge commit M on master. M^1 is master as it was before you merged feature. M^2 is equal to feature.11:22
(M only has two parents, so M^3 does not exist)11:22
ramblebamble ok so looking at a merge-commit, the first parent is always the commit directly preceeding the merge-commit on the same branch and the 2nd parent is the last commit on the feature-branch?11:23
j416 you can see the parent commits by using e.g. git log -1 --format=fuller <commit>11:24
ramblebamble: yes.11:24
ramblebamble awesome thank you.11:24
← feriman left11:25
← hseg left11:27
ramblebamble Ah I also see that your command with fuller lists the first parent as first commit :)11:27
j416 yes11:27
→ hseg joined11:27
ramblebamble Thank goodness I do not dabble in octopus commits,11:27
j416 you can also try --format=raw11:27
this is how the commit looks in its plain form11:28
as in, what is stored verbatim (sans the colouring if you have that)11:28
(well, sans the first line at all, the commit hash is obviously not part of the commit)11:28
ramblebamble got it and in the parent-commits left to right became up to down11:29
j416 git cat-file -p <commit>11:29
and I lied; never realised --format=raw indents the commit message; apparently it does.11:29
ramblebamble k didn't even notice11:30
j416 (cat-file shows the actual object as stored)11:30
ramblebamble it makes sense that the id of the commit its hash is not part of the object, but where does git store those?11:30
ikke ramblebamble: as loose objects, it's the filename11:31
→ feriman joined11:31
ikke The hash names the object11:31
j416 and the hash (object name) is (perhaps obviously) the hash of the contents, i.e. what cat-file output in the example above11:32
(with some extra)11:32
→ Xenguy_ joined11:33
← Murr left11:33
j416 more info https://git-scm.com/book/en/v2/Git-Internals-Git-Objects11:33
ramblebamble ikke, ah so that is pretty much the content of the files stored somewhere in git with funny looking folder(hexadecimal 2 chars only and nested)?11:33
→ zer0bitz joined11:33
→ Murr joined11:33
j416 that's the basic storage format yes; and then there are packfiles which store many objects in one file to allow delta compression and faster retrieval11:34
ikke .git/objects/hash{0,2}/hash{2,40}11:34
← feriman left11:35
← Xenguy__ left11:35
hseg ok, so using - for previous checkout works -- eg merge accepts it. unfortunately, branch doesn't.11:36
ramblebamble thank you both, will have to sit on that information for a while to let it sink in, especially the git revisions stuff will keep me a bit busy, not that I will need it all, but you never know :)11:36
hseg which makes sense11:36
j416 hseg: branch creates a branch; what are you after?11:36
hseg "delete this branch and switch to $branch" or "delete previously-checked-out branch"11:37
eh. worst case can just copy-paste from scrollback11:37
→ Trieste_ joined11:37
j416 ramblebamble: it's a lot to take in but give it time and it'll feel obvious11:38
ah.11:38
← Trieste left11:38
ramblebamble j416, that is what I intend to do :) . You know what they say, that which does not fit into your head ought to be stacked ontop of it11:39
j416 hseg: maybe you can steal something from my "kill branch" script (it deletes a branch locally and remotely, and switches to the last checked out branch) -> https://github.com/jsageryd/.config.d/blob/5eb5a1c96e68/scripts/git/workflow/kill.bash11:39
ramblebamble: haha.11:39
ramblebamble what will probably amaze me to the end of days is what warped/complex use-cases have caused this type of sophisticated reference-system to occure I mean @{yesterday} ?11:40
foo j416: thanks, re: the git commit that I didn't know what branch it was in11:40
j416 foo: o/11:40
→ enoq joined11:40
→ feriman joined11:41
Trieste_ → Trieste11:41
hseg that looks exactly like what I need11:41
j416 ramblebamble: that one's handy when you lose something; like, I know I had this commit just before lunch but I lost it along the way, then you can find it by e.g. git log HEAD@{2.hours.ago}11:41
ramblebamble ok that makes sennse11:41
hseg barring the fact that these branches are all local, but thanks!11:42
ramblebamble s/nn/n/11:42
j416 hseg: then just skip the last line :)11:42
hseg (^_^ d)11:43
j416 hseg: in english: if the branch is not currently checked out, just delete it. If the branch to be deleted is currently checked out, check out whatever was checked out before that first, then try to delete it. (Git won't allow you to delete the branch you are on).11:44
it won't of course work if you run "git checkout mybranch" twice first, because then the last checked out branch will still be mybranch. But then maybe you have other problems.11:46
(like not knowing which branch you are on, and maybe not knowing how to tie your shoes)11:46
← feriman left11:47
→ Yruama joined11:47
→ tyson2 joined11:49
← Vonter left11:51
← bn_work left11:51
→ Vonter joined11:52
← canton7 left11:53
→ feriman joined11:53
← imp left11:53
→ duxsco joined11:54
→ canton7 joined11:55
← enoq left11:57
hseg turns out my ask for "delete previous branch" does exist -- https://stackoverflow.com/a/48705399 -- branch accepts @{-1} (but not -)11:58
so my flow can just be git rebase --onto=master origin/master && git switch - && git merge - && git branch -d @{-1}11:59
which conveniently is portable across feature branches11:59
← feriman left12:00
j416 didn't know it could do that.12:01
and you can skip --onto.12:01
that only makes sense if your local master has diverged from origin/master12:02
→ bytehackr joined12:02
j416 which I assume it has not, but if it has you might want to fix that first12:03
hseg it just has some extra commits12:04
haven't pushed them yet, want to still be able to rewrite history without breaking the world12:04
j416 then no difference with --onto12:04
because your feature branches are based on an ancestor of master12:05
← ramblebamble left12:05
osse you cannot simply remove --onto without changing origin/master to master12:05
← Vonter left12:05
j416 ^ of course.12:06
git rebase master, would be what you want.12:06
hseg right. don't remember what the bug was that scared me into this12:06
j416 (or you'd be rebasing on origin/master)12:06
← Pseudocrat left12:06
hseg let's try trusting git for a while12:07
→ Vonter joined12:07
j416 another question is why you have commits locally on master without having them pushed; if they're ready for master maybe they can be pushed? :)12:07
→ cvmn joined12:08
j416 just, an idea.12:08
hseg was calling it "master" because it's my mainline wip branch12:08
j416 (so that you don't end up needing to rebase master and subsequently all of your feature branches because origin/master had new commits before you pushed yours)12:08
ah, so no one else is working on it. I see.12:09
← x88x88x left12:09
hseg am new to the team, want to be able to get code review12:09
← meator left12:09
hseg though coding practices here leave something to be desired, suspect I won't be getting any review if all tests pass12:09
→ x88x88x joined12:10
osse write a test that fails :p12:10
assert(false, true, "please read my code")12:10
hseg :D12:10
j416 haha.12:10
← Trieste left12:10
→ Trieste_ joined12:10
→ feriman joined12:11
j416 nice one, might try adding some of those12:11
although we don't really do code review so not much of an issue (we tend to pair or mob program instead most of the time)12:11
Trieste_ → Trieste12:14
← feriman left12:15
→ Pseudocrat joined12:19
← chenqisu1 left12:20
→ bluesm joined12:20
→ xkuru joined12:21
→ feriman joined12:21
← AbleBacon left12:22
← fling left12:23
← Pseudocrat left12:24
← hseg left12:27
→ stats4647 joined12:27
→ hseg joined12:27
← feriman left12:28
→ fling joined12:28
← parv left12:32
← Vonter left12:32
→ feriman joined12:34
foo Huh, I did git branch contains mybranch12:35
And it looks like a new branch "contains" was created. I meant it to be --contains, heh12:35
→ Pseudocrat joined12:37
← stats4647 left12:38
nedbat foo: "git branch <name> [<startfrom>]" creates a branch12:38
foo nedbat: huh, thanks. I've always done git branch -b <branch> (where startfrom was from current branch). heh, not sure how I missed this. Thank you12:40
→ peterhil joined12:40
← john_johnk left12:41
← Pseudocrat left12:41
← user1 left12:44
→ jstein joined12:45
← fikran left12:47
→ fikran joined12:48
← jazzy left12:50
→ Vonter joined12:52
→ john_johnk joined12:53
→ Pseudocrat joined12:55
← carl- left12:57
← feriman left12:58
← john_johnk left12:59
← bt-01 left13:00
→ meator joined13:01
→ stats4647 joined13:04
← OnkelTem left13:04
→ thiago joined13:08
← coot left13:10
→ coot joined13:11
← Vonter left13:14
→ pretty_dumm_guy joined13:17
→ bt-01 joined13:21
← kenanmarasli left13:22
← hseg left13:27
→ hseg joined13:28
← bt-01 left13:39
← x88x88x left13:44
← yanmaani left13:52
→ bt-01 joined13:54
→ ramblebamble joined13:59
← Pseudocrat left13:59
← whatsupdoc left14:00
→ x88x88x joined14:02
← Trieste left14:02
← bt-01 left14:06
→ bt-01 joined14:06
→ Trieste joined14:06
→ anaveragehuman joined14:11
← hseg left14:13
→ joachimo joined14:14
→ tsujp joined14:16
→ hseg joined14:17
← tyson2 left14:18
→ feriman joined14:19
joachimo hi i have a question related to reflog:14:20
I need to do the following:14:20
1) remove last commit altogether14:20
2) remove all traces of the last commit from the reflog14:20
3) remove the file (that was added in the last commit) from staging area and working area14:20
it seems that the verification script passes when I do a git reset --hard HEAD~1 and git gc. But is this the right way to go about this?14:20
→ yanmaani joined14:20
joachimo as this is an exercise, there is no remote involved14:20
← thiago left14:21
→ Lemuria joined14:24
j416 joachimo: that doesn't remove the entry from the reflog.14:24
← Lemuria left14:24
j416 joachimo: git show <commit> will still show your commit.14:24
joachimo: you'll have to expire the reflog; man git-reflog14:24
gitinfo joachimo: the git-reflog manpage is available at https://gitirc.eu/git-reflog.html14:24
← feriman left14:30
← Rashad left14:36
← boxframes left14:37
← dsrt^ left14:39
→ Hax0r joined14:41
← coot left14:45
→ maxzor__ joined14:47
← yanmaani left14:51
→ skapata joined14:54
← skapata left14:54
→ skapata joined14:54
→ Pseudocrat joined14:54
← fikran left14:56
← ramblebamble left14:56
→ fikran joined14:58
→ john_johnk joined15:03
→ Thanatermesis joined15:06
→ yanmaani joined15:08
→ DrowningElysium joined15:09
→ otisolsen70 joined15:10
→ tyson2 joined15:11
← Brumaire left15:11
← bt-01 left15:12
→ bloody joined15:13
→ bt-01 joined15:14
← hseg left15:17
→ hseg joined15:18
← cvmn left15:22
← ___nick___ left15:25
→ ___nick___ joined15:27
← ___nick___ left15:27
→ ___nick___ joined15:29
relipse How do i determine the first date a file was committed?15:32
← meator left15:34
← bt-01 left15:34
→ bt-01 joined15:35
← TonyStone left15:35
relipse git log <file> works15:36
← bt-01 left15:38
→ boxframes joined15:40
→ stef204 joined15:42
→ tulpa_ joined15:44
silly lolwat!? "...assume main as the default branch name, as this is the new standard in git."15:47
did i miss something?15:47
→ TonyStone joined15:47
ikke No, it's not the standard yet15:49
I have not seen any recent topics around it either15:49
silly git-scm says it's master15:50
https://lists.zx2c4.com/pipermail/cgit/2022-January/004671.html15:51
← tulpa_ left16:00
→ feriman joined16:00
ikke Although it will give you a warning, if you have not set init.defaultBranch and initialize a new repo, the first branch will still be master16:01
← igemnace left16:04
← hseg left16:05
→ igemnace joined16:06
← Hax0r left16:08
← YoungFrog left16:09
→ YoungFrog joined16:10
→ kenanmarasli joined16:18
→ coot joined16:18
→ great_taste joined16:22
→ ferdna joined16:24
→ ChmEarl joined16:29
→ hseg joined16:32
← The_Blode left16:34
→ madewokherd joined16:35
→ natewrench123456 joined16:36
← rsx left16:37
← madewokherd` left16:39
← roadie left16:43
← TheCatBehemoth left16:43
→ TheCatBehemoth joined16:44
← vysn left16:44
← john_johnk left16:48
→ The_Blode joined16:48
→ vakera_pingveno joined16:53
→ mark_infinite joined16:57
mark_infinite Hello! I'm new to git. Is there any aproppriate way to avoid flooding the 'git log' with commits?16:58
ikke What is the cause of flooding git log with commits?16:59
Are you creating lots of small fixup commits that fix mistakes in earlier commits?16:59
mark_infinite I don't know. I'm new. I know a very tiny subset of the git's features. -_-16:59
I just write my code and if it works I commit. I know this seems very bad in practice - log flooding17:00
OMGOMG that's still better than making a single commit of 20000 lines17:02
mark_infinite OMGOMG: Is creating a new branch and then merging to master a better approach?17:02
OMGOMG !rebase-i > if you want to squash commits together17:02
gitinfo [!interactive_rebase] Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'. https://gitirc.eu/git-rebase.html17:02
OMGOMG mark_infinite: yes, often17:03
mark_infinite OMGOMG: but does it have any danger? I mean If I want to split them, can I do it?17:03
Nei mark_infinite: clean up the log with the command OMGOMG showed you17:03
the "danger" starts when you start to publish + collaborate17:03
the suggestion is to either never clean/change/edit the log once you published it17:04
mark_infinite Nei: No no I work locally solely. Me repos are on my computer.17:04
Nei then you can do whatever you want17:04
:)17:04
mark_infinite using submodules and such17:04
Nei: hahaa I can do whatever I want to "carve" my code x'D17:05
Nei don't forget to make backups though17:05
OMGOMG you're new to git, but using submodules17:05
← fikran left17:05
mark_infinite OMGOMG: yes! The 1st thing that worried me. How can I use a tool that I made INSIDE another tool that I made =)17:05
otherwise I know nothing17:06
← gxt left17:07
→ fikran joined17:07
furrymcgee commit often and use --fixup17:07
→ gxt joined17:08
Nei you can check "git gui"17:08
there you can "amend" the last commit17:09
and you can commit parts of the code only17:09
OMGOMG i would recommend against using submodules until you're comfortable with git17:09
ikke I don't see why. If they already managed to use it17:10
furrymcgee submodules was also one of the first things when I started with git17:10
mark_infinite OMGOMG: yes, the main issue was that the submodules didn't update correct recursively, but I managed to solve that... It was much of a danger tbh.17:11
OMGOMG furrymcgee: how did that work out17:11
mark_infinite furrymcgee: yes I mean, that was what I sought besides version ctrl from git17:11
nevertheless I have to say git is magnificent! I <3 this tool!17:12
→ cgar joined17:13
furrymcgee I try to always use git submodule add instead of pur git clone17:13
Nei it's not without thwarts17:13
furrymcgee just to keep things separate17:14
Nei submodules have the advantage and disadvantage that you commit the revision you have checked out17:14
← hseg left17:14
furrymcgee submodules may have .git files or .git directories, --absorbgitdir is good to know17:16
my binary files are distributed in a submodule of the source repository, https://github.com/furrymcgee/doxygwin/tree/master/repository17:24
← bytehackr left17:27
→ sharpertool joined17:28
sharpertool Greetings. I'm not a new git user, and I'm well versed in the use of ssh and ssh keys, etc.17:29
I'm setting up a new Windows Server (2019). Windows is always more difficult than Mac or Linux, but generally git and git bash work well.17:29
← natewrench123456 left17:31
sharpertool Anyway, I have this new machine, I've created a key pair, and copied it to an account o an internal bitbucket server. Same as I've done multiple other ties... but, git clone with this fails every time. I've been through all of the troubleshooting I can think of.. using 'ssh -vvv', for example.. and I cannot quite figure out what is missing here.17:31
Now, there isn't a lot to go on. Just looking for "any more tips" on isolating this. I used the https protocal, and that worked - but this repo has submodules, which use ssh.. so, giving up and using https in this case won't work.17:33
← jstein left17:34
→ meator joined17:35
Xenguy_ → Xenguy17:35
→ BenjiProd joined17:36
→ Cork joined17:36
← bloody left17:36
ikke sharpertool: Fails how? What specific messages do you get? Do you see the key being offered with ssh -vv?17:37
(/-vvv)17:37
→ bloody joined17:38
sharpertool Failed git clone https://www.irccloud.com/pastebin/5ZZfqFhf/f17:38
I'm 100% sure I have the proper access rights, and the repo exists. I can use https and clone, for example. I've added those keys, and even copied id_rsa/id_rsa.pub keys from another server that IS working..17:39
ikke So, it seems like it is authenticating, just not seeing a repoi17:39
← igemnace left17:40
→ carl- joined17:42
sharpertool I'm also 100% certain the repo link is correct. I took it from the bitbucket server. I've even copied it from `git remote -v` on a working server, to be extra sure.17:43
ikke sharpertool: can you try to set GIT_TRACE=1 in the environment and then run the clone command again?17:44
sharpertool The only t hing I can figure is something not configured properly on the newly minted windows server 2019, related to OpenSSH. Soething lik that.17:44
Result using GIT_TRACE=1 https://www.irccloud.com/pastebin/rcwnEWlk/17:45
not sure if that extra information is useful.17:45
mackerman Permission denied (publickey)17:46
→ natewrench123456 joined17:46
sharpertool that IP is internal only.17:46
mackerman You are not using the correct key17:46
← meator left17:47
sharpertool The correct key is installed in my ~/.ssh/ directory, that I'm certain of. SSH may be ignoring that key for some reason17:47
mackerman Which ssh package are you using, git for Windows ?17:48
sharpertool yes17:48
Hopefully this does not leak any security information https://www.irccloud.com/pastebin/UjKZSUmv/17:49
← victor left17:50
ikke send_pubkey_test: no mutual signature algorithm17:51
sharpertool There may be an answer in there, but I'm not able to see it..17:51
← OnlineCop left17:51
ikke https://confluence.atlassian.com/bitbucketserverkb/ssh-rsa-key-rejected-with-message-no-mutual-signature-algorithm-1026057701.html17:51
→ Kartagis joined17:52
DoofusCanadensis git 2.33 removed rsa-1 support17:52
sharpertool oh..... well, that explains is.17:53
DoofusCanadensis it's been fun to deal with17:53
sharpertool many many thanks to you all.. this had me stumped.. but, now, it makes perfect sense.17:53
DoofusCanadensis but that article ikke shared shows the fix, so you can work around it17:53
← natewrench123456 left17:53
sharpertool booyah!!17:56
yeah, so simple. Thank you all again... IRC again, FTW!!!!17:56
mackerman How exactly did git 2.33 change affect this? Not seeing rsa in the release notes.17:56
ikke mackerman: probably git-for-windows which bundles more17:57
DoofusCanadensis git-for-windows disabled rsa-1 by default17:57
sharpertool I can confirm, the windows server 2019 that works, has 2.32.x, but the new one I setup has 2.34.12... hence, I was right in the middle of that change.. and is messed me up17:57
mackerman That's an important distinction.17:58
ikke mackerman: they mentioned windows 2019, so that's the context17:58
DoofusCanadensis I didn't realize that it was only git-for-windows that was affected17:58
sharpertool yes, this is git-for-windows issue --- personally, windows has always been a PITA.. but, that's a different channel17:58
mackerman Or you could install Microsoft's ssh package.17:58
DoofusCanadensis I'm just aware of it because I support a windows env17:58
sharpertool It offers the option of using bundled ssh or not..17:59
ikke (out outside of windows) git is just using ssh on the system, so whatever it supports, git supports18:01
DoofusCanadensis oh right, this is an ssh thing itself... git just exposed it18:02
→ dimi1947 joined18:02
→ node1 joined18:05
→ hseg joined18:08
← dimi1947 left18:09
→ BSaboia joined18:10
← BSaboia left18:12
→ BSaboia joined18:12
→ Narrat joined18:13
← carl- left18:15
← zer0bitz left18:15
→ skoma joined18:17
→ dimi1947 joined18:22
← dimi1947 left18:22
← anaveragehuman left18:28
→ hoochmonger joined18:28
← srinidhi left18:33
→ anaveragehuman joined18:33
→ OnlineCop joined18:38
jim Hi...18:41
← feriman left18:42
jim so, I have a local branch master, and a remote branch also called master... I just did git fetch origin master, how do I do the separate merge step?18:42
ikke git merge origin/master18:43
(add --no-ff if you want an explicit merge)18:43
jim ok, that was easy :P thanks a lot :)18:46
← nrg left18:47
j416 or simply, 'git merge'18:47
→ nrg joined18:48
→ feriman joined18:48
→ Jupy7er joined18:48
← Jupy7er left18:49
← skoma left18:53
→ srinidhi joined18:56
→ pyevery__ joined18:57
→ junktext joined18:57
← pyevery__ left18:59
← mannequin left18:59
→ terminalpusher joined19:03
← node1 left19:07
← hseg left19:08
→ hseg joined19:08
← terminalpusher left19:11
← fikran left19:14
← bkay left19:15
← TheCatBehemoth left19:17
→ fikran joined19:17
← furrymcgee left19:18
→ hololeap joined19:21
← spare left19:29
sharpertool rclone19:31
→ duderonomy joined19:33
← duxsco left19:52
→ TheCatBehemoth joined19:56
→ OnkelTem joined20:08
← hseg left20:08
→ hseg joined20:08
→ mat001 joined20:09
← tyson2 left20:18
← OnkelTem left20:20
← TheCatBehemoth left20:23
← ___nick___ left20:25
→ ___nick___ joined20:27
← ___nick___ left20:27
→ spare joined20:28
→ ___nick___ joined20:29
← fstd left20:30
→ fstd joined20:30
→ Pseudocr1 joined20:33
← Pseudocrat left20:35
← murii left20:35
→ john_johnk joined20:37
→ causasui joined20:38
← GNUmoon left20:40
→ nattiestnate joined20:41
← nattiestnate left20:42
→ koalillo joined20:43
→ thiago joined20:44
→ welovfree joined20:52
← junktext left20:53
→ hbautista joined20:54
Timvde I have a bunch of untracked files that will be overwritten by a (fast-forward) merge. Is there a simple flag to just discard my files? I could just remove them, but it's a small bunch of files and just telling git to remove everything that's conflicting would be fine.20:57
I do have some other untracked files that I don't want to discard (yet), so git clean -f wouldn't work20:58
osse there is no command to do exactly that20:59
i'd copy and paste the list20:59
j416 I'd commit them somewhere and then go back to get them as needed21:00
Timvde I was afraid so :) Alright, I'll just do it manually then21:00
osse specifically i'd use my shell's "edit current command in editor" thingy and paste the list in there21:00
and massage it into a neat rm command line21:00
Timvde Well, I'm actually 100% sure that the files have the same contents, so actually I could use commit, rebase, reset, hmm21:00
j416 in that case why not just delete them instead21:01
Timvde That worked perfectly :D21:01
j416 heh21:01
Timvde j416: because I'm too lazy to delete a dozen files one by one :P21:01
← john_johnk left21:01
j416 git clean21:01
Timvde No, that'd delete too many files :P21:02
j416 meh21:02
osse clean -- dir ?21:02
j416 keep the important ones committed :P21:02
Timvde All in the same directory :)21:02
→ hololeap_ joined21:02
Timvde j416: it's WSDLs that I've downloaded to test stuff, but we're implementing things in parallel, and as soon as a part is finished, the WSDL is added to the repository. But I still had them untracked at my side.21:03
j416 I tend to keep things like that in a separate (orphan) branch and check that out in a parallel directory using a separate worktree21:04
← hololeap left21:04
← ___nick___ left21:04
hololeap_ → hololeap21:04
Timvde That would probably have been the smarter approach21:04
j416 another way I use if there's just a couple of files that I think I'll get rid of soon, is to create a .gitignore ignoring those files _and_ .gitignore itself; that way they don't show up as untracked, and I can still use git clean (without -x) to get rid of other stuff21:05
mainly to avoid committing them by mistake21:06
← coot left21:06
→ coot joined21:07
Timvde But if I already have to deal with SOAP, I lower my mental barrier for shrugging things off, and this kind of things happens :P21:07
j416 haha.21:08
Timvde The .gitignore trick is interesting, I wonder how git would have handled the merge then21:08
because the files are still there...21:08
← hseg left21:08
j416 it would have either given you an error, or possibly proceeded to overwrite them without asking (git tends to see ignored files as not important)21:09
→ hseg joined21:09
j416 not sure which in this case; don't think I've ever tried.21:09
← hseg left21:09
← duderonomy left21:10
← coot left21:11
j416 perhaps relevant https://public-inbox.org/git/7viq39avay.fsf@alter.siamese.dyndns.org/21:11
← mat001 left21:11
→ coot joined21:12
j416 tried just now on Git 2.34.1 to merge a commit that adds a file, to a branch that has that same file ignored. Git silently overwrote the ignored file with the version from the other branch.21:13
← coot left21:14
→ coot joined21:14
← Orphis left21:17
← BenjiProd left21:19
→ marink joined21:21
Timvde So I could've added the directory to .gitignore as well21:22
Good to know, thanks :)21:22
I asked it specifically to learn new things, not because I couldn't work it out, so that worked out wonderfully :D21:22
← fikran left21:24
← Ugrastil2 left21:25
→ Ugrastil2 joined21:26
→ fikran joined21:26
→ jazzy joined21:31
← koalillo left21:31
← Murr left21:32
→ Murr joined21:33
← feriman left21:35
j416 \^^/21:35
← otisolsen70 left21:37
← marink left21:37
→ rgrinberg joined21:42
← zmt00 left21:44
→ AbleBacon joined21:44
→ TheCatBehemoth joined21:46
→ TheCatBe1 joined21:49
← TheCatBehemoth left21:49
→ lgc joined21:50
← lgc left21:50
← Galladite left21:52
→ Galladite joined21:52
← Galladite left21:53
→ Gaboradon joined21:57
→ pheron joined21:59
← spare left22:03
→ TheCatBehemoth joined22:04
→ spare joined22:04
← TheCatBehemoth left22:05
→ TheCatBehemoth joined22:05
← TheCatBehemoth left22:06
→ GNUmoon joined22:06
← TheCatBe1 left22:06
← dslegends_ left22:08
→ dslegends joined22:10
← yanmaani left22:13
→ yanmaani joined22:14
← Narrat left22:17
→ hxztnxt joined22:18
← hxztnxt left22:18
→ hxztnxt joined22:20
→ duderonomy joined22:24
← elastic_dog left22:24
← mark_infinite left22:24
→ elastic_dog joined22:25
← anaveragehuman left22:26
→ elastic_1 joined22:27
← elastic_dog left22:27
← welovfree left22:29
→ anaveragehuman joined22:31
← elastic_1 left22:31
→ elastic_dog joined22:31
→ Betal joined22:35
→ ThePhilgrim joined22:40
← pheron left22:46
← Thanatermesis left22:49
← ThePhilgrim left22:49
← kenanmarasli left22:49
→ ThePhilgrim joined22:49
→ koalillo joined22:54
← koalillo left22:56
← pizdets_ left23:02
→ pizdets joined23:03
← GNUmoon left23:04
← peterhil left23:04
→ GNUmoon joined23:04
→ peterhil joined23:04
→ Thanatermesis joined23:05
← Thanatermesis left23:05
→ anandn joined23:08
← yanmaani left23:10
← hololeap left23:10
← coot left23:15
→ Thanatermesis joined23:15
← duderonomy left23:18
← ThePhilgrim left23:19
→ ThePhilgrim joined23:19
← DrowningElysium left23:20
← hxztnxt left23:24
→ ramblebamble joined23:26
← rgrinberg left23:26
→ rgrinberg joined23:28
→ welovfree joined23:29
← mw_ left23:33
→ mw___ joined23:33
← fikran left23:33
mw___ → mw_23:34
→ fikran joined23:35
→ welovfree_ joined23:35
← welovfree left23:36
← welovfree_ left23:37
→ g0zart joined23:39
← ramblebamble left23:39
Pseudocr1 → Pseudocrat23:41
→ hololeap joined23:43
← palasso left23:45
← Camilo left23:47
→ chenqisu1 joined23:55

Logs Search ←Prev date Next date→ Channels Documentation