IRCloggy #git 2023-09-16

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.

2023-09-16

CharleyBates joined00:04
stats4647 joined00:06
stats4647 left00:10
ThorMojito joined00:12
ThorMojito left00:13
C0MMIE joined00:16
ThorMojito joined00:21
cdown joined00:22
ThorMojito1 joined00:22
ThorMojito left00:26
skapata left00:27
skapata joined00:28
navirc left00:35
duderonomy left00:38
jklfds joined00:40
d1b_ joined00:42
nickoe25 left00:45
nickoe25 joined00:45
jklfds left00:49
grumbler left00:50
ThorMojito1 left00:55
nanobot567 joined00:58
nanobot567 left00:58
nate2 joined00:59
xeelad joined01:00
xeelad left01:00
nanobot567 joined01:01
mataga left01:03
nate2 left01:04
nanobot567 left01:06
vdamewood left01:07
mataga joined01:08
mataga left01:08
mataga joined01:08
ThorMojito joined01:11
omero left01:12
omero joined01:14
duderonomy joined01:17
jklfds joined01:17
Vonter left01:20
jklfds left01:22
piwu1 joined01:22
Vonter joined01:22
powderhorn left01:33
Jaxef joined01:35
nanobot567 joined01:35
nanobot567 left01:36
gsi left01:40
wootehfoot joined01:41
gsi joined01:41
jklfds joined01:41
Jaxef left01:42
wootehfoot left01:46
jklfds left01:46
wootehfoot joined01:47
ketas left01:49
ferdna_ joined01:50
ketas joined01:52
wootehfoot left01:53
ferdna left01:53
jklfds joined02:00
cbreak left02:02
cbreak joined02:03
jklfds left02:04
m0viefreak left02:05
feriman left02:05
vysn joined02:10
PantelicGR left02:12
BrianBlaze joined02:14
jklfds joined02:17
jklfds left02:21
FinnElija left02:31
jklfds joined02:33
jklfds left02:38
cdown left02:47
hrtk joined02:55
lunatiq joined02:56
lunatiq left02:56
lunatiq joined02:56
hrtk left03:00
FinnElija joined03:00
ThorMojito left03:03
omero left03:04
omero joined03:06
jklfds joined03:07
Gary_Sinise left03:10
jklfds left03:11
vysn left03:12
wonko-the-sane joined03:13
gast0n left03:19
Peng_ joined03:32
jklfds joined03:33
jklfds left03:37
Jaxef joined03:49
ferdna_ left03:58
wonko-the-sane left03:59
wonko-the-sane joined04:01
Gary_Sinise joined04:02
jacobk left04:03
agd85120101 joined04:04
jklfds joined04:05
CaCode joined04:06
jklfds left04:09
jklfds joined04:10
larryv left04:10
CharleyBates left04:12
jacobk joined04:14
jklfds left04:15
CharleyBates joined04:18
nanobot567 joined04:28
nanobot567 left04:29
Minvera left04:29
Leonarbro left04:30
Fischmiep joined04:34
jklfds joined04:45
wyre joined04:46
stolen joined04:48
jklfds left04:51
nickoe25 left04:55
nickoe25 joined04:55
Gary_Sinise left04:56
nate2 joined05:00
jklfds joined05:03
nate2 left05:05
CaCode left05:05
qqq joined05:05
genesis1523 joined05:06
bloody left05:08
jklfds left05:08
techietrash left05:12
techietrash joined05:12
gsi regarding that "inconsistent newlines" (https://pastebin.com/E3Gt371e referenced above) -- is it really the protocol that inconsistently handles line termination, or is it your traffic which does not match the protocol? announcing lengths that don't match the payload of the text line's remainder05:13
Gary_Sinise joined05:14
Noisytoot joined05:14
gsi am guessing here, as the paste does not visually represent what the end-of-lines look like, could not spot other differences from a quick glance05:14
and is line termination required even? or does the length just specify the remaining text's length which allows reliable consumption without a line requirement?05:18
that git-run discussion sounds like a lot of assumed policy and feels rather project specific to me, would not be surprised if something so special has not been done before because it's hardly generically applicable in many places05:22
sure there are ways to query the repo's starting location, so remaining in the root dir or changing to subdirectories can be dealt with, but it always feels like these should be local scripts not common git tooling05:23
I'd even go as far as suggesting that your build or deploy or other tools should not depend on a specific version control system, and should keep working regardless where you got the source files from (any other VCS, or tarball, or sneaker net)05:24
invoke them in any way you like, don't expect your VCS to do that (why should it? just because you happen to use this one today?)05:25
theobjectivedad left05:28
Noisytoot left05:29
theobjectivedad joined05:29
jklfds joined05:32
Noisytoot joined05:32
jklfds left05:37
wonko-the-sane left05:41
Guest47 joined05:42
tomboy64 left05:49
Gary_Sinise left05:51
Guest47 left05:52
crabbedhaloablut joined05:53
berkay joined05:54
bket_ left05:57
bket joined06:00
tomboy64 joined06:02
jklfds joined06:03
omero left06:12
omero_o1 joined06:12
omero_o1omero06:12
crabbedhaloablut left06:18
thiago left06:19
crabbedhaloablut joined06:19
Wooski joined06:27
Wooski left06:27
jklfds left06:34
Gary_Sinise joined06:38
jklfds joined06:38
jklfds left06:52
jklfds joined06:52
jklfds left06:57
nickoe25 left06:59
nickoe25 joined06:59
gblfxt__ joined07:00
jmd joined07:00
coot joined07:03
jklfds joined07:06
elastic_dog left07:07
tejr joined07:10
Rashad joined07:11
jklfds left07:11
jklfds joined07:12
tejr left07:13
tejr joined07:15
elastic_dog joined07:15
hbautista_ left07:15
jklfds left07:16
hrtk joined07:17
jrm joined07:17
omero left07:23
omero joined07:24
jklfds joined07:31
resamvi joined07:32
Nei joined07:33
jklfds left07:35
hrtk left07:38
jklfds joined07:39
wonko-the-sane joined07:40
rgrinberg joined07:43
jklfds left07:44
jklfds joined07:45
jklfds left07:50
Gary_Sinise left07:56
navirc joined07:58
resamvi left08:02
Stooge joined08:10
epicout joined08:15
epicout left08:15
epicout joined08:15
jklfds joined08:15
Jck_true joined08:15
michelem joined08:16
michelem hello folks! Please help me understand what to do in this case:08:16
I spawned "feature1" and "feature2" from the "main" branch. Feature2 is now completed and merged back into "main". Feature1 is still ongoing, and would like to use "feature2" in it (it improved CICD).08:17
wonko-the-sane left08:18
michelem I am confused now as to how I should best do that. Last time, in a similar scenario, I cherry picked some commits of Feature2 into Feature1's branch. That gave me hell when I later tried to rebase Feature1 into main.08:18
jklfds left08:19
iomari891 joined08:22
dviola left08:24
dviola joined08:26
cafkafk joined08:27
mjt0k michelem: cherry-picks from main usually does not affect future rebase, unless the same place(s) are modified several times08:28
(unless the same commits are modified later in main)08:28
but I'd say you can rebase your in-progress feature onto main now08:28
michelem mjt0k: rebase the in-progress feature onto main?08:34
gsi +1, considering that a rebase is a series of cherry picks, it's unlikely that your pain originated from that activity08:34
michelem the in-progress feature is not ready for that. The goal was to therefore incorporate new changes into it08:35
gsi maybe it could have been an improper sequence of picking, changing contexts and resulting in conflicts when picking more?08:35
should not happen if you just rebase08:35
which keeps the sequence08:35
re-read the above, the suggestion was to rebase the incomplete feature1 onto main, not merge it into main08:36
mjt0k yea, that's what I mean mentioning other patches modifying the same place08:36
michelem I thought of rebasing feature2 into feature1. That gives me 2 problems: 1) I deleted the branch of feature2 already when I merged it (rebased) into "main". 2) I suppose that would give me problems when I rebase feature1 into main, because the patches of feature2 would be re-attempted.08:36
I did read it multiple times. I'm not sure I understand. By "rebasing into main" you mean that main would be changed to now include (preliminary) changes from incomplete feature1, correct? I cannot do that. That would break production.08:38
mjt0k rebasing "on top" of main if that's easier08:38
right now your incomplete feature is based on some old version of main08:39
rebasing it on top of your current main - so it will be main+feature, without affecting main itself - is what the talk's about08:39
kiruny joined08:40
michelem ok, that shows I should understand that better. What does "rebasing on top of main" mean? You mean take the new patches come into main (from feature2) and apply them to "feature1" – do I understand correctly?08:40
mjt0k which means picking up all commits between that old version of main and current main righht before first commit of your feature08:40
gsi well, rebase is not _into_ but _onto_, let this sink in for a moment08:41
michelem so main stays unchanged and feature1 takes its heap of patches08:41
ursa joined08:41
michelem yes, onto.08:41
mjt0k nods at gsi08:41
mjt0k michelem: the diff between your explanation and mine is that your version assumes commits from main comes on top of feature1, while mine means that commits from feature1 comes on top of main and stays on feature1 branch08:42
your feature1 is a branch from some old version of main. You cut off that branch and move it to current top of main08:43
think of real-life tree. You cut off a branch and move it elsewhere08:43
michelem that's the part I could not fathom. I'll take 10' to read again Git Rebase docs to understand.08:44
jklfds joined08:44
gsi make sure to not watch youtube videos which explain it terribly and keep getting it backwards :)08:45
michelem ah ah ah ah :)08:45
I'm on git-scm08:45
gsi can't remember which one I've seen, but it was really confusing and did a dis-service to its audience08:46
jklfds left08:49
michelem ok, understood. That helped me. Thank you mjt0k and gsi for your patience and clarity.08:50
gsi: Yes, lots of that on YouTube. It's a marveling platform which unleased individual creativity. And at the same time a lot of junk comes along with the good stuff. Like "news" on social media, which lack any check by an institution that has its reputation at stake of what they publish.08:52
cadmio joined08:53
cadmio I'm using a script to automatically update the repository as git add .; git commit -m "update all"; git push Is there way to inster the authentication part in the script?08:54
gsi use a transport for the remote which does not involve manual interaction? (that's all which can be said given this amount of information in the question)08:56
check your remote's documentation on the subject, others don't know what your setup looks like08:56
cadmio isnt' there a git authentication my_user or something similar08:57
ccx joined08:59
wonko-the-sane joined09:00
nate2 joined09:02
resamvi joined09:03
humanface joined09:05
nate2 left09:07
wootehfoot joined09:08
theoceaniscool joined09:08
erty joined09:10
m0viefreak joined09:12
Inline left09:14
rgrinberg left09:15
pulec left09:18
Inline joined09:18
jklfds joined09:19
pulec joined09:19
pulec left09:23
pulec joined09:23
jklfds left09:24
Guest5975 joined09:24
Guest5975 left09:25
Jaxef left09:25
Guest5975 joined09:25
Guest5975 left09:30
ferdna joined09:32
f_ joined09:33
noord joined09:35
m_ben joined09:37
bombastick cadmio: if you use SSH for authentication instead of username and password, it's by definition non-interactive09:41
humanface left09:41
bombastick otherwise, you can use the "credentials timeout" option (forgot what it was) to remember the username/password09:41
cadmio bombastick: how can I modify the script to use ssh?09:41
humanface joined09:42
jklfds joined09:43
bombastick you can usually do this on Github/Bitbucket/etc and they provide all instructions. But the summary of the steps is: 1) create a new encryuption key pair (one private, one public). 2) upload the public one to Github/Bitbucket/whoewver your host is. 3) Put the private one in the appropriate location on your computer (on Liunux ~/.ssh/id_rsa). 4) From then on can just clone using the SSH URL09:44
Github/BB/etc gives you (different from https)09:44
and 'git push' automatically uses the ssh auth if you cloned your repo that way09:44
meaning if your script doesn't clone, just adds and updates...you dont have to modify your script at all.09:45
Lunatrius left09:45
bombastick just pre-clone it via SSH09:45
resamvi left09:46
jklfds left09:48
cadmio and for the time delay?09:48
bombastick what time delay?09:49
Lunatrius joined09:50
cadmio after I run the script it asks for user & pwd09:51
(without the ssh)09:51
bombastick not if you use SSH auth.09:51
oh, you mean the credentials timeout thing09:51
cadmio yeah09:51
bombastick git config --global credential.helper store you lazy bum09:51
this caches HTTP auth09:51
hrtk joined09:53
cadmio left09:59
Jaxef joined10:01
skapata left10:06
hrtk left10:06
jklfds joined10:10
dskull joined10:10
michelem left10:10
Jaxef left10:13
jklfds left10:14
hrtk joined10:14
Lunatrius left10:17
erty left10:19
hrtk left10:22
Bombe left10:24
Bombe joined10:24
omero left10:25
omero joined10:26
dskull left10:27
anselmschueler joined10:27
hrtk joined10:27
vysn joined10:27
anselmschueler What exactly is the difference between `git add -A` and `git add -u`? They seem to do the same thing (when there are no pathspecs)10:28
Is the only difference that `git add -u <pathspec>` and `git add -A <pathspec>` are different?10:28
feriman joined10:31
dskull joined10:32
jklfds joined10:36
thuna` joined10:36
stolen left10:37
hrtk left10:38
psukys joined10:41
jklfds left10:41
Lunatrius joined10:44
osse anselmschueler: -A will add *new* files as well. -u doesn't do that10:45
Lunatrius left10:46
anselmschueler left10:47
anselmschueler joined10:48
Lunatrius joined10:49
hrtk joined10:50
Rashad left10:51
hrtk left10:54
Suchiman joined10:56
anselmschueler left10:57
rgrinberg joined10:58
ario left11:00
ario joined11:00
stolen joined11:00
jklfds joined11:05
humanface left11:06
hrtk joined11:06
nickoe25 left11:08
nickoe25 joined11:08
hrtk left11:10
jklfds left11:11
Leonarbro joined11:12
krumelmonster joined11:12
dsimic left11:14
hrtk joined11:14
dsimic joined11:15
stats4647 joined11:16
omero left11:22
omero joined11:24
jklfds joined11:28
jonosterman joined11:29
cdown joined11:29
epicout left11:29
jklfds left11:34
canton7 joined11:35
linus045 joined11:36
m0viefreak left11:37
epicout joined11:38
epicout left11:38
epicout joined11:38
linus045 left11:42
hrtk left11:42
feriman left11:47
jklfds joined11:48
hrtk joined11:49
Tobbi joined11:51
dskull left11:51
jklfds left11:52
vdamewood joined11:55
jklfds joined11:58
grumbler joined11:59
jacobk left11:59
cdown left12:00
m_ben left12:01
jklfds left12:03
jklfds joined12:05
mingdao left12:06
mingdao joined12:06
omero left12:12
omero joined12:13
konsolebox joined12:14
jklfds left12:15
stats4647 left12:16
epicout left12:19
wonko-the-sane left12:22
jklfds joined12:22
rgrinberg left12:25
hrtk left12:29
jklfds left12:31
linus045 joined12:32
CharleyBates left12:35
jklfds joined12:36
bagatur joined12:36
hu85nk4bnd joined12:38
CharleyBates joined12:40
jklfds left12:42
mane left12:42
hu85nk4bnd left12:42
jklfds joined12:42
wootehfoot left12:43
weko joined12:46
jklfds left12:49
hu85nk4bnd joined12:49
wootehfoot joined12:52
jklfds joined12:58
jklfds left13:03
jklfds joined13:03
nate2 joined13:04
feriman joined13:07
stolen left13:07
nate2 left13:09
konsolebox left13:12
jklfds left13:12
nickoe25 left13:13
nickoe25 joined13:13
coot left13:14
jklfds joined13:17
wootehfoot left13:17
ThorMojito joined13:20
wonko-the-sane joined13:20
jklfds left13:22
bindu joined13:22
hrtk joined13:23
ThorMojito left13:23
rgrinberg joined13:28
jklfds joined13:33
guy_frm_yogaland joined13:34
jklfds left13:38
ursa left13:40
FinnElija left13:40
ursa joined13:40
FinnElija joined13:40
omero left13:41
omero joined13:42
Vonter left13:45
keypusher joined13:46
Vonter joined13:47
jklfds joined13:47
jonosterman left13:48
flom84 joined13:48
jklfds left13:54
Traneptora joined13:57
hrtk left13:59
jklfds joined14:00
resamvi joined14:01
delay joined14:02
delay left14:03
jklfds left14:05
harleypig left14:06
harleypig joined14:06
jacobk joined14:07
hrtk joined14:11
jklfds joined14:13
delay joined14:15
jklfds left14:17
jklfds joined14:18
navidr joined14:20
jklfds left14:23
bird_ joined14:24
hrtk left14:27
hu85nk4bnd left14:30
wootehfoot joined14:31
jklfds joined14:35
ecs left14:36
ecs joined14:36
jklfds left14:40
stolen joined14:43
wootehfoot left14:43
ferdna left14:50
wootehfoot joined14:51
thiago joined14:56
peeps[work] joined14:57
flom84 left15:08
FinnElija left15:08
FinnElija joined15:09
m_ben joined15:19
wootehfoot left15:21
oriba joined15:22
jklfds joined15:22
jklfds left15:27
ThorMojito joined15:35
cdown joined15:37
jklfds joined15:39
blop_ left15:40
blop_ joined15:41
cdown left15:41
cousteau joined15:43
cousteau How do I remove a worktree in ye olde git 2.9?15:43
jklfds left15:43
cousteau I happily did `git worktree add`, was pleasantly surprised by the fact that it worked in such an old version, but now I can't remove it15:44
TL;DR: I climbed a tree and now I can't get down.15:44
Meow.15:44
I really should update git in this machine...15:45
skapata joined15:48
ikke cousteau: probably by removing .git/worktrees/<name>15:49
mingdao left15:49
mingdao joined15:50
cousteau Ah, found it. First delete the worktree, then git worktree prune15:50
jklfds joined15:50
cousteau Which doesn't remove ALL the worktree information for ALL worktrees as one may interpret from the doc, but only that of nonexistent worktrees15:51
This knowledge courtesy of git worktree -n15:51
ThorMojito left15:51
jklfds left15:55
delay_ joined16:00
delay left16:02
feriman left16:05
cousteau left16:07
m_ben left16:10
Tabmow joined16:11
srinidhi joined16:16
xnox left16:21
xnox joined16:22
feriman joined16:25
jklfds joined16:25
C0MMIE left16:26
psukys left16:28
Vonter left16:28
Vonter joined16:29
jklfds left16:29
Gary_Sinise joined16:34
FinnElija left16:41
Elliria joined16:41
jklfds joined16:42
FinnElija joined16:43
jklfds left16:47
navirc left16:54
iomari891 left17:05
bloody joined17:05
nate2 joined17:05
iomari891 joined17:06
nate2 left17:11
superice left17:15
superice joined17:15
jklfds joined17:17
jrm left17:20
jklfds left17:21
nickoe25 left17:22
grumbler_ joined17:22
nickoe25 joined17:22
stolen left17:23
grumbler_ left17:23
wootehfoot joined17:24
grumbler left17:25
Novi left17:25
Novi joined17:26
coot joined17:30
grumbler joined17:30
grumbler left17:34
grumbler joined17:37
Gary_Sinise left17:38
dskull joined17:39
wootehfoot left17:43
wootehfoot joined17:46
iomari891 left17:49
grumbler left17:50
jklfds joined17:52
srinidhi left17:53
oriba left17:53
grumbler joined17:54
Gary_Sinise joined17:54
wonko-the-sane left17:56
jklfds left17:56
Elliria left18:00
jacobk left18:05
delay_ left18:11
nickoe25 left18:21
nickoe25 joined18:21
jklfds joined18:27
wonko-the-sane joined18:28
jklfds left18:31
jklfds joined18:32
xmachina left18:36
jklfds left18:37
wootehfoot left18:40
epicout joined18:41
epicout left18:41
humanface joined18:43
vdamewood left18:45
xmachina joined18:45
m_ben joined18:47
jklfds joined18:49
jklfds left18:53
myappie https://gist.github.com/basicfeatures/c36821ae92e117e0d4ac49ecc974cbdc just finished - WARNING: Backup your project. Rewrites history and modifies files.18:55
delay joined18:57
agd85120101 left19:02
theoceaniscool left19:04
wonko-the-sane left19:05
xcm joined19:05
jklfds joined19:06
jklfds left19:11
jklfds joined19:12
jklfds left19:16
agd85120101 joined19:19
PantelicGR joined19:23
bagatur left19:25
agd85120101 left19:26
xmachina left19:27
xmachina joined19:29
agd85120101 joined19:31
j416 left19:39
j416 joined19:39
jklfds joined19:41
delay left19:41
delay joined19:42
delay left19:42
jacobk joined19:43
jklfds left19:45
derpydoo joined19:49
xmachina left19:54
kiruny left19:56
Coop left19:57
theoceaniscool joined19:58
Vonter left20:01
Vonter joined20:03
jklfds joined20:05
jklfds left20:09
lostlazy joined20:20
f_ left20:21
nickoe25 left20:25
nickoe25 joined20:26
AciD` left20:27
jklfds joined20:27
AciD joined20:27
jklfds left20:31
tuxifreund left20:36
tuxifreund joined20:37
jmd left20:37
agd85120101 left20:42
agd85120101 joined20:44
ferdna joined20:45
aminvakil left20:50
aminvakil joined20:50
cpackham joined20:51
wootehfoot joined20:54
LowTech joined20:55
jacobk left20:58
cpackham left21:00
jklfds joined21:00
BinarySavior joined21:01
crabbedhaloablut left21:02
jacobk joined21:03
genesis152341 joined21:05
jrm joined21:06
jklfds left21:06
feriman left21:06
nate2 joined21:07
genesis1523 left21:08
nate2 left21:12
jklfds joined21:19
abubakarsadiq joined21:19
jklfds left21:24
terminalpusher joined21:27
tirnanog joined21:28
resamvi left21:32
jklfds joined21:37
guy_frm_yogaland left21:38
guy_frm_yogaland joined21:39
Coop joined21:39
wootehfoot left21:40
jklfds left21:41
codaraxis__ joined21:41
coot left21:43
codaraxis left21:45
NightMonkey_ joined21:49
terminalpusher left21:52
NightMonkey_NightMonkey21:53
countach202020 joined21:55
jake1 joined21:57
jacobk left22:06
Novi left22:07
Novi joined22:08
jake1sybariten22:09
genesis152341 left22:11
jklfds joined22:11
ThorMojito joined22:11
genesis152341 joined22:12
omero left22:14
m_ben left22:16
jklfds left22:16
Jaxef joined22:17
omero[slincho] joined22:18
gast0n joined22:22
omero[slincho]omero22:24
PantelicGR left22:29
humanface left22:29
jrm left22:30
nickoe25 left22:30
nickoe25 joined22:30
guy_frm_yogaland left22:31
guy_frm_yogaland joined22:32
w4 joined22:34
LowTech left22:36
codaraxis___ joined22:38
jacobk joined22:40
guy_frm_yogaland left22:41
codaraxis__ left22:42
jklfds joined22:45
oshertail joined22:48
jklfds left22:50
oshertail left22:50
jrm joined22:51
ThorMojito left23:01
theoceaniscool left23:05
Bilge left23:06
Bilge joined23:06
rgrinberg left23:07
codaraxis__ joined23:09
genesis152341 left23:11
codaraxis___ left23:13
chexum left23:17
chexum joined23:17
jklfds joined23:18
jklfds left23:23
przemoc joined23:23
Vonter left23:27
Vonter joined23:28
countach202020 left23:29
vysn left23:30
thuna` left23:41
ferdna_ joined23:44
ferdna left23:47
jklfds joined23:51
ThorMojito joined23:52
jklfds left23:56
Lord_of_Life_ joined23:58
Lord_of_Life left23:58
Lord_of_Life_Lord_of_Life23:59

Logs Search ←Prev date Next date→ Channels Documentation