IRCloggy #git 2022-02-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-02-09

→ foul_owl joined00:01
← odoood left00:03
→ Codaraxis__ joined00:06
← jstein left00:08
← Codaraxis_ left00:10
→ murii joined00:19
← murii left00:24
← pretty_dumm_guy left00:26
→ crashrep joined00:26
→ pretty_dumm_guy joined00:26
← vicecea left00:34
← vicfred left00:34
→ vicecea joined00:35
← tehenderz left00:39
→ tehenderz joined00:40
→ kaiseisei joined00:45
← dflick_ left00:45
← kaiseisei left00:47
→ kaiseisei joined00:49
← kaiseisei left00:50
← Shashin left00:52
→ murii joined00:53
← murii left00:57
← palasso left00:58
→ Shashin joined01:03
← Codaraxis__ left01:04
← fikran left01:06
→ ferdna joined01:06
→ fikran joined01:07
← Shashin left01:13
→ rgrinberg joined01:14
← imp left01:16
← mat001 left01:18
→ antani joined01:21
→ mat001 joined01:24
→ murii joined01:27
← rgrinberg left01:30
→ mra90 joined01:31
← murii left01:31
← x_kuru left01:38
← unluckyshrubbery left01:42
→ unluckyshrubbery joined01:42
→ worky joined01:43
← wonty left01:45
→ Shashin joined01:47
← chenqisu1 left01:47
← duuude left01:50
← antani left01:51
→ axisys joined01:56
axisys how to change the upstream to a different branch? https://dpaste.org/G0dW . I want to change it to origin/mainline-2.001:58
→ murii joined02:00
← ano left02:00
← pretty_dumm_guy left02:00
→ ano joined02:00
axisys this failed02:02
git push -u origin mainline-2.002:02
error: src refspec mainline-2.0 does not match any02:02
← murii left02:04
→ hqdruxn08__ joined02:05
→ duuude joined02:06
← nyah left02:09
← tyson2 left02:09
← hqdruxn08_ left02:10
→ murii joined02:18
→ tyson2 joined02:21
← murii left02:22
← sudoforge left02:27
← cdown left02:29
← mgedmin left02:30
→ mgedmin joined02:32
← mra90 left02:39
→ drbeco joined02:39
← ka80 left02:42
← skapata left02:43
→ stewie925 joined02:46
→ ka80 joined02:49
→ murii joined02:51
← murii left02:55
rewt axisys, on that remote, `git checkout mainline-2.0`02:55
but why does it matter what's checked out on the remote?02:56
→ Vonter joined03:00
→ k8yun joined03:01
← Shashin left03:01
→ junebug joined03:02
→ saroy joined03:02
→ forgotmynick joined03:03
→ yolo joined03:04
yolo is there a command to search *all* sha1sums, including all branches, i.e. every sha1sum in the repo03:05
stewie925 I have updated my git repo name remotely, how do I sync up my local to the remote?03:06
yolo found it, git show does it03:07
→ odoood joined03:11
→ murii joined03:12
← NeilRG left03:13
← fikran left03:15
→ chenqisu1 joined03:16
← murii left03:16
→ fikran joined03:17
yolo so i have a sha1sum that i can git-show but git log --oneliner does not show that, why.03:18
← pmcnabb left03:19
yolo git rev-list --all has it. sigh03:19
→ pmcnabb joined03:19
← odoood left03:21
→ pyeveryt_ joined03:23
yolo git log --all also list all commits, but I have never used --all for git log, strange03:23
← Swahili left03:29
→ Swahili joined03:29
stewie925 hello03:30
I renamed my git repo locally and remotely, and I ran git remote set-url origin <renamed repo name.git> , then when I tried to git push my changes I get `cannot resolve https` error03:31
oh I got it - the remote url is incorrect.... ugh03:34
← ka80 left03:34
← durham left03:34
← vdamewood left03:35
→ pingpongball joined03:35
→ sudoforge joined03:36
→ Emet-Selch joined03:37
→ vdamewood joined03:37
← yolo left03:39
← Azem left03:40
← terrorjack left03:42
→ k8yun_ joined03:43
→ terrorjack joined03:43
← pycurious left03:43
→ murii joined03:46
← pingpongball left03:46
← k8yun left03:47
← stewie925 left03:47
→ rgrinberg joined03:49
← murii left03:51
→ wonty joined03:52
← worky left03:55
← haasn left04:00
← xx left04:01
→ haasn joined04:01
→ jazzy2 joined04:02
→ durham joined04:03
← junebug left04:03
← great_taste left04:05
← jazzy left04:05
→ junebug joined04:06
→ jusski joined04:12
← GNUmoon left04:14
→ murii joined04:20
→ mra90 joined04:21
→ atrigent joined04:22
← Fusl left04:23
→ anaveragehuman joined04:23
← murii left04:24
← adanwan left04:26
→ adanwan joined04:26
← k8yun_ left04:34
→ pingpongball joined04:34
← junebug left04:36
← anaveragehuman left04:38
← jelmer left04:38
→ jelmer joined04:39
→ great_taste joined04:41
← hbautista left04:46
← bket left04:47
→ bket joined04:49
→ Fusl joined04:52
→ murii joined04:53
← pingpongball left04:54
← murii left04:58
← chenqisu1 left05:02
→ karstensrage_ joined05:02
← karstensrage left05:02
← tyson2 left05:03
← drbeco left05:04
← vysn left05:06
← mra90 left05:06
← crashrep left05:12
← forgotmynick left05:13
← gast0n left05:21
← hoochmonger left05:22
← fikran left05:24
→ fikran joined05:26
→ murii joined05:28
→ ackyshake joined05:32
← murii left05:32
← sudoforge left05:39
→ mexen joined05:39
→ drbeco joined05:41
← ackyshake left05:43
← saroy left05:44
→ dtrainor_ joined05:44
← dtrainor left05:45
→ c41e3a joined05:47
← thiago left05:48
→ pingpongball joined05:51
→ ackyshake joined05:52
← bloody left05:54
← atrigent left05:57
← tsdh left06:02
→ murii joined06:03
← junktext left06:07
← murii left06:08
← zebrag left06:09
→ tsdh joined06:09
→ madewokherd` joined06:13
← great_taste left06:14
← madewokherd left06:15
→ otisolsen70 joined06:16
← otisolsen70 left06:17
→ otisolsen70 joined06:17
→ mra90 joined06:22
← mra90 left06:25
→ mra90 joined06:25
← jusski left06:33
← srinidhi left06:34
→ murii joined06:37
→ chenqisu1 joined06:37
→ jazzy3 joined06:38
→ jusski joined06:39
← drbeco left06:39
→ carl- joined06:42
← murii left06:42
← jazzy2 left06:42
← ChmEarl left06:43
← pingpongball left06:43
→ carl-- joined06:44
← carl- left06:46
→ murii joined06:47
← Thanatermesis left06:47
← firewyre left06:48
→ srinidhi joined06:52
← duuude left06:56
→ firewyre joined06:58
← tehenderz left07:00
→ tehenderz joined07:00
← murii left07:01
← dtrainor_ left07:04
→ pingpongball joined07:08
← c41e3a left07:11
→ jnors joined07:12
→ c41e3a joined07:12
← rgrinberg left07:16
→ vanessa joined07:19
← rahl left07:21
← stevenix1 left07:21
→ kenanmarasli joined07:25
← c41e3a left07:27
→ feriman joined07:30
→ zeenk joined07:32
← ferdna left07:33
← fikran left07:34
→ Shashin joined07:34
← hendry left07:35
← jnors left07:35
→ fikran joined07:35
→ hendry joined07:36
→ rfuentess joined07:37
← Shashin left07:37
→ MajorBiscuit joined07:39
→ ThePhilgrim joined07:43
← ThePhilgrim left07:43
← MajorBiscuit left07:44
→ ThePhilgrim joined07:45
← ThePhilgrim left07:45
→ MajorBiscuit joined07:46
← feriman left07:46
→ feriman joined07:48
← feriman left07:50
→ feriman joined07:50
→ masoudd joined07:50
→ yagamilito joined07:51
← masoudd left07:52
→ masoudd joined07:52
← vanessa left07:52
← masoudd left07:53
→ masoudd joined07:53
→ geowiesnot joined07:55
→ GNUmoon joined07:55
→ mcpackey joined07:57
→ vysn joined07:58
→ kaiseisei joined08:00
→ masoudd_ joined08:02
← masoudd left08:05
← unluckyshrubbery left08:07
→ palasso joined08:07
→ iomari891 joined08:12
← pingpongball left08:12
← Akiva left08:13
→ Shentino_ joined08:15
← Shentino left08:16
← kaiseisei left08:26
→ rahl joined08:27
← foul_owl left08:33
→ stevenix1 joined08:33
→ worky joined08:36
← wonty left08:39
→ Shashin joined08:44
← Betal left08:46
canton7 srinidhi, right, but the error came from the fact that your lease was out of date. You were trying to force-push, and the remote side had gained commits since you last fetched, which means that force-pushing would have thrown away commits. Nothing to do with worktrees, and your question didn't even mention the fact you were force-psuing08:50
→ atrigent_ joined08:52
→ l4s8g joined08:54
← Shashin left08:55
→ TomyWork joined08:58
← ishutin left09:00
→ john_johnk joined09:01
→ dtminus joined09:01
← firewyre left09:02
→ ishutin joined09:02
→ TheCatBehemoth joined09:05
← dvanloon left09:05
→ clime joined09:06
← tehenderz left09:07
→ cdown joined09:07
→ tehenderz joined09:08
← dtminus left09:13
← vicecea left09:14
→ spare joined09:14
→ vicecea joined09:14
→ Tobbi_ joined09:16
ad__ → oldwest09:16
← spare left09:17
→ spare joined09:17
← magic_ninja left09:18
← atrigent_ left09:19
→ magic_ninja joined09:20
→ atrigent joined09:21
→ vladoski joined09:21
← magic_ninja left09:21
→ DibbTubberOne joined09:22
← vladoski left09:22
→ cvmn joined09:23
← alip left09:23
→ vladoski joined09:24
→ magic_ninja joined09:24
→ alip joined09:24
→ Shashin joined09:24
← Shashin left09:25
→ zer0bitz joined09:25
→ Sulky joined09:26
← geowiesnot left09:27
← dtux left09:30
← john_johnk left09:31
← l4s8g left09:31
→ firewyre joined09:38
oldwest → oldwestguest09:40
← fikran left09:43
← chenqisu1 left09:43
← yagamilito left09:43
→ fikran joined09:45
→ rsx joined09:48
→ l4s8g joined09:48
← Deknos left09:48
→ chenqisu1 joined09:52
← chenqisu1 left09:53
← DibbTubberOne left09:53
→ chenqisu1 joined09:53
→ unluckyshrubbery joined09:56
← bindu left09:58
srinidhi canton7: thank you for explaining this in detail! I didn't mention that I was force pushing the branch because I thought after rebasing a branch, we have to always force push.10:03
and in this case, as I had also mentioned, I'm the only person working on this branch and I have double checked that the remote branch had not received any commits outside of my local branch.10:04
but yeah, I do admit that I didn't follow my own advise of running "git pull" before rebasing or even making the first commit after switching to worktree workflow.10:05
← vysn left10:06
← mra90 left10:07
→ AnapodoPsalidi joined10:09
→ Rashad joined10:11
← AnapodoPsalidaki left10:11
← jazzy3 left10:11
← spare left10:16
→ bindu joined10:19
→ sfenik joined10:21
← sfenik left10:22
→ spare joined10:23
→ AnapodoPsalidaki joined10:28
→ imp joined10:28
← joachimo left10:29
← AnapodoPsalidi left10:29
→ joachimo joined10:31
→ Codaraxis joined10:31
← Codaraxis left10:31
← pizdets_ left10:33
→ pizdets joined10:33
ronny hi, anyone aware if there is a easy way to drop all blobs/trees that dont belong to heads/recent tags? i want to leave out most of the data of a few hundred git repos10:33
(aka something like doing a filtered repack)10:36
→ xkuru joined10:36
→ john_johnk joined10:47
← spare left10:50
→ spare joined10:51
→ FH_thecat joined10:52
← bindu left10:55
→ dtrainor joined10:57
→ Lord_of_Life_ joined10:59
← Lord_of_Life left11:00
→ mihael joined11:00
Lord_of_Life_ → Lord_of_Life11:00
→ walterwhip joined11:03
← mihael left11:09
← Lord_of_Life left11:11
→ Lord_of_Life joined11:11
→ bindu joined11:15
← john_johnk left11:16
← cvmn left11:16
→ foul_owl joined11:21
← walterwhip left11:26
→ va5c0 joined11:27
← va5c0 left11:27
← Swahili left11:29
→ Swahili joined11:29
→ va5c0 joined11:31
→ jalil joined11:32
← va5c0 left11:32
→ va5c0 joined11:32
← jusski left11:33
← va5c0 left11:35
→ va5c0 joined11:35
← foul_owl left11:36
← zeenk left11:36
← jalil left11:36
← TheCatBehemoth left11:41
← va5c0 left11:41
→ va5c0 joined11:42
→ vitali64 joined11:43
← va5c0 left11:44
→ va5c0 joined11:45
← FH_thecat left11:45
← vitali64 left11:46
→ vitali64 joined11:46
← Eryn83FL_Matrix[ left11:51
→ Eryn83FL_Matrix[ joined11:51
← fikran left11:52
← va5c0 left11:53
→ va5c0 joined11:53
→ fikran joined11:54
← va5c0 left11:55
→ va5c0 joined11:55
← va5c0 left11:55
→ va5c0 joined11:56
→ cdown_ joined11:56
→ pretty_dumm_guy joined11:56
← cdown left11:59
cdown_ → cdown11:59
→ DrowningElysium joined12:00
← va5c0 left12:01
→ va5c0 joined12:01
← l4s8g left12:01
← feriman left12:03
← vitali64 left12:05
← va5c0 left12:07
→ vysn joined12:08
→ pycurious joined12:08
← maxxe left12:10
← M3troidman left12:11
→ M3troidman joined12:12
→ va5c0 joined12:12
← BlessJah left12:17
→ duxsco joined12:17
→ c41e3a joined12:18
→ BlessJah joined12:18
→ ThePhilgrim joined12:20
← ThePhilgrim left12:20
→ ThePhilgrim joined12:21
masoudd_ → masoudd12:25
← duxsco left12:26
→ skapata joined12:32
← skapata left12:32
→ skapata joined12:32
→ tyson2 joined12:32
→ ekathva_ joined12:34
← bindu left12:35
→ feriman joined12:35
← ekathva_ left12:37
→ c41e3a_ joined12:42
→ madewokherd joined12:42
→ bindu joined12:42
→ NeilRG joined12:43
→ AnapodoPsalidi joined12:43
NeilRG how do I squash a set of commits that involve a merge?12:43
← c41e3a left12:44
← AnapodoPsalidaki left12:45
← madewokherd` left12:45
osse NeilRG: is it a merge of another branch that's not wholly contained in the set of commits to squash?12:46
NeilRG osse: I can show you, hang on12:47
osse https://github.com/NeilGirdhar/flax/tree/default_dtypes12:48
hard to see the tree though12:48
osse heh I can tell why you want to squash12:50
(it was small, so I just cloned it)12:50
NeilRG okay how do I squash?12:51
thanks for your help12:51
osse what do you want to squash exactly? http://sprunge.us/o5Edtj12:51
NeilRG normally, I just do git rebase -i and then use fixup12:51
the whole thing12:51
my changes12:51
I want one commit that represents all of these commits12:51
← ThePhilgrim left12:51
→ ThePhilgrim joined12:52
NeilRG that stupid merge is complicating everything12:52
osse I don't know what commits "these" are12:52
← ThePhilgrim left12:52
→ jalil joined12:52
→ ThePhilgrim joined12:52
← ThePhilgrim left12:53
osse You probably started working on some feature/bug/whatever and want to squash all of those?12:53
Where did you start though?12:53
→ ThePhilgrim joined12:53
NeilRG osse 52e5dc712:53
← ThePhilgrim left12:54
→ ThePhilgrim joined12:54
NeilRG can I at least linearize it?12:55
← ThePhilgrim left12:55
NeilRG I want to fix this c053d1412:55
→ ThePhilgrim joined12:55
NeilRG it has two parens12:55
← ThePhilgrim left12:55
NeilRG isn't there a git cut?12:55
→ ThePhilgrim joined12:56
← ThePhilgrim left12:56
osse you've merged main. do you want to pretend you never merged main?12:56
→ ThePhilgrim joined12:56
← ThePhilgrim left12:56
osse or are some of your changes dependent on that?12:57
→ ThePhilgrim joined12:57
NeilRG osse: I want to keep that commit, but make it so it has no pointer to main12:57
that way I can easily linearize everything12:57
← ThePhilgrim left12:57
NeilRG git replace --edit <sha> ?12:57
← chenqisu1 left12:57
→ ThePhilgrim joined12:57
osse I mean... you can just git reset --soft 52e5dc7; git commit -m 'Huge commit'12:57
← ThePhilgrim left12:58
osse that'll keep all the changes and content, even from the merges, but squash it all done into one commit12:58
← jalil left12:58
→ jalil joined12:58
NeilRG osse: Okay, I was wondering about that12:58
← hololeap left12:58
NeilRG I think I'll do that12:59
I hope I don't lose my work12:59
--soft is not necessary right?12:59
hat's teh efault12:59
osse --mixed is default12:59
← rsx left12:59
lericson you can never lose your work if you commit it and know the ref13:00
the ref is often recoverable via the reflog also13:00
so in short, commit13:00
→ hololeap joined13:00
→ ThePhilgrim joined13:00
← ThePhilgrim left13:00
→ ThePhilgrim joined13:00
← ThePhilgrim left13:01
→ duxsco joined13:01
→ Shashin joined13:01
→ Fubbebubbe joined13:01
NeilRG this is pulling in other changes somehow13:01
← AbleBacon left13:02
osse The end result will be identical to the current last commit13:02
NeilRG osse: doesn't look like it13:02
README.md is changed when I do this13:03
but it's not in my pull request13:03
so something is off13:03
← Fubbebubbe left13:03
osse then it was changed in one of the branches that was merged in13:03
NeilRG osse: exactly13:03
→ ThePhilgrim joined13:03
← unluckyshrubbery left13:03
NeilRG how do I squash taking that into account?13:04
osse use git rebase -i as normal. git will drop the merges.13:04
NeilRG how do i take the changes of this pull request that i see in github and turn it into a patch13:04
← ThePhilgrim left13:04
NeilRG osse: okay, hang on13:04
→ menace joined13:04
← menace left13:05
→ menace joined13:05
menace → Deknos13:05
NeilRG grbi 52e5dc7~1?13:05
osse ... but you said "I want to keep that commit, but make it so it has no pointer to main" which I interpreted as you want to keep the content that was merged in13:05
but maybe that's not the case13:05
NeilRG osse: well, I just want my PR to be identical, but only have one commit13:05
that way I can rebase off origin/main until the PR is accepted13:05
osse identical to what? the current state? but the current state includes changes to README.md apparently13:06
NeilRG I mean when I look on github, it shows a set of changes13:07
I want those changes to be identical after the squash13:07
github isn't considering the merged in stuff13:07
maybe I should reset to the merged in commit?13:07
and then commit from there?13:07
osse I don't know13:07
NeilRG and what's the difference between soft and mixed?13:07
osse only whether the index is reset also13:08
NeilRG what does that mean?13:09
osse I'm pretty confident you just want a plain rebase and drop the merges13:09
→ rev1nchn joined13:10
NeilRG osse: so I should do what?13:11
← rudi_s left13:11
osse git reset foo: files on disk are untouched, but HEAD points to foo, so that you have a lot of changes13:11
NeilRG and then push force?13:12
okay I'm doing that now13:12
osse git reset --soft foo: files on disk AND index are untouched. HEAD points to foo, so that you have a lot of changes that will appear as staged13:12
→ unluckyshrubbery joined13:12
→ rudi_s joined13:12
← Flow left13:12
osse I am saying you should do what you normally do, with the rebase -i and the fixups13:12
NeilRG osse: so if git diff origin/main is basically empty, nothing has been lost, right?13:14
osse main??13:14
NeilRG sorry origin/default_dtypes13:15
← Shashin left13:16
osse if the diff with origin/default_types is empty then nothing has been lost13:16
but nothing lost in this case means you keep the changes to README.md that you didn't want13:17
NeilRG osse: yeah but when I rebase off main, then those diffs will disappear right?13:18
osse yeah I think so13:18
NeilRG osse: okay thank you very much for your help13:20
→ humanface joined13:22
← c41e3a_ left13:27
→ c41e3a joined13:29
← c41e3a left13:29
→ molt joined13:30
→ hoochmonger joined13:30
→ vitali64 joined13:38
← molt left13:39
→ bloody joined13:39
← mcpackey left13:45
→ mannequin joined13:51
← vitali64 left13:52
→ Flow joined13:56
→ anaveragehuman joined13:59
→ AnapodoPsalidaki joined14:00
frojnd I would like to push some changes to test repo while in gitlab's runner. Please bare with me... when I do git branch I see: * (HEAD detached at 65df6d1); test so this mean I'm working in deteached state. I tried to git add, git commit and git push HEAD:test but I got message: fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push14:01
HEAD:test HEAD:<name-of-remote-branch>14:01
Any ideas how to push to branch while in detached HEAD?14:01
← AnapodoPsalidi left14:01
← fikran left14:02
frojnd https://stackoverflow.com/a/30471627 <- maybe what I need14:03
→ fikran joined14:04
← vaio left14:04
osse frojnd: you have left out the destination (ie. where to push to)14:05
← hololeap left14:05
osse maybe you want git push origin HEAD:test14:05
→ vaio joined14:06
→ hololeap joined14:06
frojnd Great it worked osse Now I just have to solve 403 which is permission issue. Thank you very much14:07
→ neverfindme joined14:09
← neverfindme left14:09
→ xx joined14:14
→ Gustavo6046 joined14:16
← feriman left14:17
→ Common-Lisp joined14:20
← zer0bitz left14:21
← adanwan left14:24
→ adanwan joined14:24
→ ChmEarl joined14:27
→ TheCatBehemoth joined14:28
→ michigan joined14:29
→ j`ey joined14:29
← j`ey left14:29
→ boxframes_ joined14:29
← Saloframes left14:32
→ drbeco joined14:34
NeilRG why can14:34
can't I reply on github to a coe review in line?14:34
← Gustavo6046 left14:35
→ bkircher joined14:35
← Xenguy left14:36
Emet-Selch → Azem14:36
mackerman NeilRG: More of a querstion for ##github channel14:37
NeilRG mackerman: thanks14:37
→ nyah joined14:40
← spare left14:41
→ spare joined14:41
karstensrage_ → karstensrage14:42
← karstensrage left14:42
→ karstensrage joined14:42
← rev1nchn left14:43
← spare left14:44
→ spare joined14:45
← spare left14:46
→ spare joined14:46
← Dotz0cat left14:48
→ Dotz0cat joined14:54
→ Thanatermesis joined14:56
oldwestguest → oldwildwest15:01
→ Shashin joined15:02
← NeilRG left15:07
→ c41e3a joined15:15
← durham left15:18
← Shashin left15:18
← Common-Lisp left15:20
→ k8yun joined15:21
← anaveragehuman left15:22
→ vitali64 joined15:26
→ anaveragehuman joined15:32
→ rgrinberg joined15:34
→ iateadonut joined15:34
iateadonut someone did a merge that seems to have reverted a file to an older state, but when i do "git log -p file", i don't see commits after the *older* state.15:34
→ zer0bitz joined15:35
→ thiago joined15:35
→ ferdna joined15:35
← shailangsa left15:36
→ odoood joined15:40
→ pingpongball joined15:40
← c41e3a left15:42
← pingpongball left15:45
← duxsco left15:46
→ c41e3a joined15:54
iateadonut so i'm wondering how i can show the history15:54
to see the modifications up to the merge that seems to revert them15:55
→ cousteau joined15:56
← rgrinberg left15:56
cousteau So today I learned that gitk heavily relies on the commit date to sort the commits and generate pretty trees, rather than trying to optimize the graph shape15:56
I had this workflow in which branch 1 is tracking a remote directory, and branch 2 = branch 1 + some minor fixes needed for the remote code to work on the local machine. Whenever the remote code changes, I rsync it, commit to branch 1, and then merge into branch 2, so branch 1 = remote code and branch 2 = remote code + modifications.15:59
← iomari891 left16:00
→ rgrinberg joined16:01
→ lgc joined16:02
cousteau This looked awesome in gitk: 2 parallel "tracks" with a few diagonals going from one track to the other. The graph was representing exactly the model I had in mind.16:02
But today I changed the order in which I do the merges (I committed something to branch 1 and then merged an OLDER commit to branch 2) and everything went crazy. My two-column gitk graph spreaded into a lot of columns and became an absolute mess :(16:04
I ended up having to actually change the commit date of the merge to trick gitk into understanding how it had to draw the graph :|16:05
In short... it would be nice if gitk were a bit smarter about drawing trees.16:06
I may submit an email to the mailing list reporting this "bug"16:06
← anaveragehuman left16:07
→ john_johnk joined16:09
→ anaveragehuman joined16:09
← lgc left16:10
← fikran left16:11
← iateadonut left16:11
→ durham joined16:12
→ fikran joined16:13
← masoudd left16:15
← tyson2 left16:20
← reset left16:24
→ great_taste joined16:26
← skapata left16:28
→ durham_ joined16:30
← durham left16:33
← anaveragehuman left16:34
→ reset joined16:34
→ anaveragehuman joined16:39
→ cdown_ joined16:41
cousteau If I stage a file, and then checkout a different commit, will the index be a copy of the PREVIOUS commit with the change on the staged file, or will it become a copy of the NEW commit with the changes merged?16:41
Or does git simply refuse to checkout another commit if you have things pending to commit?16:42
← cdown left16:43
cdown_ → cdown16:43
→ jinsun__ joined16:44
← jinsun left16:44
cousteau Or are the changes in the index discarded?16:44
← vladoski left16:45
→ dtrainor_ joined16:45
← dtrainor left16:48
→ dtux joined16:49
→ zebrag joined16:49
cousteau Oh interesting, it seems to... sort of cherry-pick the changes from HEAD to index and apply them on top of the new HEAD, is this correct?16:50
→ Akiva joined16:52
→ hseg joined16:59
→ AbleBacon joined17:02
cousteau Stackoverflow told me to go read git-read-tree, let's see...17:02
← tehenderz left17:03
→ tehenderz joined17:03
← durham_ left17:03
→ sudoforge joined17:04
canton7 cousteau, gitk is heavily optimized to be able to draw a complex graph incrementally -- it doesn't need to load the entire history in order to figure out where to draw things: it needs to be able to draw what's currently in the window, then add to it as you scroll around17:04
cousteau, I've seen a few requests for different graph outputs, and they've fallen foul of that single requirement17:04
← michigan left17:04
canton7 cousteau, if you want to make a report, you'll need to explain how this can be done incrementally, in order to cope with large histories17:05
→ durham joined17:05
cousteau Hm, I see17:05
canton7 cousteau, there is an option to "Strictly sort by date" in the View menu -- I used that when it decides to mess around with the order of things too much. There are some other options for sorting as well17:05
cousteau And... I guess "it should look pretty" without any code to back it would be kind of worthless, right?17:05
canton7 There are other tools (I forget the names) which prefer to draw things in a nicely-structured way17:05
cousteau is still convinced MS Paint is a valid programming environment17:06
cousteau canton7: yeah, strictly sort by date fixed the graph quite a bit17:07
← jalil left17:07
← jinsun__ left17:07
← durham left17:08
cousteau Anyway I'll consider writing a testcase and submitting it to the list to see if anyone can figure out why it looks awful and if it might be easy to fix17:08
And, most importantly, to see if newer versions have fixed it. Maybe they have...17:08
→ durham joined17:10
→ michigan joined17:10
← durham left17:10
→ jinsun joined17:11
← mexen left17:12
→ zopsi joined17:13
→ durham joined17:13
→ duxsco joined17:14
← MajorBiscuit left17:14
← Shentino_ left17:14
← rgrinberg left17:16
← c41e3a left17:20
→ masoudd joined17:21
← Akiva left17:23
← cryptonector left17:24
→ hbautista joined17:24
← tchan left17:25
→ cryptonector joined17:30
← durham left17:31
← anaveragehuman left17:31
→ c41e3a joined17:32
→ tchan joined17:33
→ wootehfoot joined17:33
← ss4 left17:34
→ jalil joined17:34
→ tyson2 joined17:35
→ durham joined17:35
← durham left17:38
→ rgrinberg joined17:39
← john_johnk left17:39
→ durham joined17:41
→ gast0n joined17:42
← rfuentess left17:44
← durham left17:44
→ durham joined17:45
← Dotz0cat left17:45
← durham left17:49
→ Dotz0cat joined17:50
→ ecraven joined17:50
ecraven hello ;)17:50
→ durham joined17:50
← durham left17:50
ecraven I can see the changes for a given file with `git diff other-branch filename`, but how can I pull only those changes into the current working directory or staging area?17:50
← sgen left17:51
→ anaveragehuman joined17:52
→ durham joined17:52
← cousteau left17:59
← pycurious left18:01
→ Shentino joined18:06
→ crashrep joined18:06
→ ___nick___ joined18:09
← durham left18:12
← csm3105 left18:16
→ tirnanog joined18:16
← vitali64 left18:19
rewt ecraven: `git checkout other-branch -- filename` to get only filename from other-branch18:20
← fikran left18:21
→ vitali64 joined18:21
→ stewie925 joined18:22
→ fikran joined18:22
← vdamewood left18:24
→ junebug joined18:25
← carl-- left18:25
← va5c0 left18:27
← anaveragehuman left18:29
← ash_worksi left18:33
→ hornbill047 joined18:34
→ ash_worksi joined18:34
← ash_worksi left18:34
→ ash_worksi joined18:35
→ skapata joined18:35
← skapata left18:35
→ skapata joined18:35
ash_worksi I don't understand why running `git diff --cached origin/master -- path/to/unstaged/file` shows *some* of my changes but the immediate most one18:36
← hornbill047 left18:38
→ hornbill047 joined18:38
→ pycurious joined18:39
ash_worksi oh I see18:40
nvm18:40
← pycurious left18:40
hornbill047 → hornbill18:40
→ pycurious joined18:40
hornbill → hornbill04718:40
hornbill047 → kurian18:40
← rossome left18:42
vaio hi, is there a way to revert a rebase ?18:43
→ emf_ joined18:44
← pycurious left18:44
← emf left18:45
vaio this is the last things a ran: https://0x0.st/oXfd.txt ; and it seems i lost some local changes18:45
and i'd like to know if those can be recovered :s18:45
← kurian left18:46
→ vandito joined18:49
→ Betal joined18:50
← hseg left18:52
← vandito left18:52
→ hseg joined18:52
← junebug left18:53
← ___nick___ left18:53
→ ___nick___ joined18:55
← spare left18:55
→ vicfred joined18:56
← vitali64 left18:57
vaio (nvm, fixed with git reset --hard; sorry for the noise)18:59
→ durham joined19:00
→ humanBird joined19:00
← durham left19:00
← TomyWork left19:03
← LuKaRo left19:05
→ durham joined19:07
← durham left19:07
← FinnElija left19:07
→ durham joined19:07
← durham left19:07
← jalil left19:08
→ jalil joined19:09
→ jstein joined19:10
→ FinnElija joined19:10
← c41e3a left19:12
← stewie925 left19:14
→ stewie925 joined19:15
→ c41e3a joined19:15
→ Jdeep joined19:16
Jdeep guys.19:16
is there a matrix bridge for this server?19:17
← great_taste left19:17
→ LuKaRo joined19:18
ikke you should ask in #libera19:18
Jdeep ok19:19
← xx left19:20
← hseg left19:22
→ hseg joined19:22
← Rashad left19:23
← ChmEarl left19:30
→ ChmEarl joined19:30
→ xx joined19:31
→ pycurious joined19:34
→ toma joined19:36
← toma left19:36
→ toma joined19:37
→ jazzy joined19:38
← Jdeep left19:40
← jalil left19:41
← vysn left19:45
← imp left19:48
← rgrinberg left19:49
← c41e3a left19:52
← crashrep left19:54
→ crashrep joined19:55
← pyeveryt_ left19:56
← ChmEarl left19:56
→ ChmEarl joined19:56
→ feriman joined19:57
→ jalil joined19:58
→ great_taste joined20:00
→ vdamewood joined20:01
→ pyeveryt_ joined20:02
→ CarloWood joined20:04
CarloWood Hi. I have a branch called 'libcwd' and a branch called 'lost_mouse_button_release_event'.20:04
I am working on the branch 'lost_mouse_button_release_event' without doing commits.20:05
→ voltron joined20:05
CarloWood Every 2 minutes I want to compile and test, but that compile must be done on a merge of what I have in the current directory and branch 'libcwd'.20:05
What is to best way to do this?20:06
tsdh CarloWood: git stash && git merge libcwd && git stash pop, or can't you for some unknown reasen not simply merge libcwd?20:07
← ferdna left20:08
← k8yun left20:09
→ vinleod joined20:09
CarloWood I'll have to do a pull request to upstream for 'lost_mouse_button_release_event' (they requested a MCVE). I can't merge that with the libcwd branch because then they can't compile it anymore.20:10
← vicecea left20:10
→ vicecea joined20:11
CarloWood I suppose I can create a new branch that is a merge and work there.. and then later do a cherrypick in 'lost_mouse_button_release_event'20:11
← vdamewood left20:12
tsdh CarloWood: Yes, sounds about right. I don't fully understand why you need the changes in the libcwd branch while upstream won't be able to compile if that's merged. But probably I don't actually want to know the details. ;-)20:13
← clime left20:14
← humanface left20:14
CarloWood I need them to get extremely detailed debug output, almost line by line, of what is happening.20:14
← jalil left20:15
CarloWood They can't compile/use it because they won't want to take the time to setup the environment needed to make libcwd work (my debugging library).20:15
→ viridian joined20:15
tsdh Ah, I see.20:16
CarloWood (ie, download, configure and install libcwd - create an environment with an extra git submodule and change their CMakefile's to get it to work)20:16
→ junebug joined20:17
→ rgrinberg joined20:17
imMute no idea where that came from, but pls ignore20:19
oh, it was irssi/tmux making Thuryn's comment look like mine >.<20:19
CarloWood I didn't see anything20:20
imMute ugh. just irssi/tmux fucking with me.20:20
← voltron left20:26
← hseg left20:28
→ hseg joined20:28
← fikran left20:29
→ fikran joined20:32
← viridian left20:33
→ viridian joined20:33
→ yagamilito joined20:35
← yagamilito left20:35
→ yagamilito joined20:35
← hseg left20:37
→ hseg joined20:40
← masoudd left20:40
← rgrinberg left20:43
→ zeenk joined20:51
← pycurious left20:55
← TheCatBehemoth left20:56
← hseg left20:56
ecraven rewt: thanks!20:57
→ OnkelTem joined20:58
→ m0viefreak joined20:59
← crashrep left21:01
← stewie925 left21:03
← ___nick___ left21:04
→ pycurious joined21:07
→ Shashin joined21:08
→ rgrinberg joined21:08
← viridian left21:09
← toma left21:11
← GNUmoon left21:12
→ dsrt^ joined21:12
→ Tangent-Man joined21:16
← humanBird left21:17
← SuperLag left21:20
→ SuperLag joined21:22
OnlineCop My repo contains three submodules. One submodule's HEAD points to main, and the other two submodules' HEADs point to dev. When I'm in my main repo and change branches, it's often changing the HEAD of those submodules. Is there a setting to disable that (so I have to change the HEAD in those submodules manually)?21:22
← pycurious left21:23
→ pycurious joined21:23
← pycurious left21:28
→ zacts joined21:28
zacts hi what's the best book for learning git for a complete beginner to git?21:29
ikke !book21:29
gitinfo There are several good books available about git; 'Pro Git' is probably the best: https://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable21:29
zacts thanks21:29
→ stewie925 joined21:31
← cliluw left21:31
← otisolsen70 left21:33
→ cliluw joined21:34
→ causasui joined21:37
stewie925 hey guys, whats a clean way to move files within my git repo (local) to a new folder, then PUSH it to github?21:37
ikke git mv src dst; git commit; git push?21:38
stewie925 I wonder if git push process would be able to figure it out that I did a git mv locally and implement the same change ?21:38
ikke stewie925: git push does not care21:38
stewie925 ikke: oh nice, just as I thought21:38
ikke stewie925: git is not a file sync program21:39
you commit the changes, git push just pushes that commit21:39
you can even just use mv, git rm --cached and git add21:39
stewie925 ikke: "git is not a file sync program - you commit the changes, git push just pushes that commit". Well said.21:39
ugh Ive been out of a job for too long and forgot my git commands21:40
→ pycurious joined21:41
← cliluw left21:43
→ cliluw joined21:44
stewie925 yay, EZ PZ! Done-zo!21:47
→ yashraj466 joined21:48
← OnkelTem left21:49
← kilobyte1 left21:53
→ hrehf joined21:54
→ kilobyte_ch joined21:54
← hrehf left21:54
→ hrehf joined21:54
← hbautista left21:55
→ hbautista joined21:56
→ dmc joined21:57
hrehf Hmm, I have a bunch of technically unrelated repos, where someone decided to cold start every project year. I'd like to restore a continuous history in a single repo. Can I just force pull unrelated histories to achieve that and rebase? or do I need some script that copies each revision over?21:57
(Files didn't change much between project years)21:57
ikke hrehf: look at man git replace --graft21:58
gitinfo hrehf: the git-replace manpage is available at https://gitirc.eu/git-replace.html21:58
hrehf ikke: do I understand right, I just replace --graft each root commit onto the last commit of previous year?22:02
ikke hendry: yes, that would be the idea22:03
hrehf Cool, gonna try that, thanks!22:03
← zacts left22:03
← pyeveryt_ left22:03
ikke after that, you use something like git filter-repo (third-party tool) to make it permanent22:03
→ duxco joined22:03
← duxsco left22:05
duxco → duxsco22:05
→ GNUmoon joined22:06
hrehf ikke: hmm, why is it not permanent? Shouldn't it be part of a named branch already? Maybe I'm not getting what replacing refs means yet22:06
ikke hrehf: it relies on the replace refs being pushed and fetched, which is not being done by default22:07
← Shashin left22:07
→ dirigible joined22:07
← dmc left22:08
→ Shashin joined22:09
← Shashin left22:09
→ Shashin joined22:10
← dirigible_ left22:10
→ dmc joined22:11
← Shashin left22:11
← Deknos left22:12
← bkircher left22:13
→ The_Blode joined22:15
← The_Blod- left22:16
← stewie925 left22:19
← hrehf left22:19
→ wonty joined22:19
→ hrehf joined22:20
← worky left22:22
← duxsco left22:26
← cliluw left22:26
← junebug left22:28
→ zacts joined22:30
← yagamilito left22:32
→ stewie925 joined22:34
← ikwyl6 left22:37
→ ikwyl6 joined22:37
hrehf ikke: thanks again, that seems to work! I just run it through git-filter-repo --force, hope that's doing its job. Repo looked okay before as well, where would I expect breaking without filter-repo?22:38
→ cliluw joined22:38
← fikran left22:39
← causasui left22:40
← odoood left22:41
→ fikran joined22:41
← pycurious left22:43
→ pycurious joined22:45
← feriman left22:47
← rgrinberg left22:47
← pycurious left22:50
→ pycurious joined22:51
→ causasui joined22:52
← great_taste left22:54
→ causa_sui joined22:54
→ foul_owl joined22:55
← pycurious left22:55
→ pycurious joined22:57
← ash_worksi left22:57
← causa_sui left22:59
← pycurious left23:01
→ rev1nchn joined23:02
→ pycurious joined23:03
← pizdets left23:03
→ pizdets_ joined23:04
← mat001 left23:05
← foul_owl left23:06
← zeenk left23:06
← rev1nchn left23:07
← kenanmarasli left23:08
→ yagamilito joined23:13
← lechner left23:13
→ cornfeedhobo joined23:18
→ foul_owl joined23:21
cornfeedhobo question about submodules. i'm finding that sync --recursive does not pull submodule's submodules (in this case the nested submodule points to a relative path and I have no control over this)23:23
however, if i use update --init --recursive, it does pull the nested submodules23:23
← yashraj466 left23:23
→ Xenguy joined23:24
cornfeedhobo what is the correct way to populate the submodules without making the tree change references23:24
→ paddymahoney joined23:25
CarloWood What do mean 'change references'?23:26
→ mat001 joined23:26
→ odoood joined23:27
cornfeedhobo well, these submodules are cloned at a specific commit, right? and that is maintained somewhere, right?23:28
CarloWood Yes, as commit in the module they are contained in.23:28
Can you reproduce the sync case now?23:29
cornfeedhobo and so i would think that `update` would update that reference, no?23:29
CarloWood That seems unlikely :/23:29
cornfeedhobo hmm, this brings up the question then. how do you update that reference to a newer commit?23:30
CarloWood git add subdirectory23:30
→ causa_sui joined23:30
CarloWood and then commit that23:30
If you type: git submodule status23:31
it prints all the refs23:31
so you can easily check if they change when you do an --init --recursive or whatever.23:31
And I suspect that if your sync isn't working, you'll have some prefixed with a '-'23:31
cornfeedhobo that is correct. what does the prefix mean?23:32
CarloWood I knew that, in a distant past :/23:32
I have an SO answer about it even, somewhere23:32
→ jumpcutking joined23:32
CarloWood From the top of my head it means that the submodule was never checked out (directory is empty) and you need to --init it23:33
← Kilroy left23:33
cornfeedhobo and so am i reading betweens the lines correctly that git expects one to cd to the submodule path and run `git pull` before running `git submodule add`? is that how one would update the ref intentionally?23:34
CarloWood I use a system myself that DOES refresh submodules to the HEAD of their branch, but that required hard work from my end :P23:34
← causa_sui left23:34
CarloWood Normally that should never happen - it doesn't even HAVE a branch - just a hash. How could it update that to a newer one?23:35
cornfeedhobo i don't follow23:36
the directory is a full blown repo23:37
CarloWood git submodule add is to add a directory to your source tree in which a submodule is checked out. That is hardly something you do often.23:37
cornfeedhobo okay23:37
so back to the question of how to intentionally update a submodule ref23:37
CarloWood Where 'update' means?23:37
submodules aren't as user friendly as you think, I think... I seriously wrote a whole system around them to make them user friendly (to the deveper - not the occasional person that checks out a repo and then compiles it)23:38
cornfeedhobo Dependency bar releases a new tag and repository foo wants to update it's submodule to use this newer release of bar23:38
CarloWood developer*23:39
cornfeedhobo If you want to check for new work in a submodule, you can go into the directory and run git fetch and git merge the upstream branch to update the local code.23:39
nvm found my answer23:39
CarloWood Maybe you want to try my system :)23:39
cornfeedhobo interesting `git submodule update --remote`23:40
CarloWood https://github.com/CarloWood/cwm423:40
Still mentions autoconf, but I use cmake now - so it's mainly for that now (as in being maintained)23:41
→ causa_sui joined23:41
CarloWood What I do is run my script (./autogen.sh) which ... automagically fixes EVERYTHING.23:43
:)23:43
I forgot most of the rest - it Just Works(tm).23:43
cornfeedhobo lol. na this gave me the answers i needed. the subcommands are just poorly named, at least in my opinion23:43
CarloWood But among others, it adds a branch name to submodules and keeps them up to date (when I run that script)23:44
← causa_sui left23:45
CarloWood https://gyazo.com/84d606b3c731e59593c3ab23f5a0e79923:45
← madewokherd left23:46
CarloWood It even managed to completely not fuck up the work that I'm in the middle of doing ;)23:48
→ great_taste joined23:49
← m0viefreak left23:50
← jstein left23:51
→ lechner joined23:52

Logs Search ←Prev date Next date→ Channels Documentation