IRCloggy #git 2022-04-11

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-04-11

JoeyeS left00:00
thiago left00:00
riposte left00:00
_9pfs left00:00
[sr] left00:00
pretty_dumm_guy left00:00
rewt left00:00
TonyStone left00:00
subopt left00:00
g2anj left00:00
bremner left00:00
glik22_ left00:00
hqdruxn08_ left00:00
rlgo left00:00
joj left00:00
bodiccea left00:00
analoq left00:00
shored left00:00
moldorcoder7_ left00:00
geowiesnot2 left00:00
dermoth left00:00
bket left00:00
cation left00:00
Coop left00:00
reset left00:00
vicecea left00:00
bin4ry left00:00
A_Dragon left00:00
ikwyl6 left00:00
Strom left00:00
lemonsnicks left00:00
skered left00:00
MrMagic left00:00
mud left00:00
dslegends left00:00
Rudde joined00:00
analoq joined00:00
packet_lozenge joined00:00
Malin joined00:00
jast joined00:00
shored joined00:00
Jenna16bit joined00:00
bn_work joined00:00
joj joined00:00
Vaelatern joined00:00
Nei joined00:00
shored left00:00
shored joined00:00
geowiesnot2 joined00:00
[sr] joined00:00
Nei left00:00
Nei joined00:00
g2anj joined00:00
glik22_ joined00:00
geirha joined00:00
mven joined00:00
obiwahn joined00:01
rewt joined00:01
MrMagic joined00:01
Vaelatern left00:01
Vaelatern joined00:01
obiwahn left00:01
obiwahn joined00:01
dskull joined00:01
Strom joined00:01
lemonsnicks joined00:01
bodiccea joined00:01
mud joined00:02
cation joined00:02
_9pfs joined00:02
ColdKeyboard joined00:02
euidzero joined00:02
ikwyl6 joined00:02
riposte joined00:02
Coop joined00:02
hqdruxn08 joined00:02
moldorcoder7 joined00:02
AsenMx joined00:02
bremner joined00:02
pretty_dumm_guy joined00:02
Eustachy_Kapusta joined00:02
steam joined00:02
fjmorazan joined00:03
leon joined00:03
A_Dragon joined00:03
dslegends joined00:04
R2robot joined00:04
Soliton joined00:05
bket joined00:05
mweckbecker joined00:05
LuKaRo joined00:05
QueerDOVengeance left00:07
zebrag joined00:08
JoeyeS joined00:09
JoeyeSGuest406100:10
thiago joined00:10
Guest4061JoeyeS00:10
jclsn9 left00:13
zeenk left00:14
jclsn9 joined00:15
cdown_ joined00:16
ThorMojito joined00:17
cdown left00:19
cdown_cdown00:19
ThorMojito left00:30
Soni joined00:33
ZeroDamage7 joined00:37
JoeyeS left00:40
jclsn9 left00:40
squirrel joined00:42
ZeroDamage7 left00:43
ZeroDamage7 joined00:43
ZeroDamage7ZeroDamage00:43
sa0 joined00:44
jclsn9 joined00:45
jazzy2 joined00:48
jazzy3 joined00:51
jazzy left00:51
gurkenglas left00:54
TonyStone joined00:54
jazzy2 left00:54
lkor left00:55
lkor joined00:55
jclsn9 left00:57
lkor left01:02
jclsn9 joined01:04
zebrag left01:04
TonyStone left01:09
zebrag joined01:09
bluepenquin_ joined01:10
thiago left01:11
TonyStone joined01:12
fingercomp joined01:14
jclsn9 left01:17
sa0 left01:18
gast0n joined01:19
gasbag joined01:19
stewie925 joined01:20
gasbag left01:21
jclsn9 joined01:23
kaiseisei joined01:24
jclsn9 left01:28
junktext_ left01:30
nyah left01:34
jclsn9 joined01:34
JoeyeS joined01:34
JoeyeSGuest293401:35
Guest2934JoeyeS01:35
ProperNoun left01:38
vdamewood joined01:38
ProperNoun joined01:39
jclsn9 left01:43
rsx left01:46
jimklimov left01:47
JoeyeS left01:47
JoeyeS joined01:47
mannequin joined01:47
JoeyeSGuest655201:47
MrMagic left01:48
Guest6552JoeyeS01:48
jclsn9 joined01:48
pretty_dumm_guy left01:55
rsx joined01:58
jclsn9 left01:58
stewie925 left01:59
lemonsnicks left02:03
jclsn9 joined02:04
JoeyeSpshhh02:05
pshhhJoeyeS02:05
mat001 left02:09
JoeyeSpshhh02:16
justErkel left02:17
jclsn9 left02:17
vdamewood left02:18
justErkel joined02:18
lemonsnicks joined02:19
bertvvvs left02:21
justErkeljustache02:23
jclsn9 joined02:24
stewie925 joined02:24
vicfred left02:27
jclsn90 joined02:29
ThorMojito joined02:30
ThorMojito left02:30
jazzy joined02:31
jclsn9 left02:32
vicfred joined02:33
jclsn90 left02:34
sa0 joined02:34
jazzy3 left02:34
finn_elija joined02:35
FinnElija left02:35
finn_elijaFinnElija02:35
coaxing left02:35
stewie925 left02:36
vicfred_ joined02:36
domino14 joined02:36
domino14 hi, I have a repo that is in a bad state. I want to put master back to a specific commit hash about two months ago. I want that to be the new master.02:37
and I want to make a PR into master with all of the changes since then so that I can continue working on them02:37
I can't figure out how to do this properly02:38
vicfred left02:38
domino14 basically, take all of the changes from commit hash X to HEAD, take them out of master, and put them in a new PR into master02:38
(i want to do this without a force push)02:39
jclsn90 joined02:40
pshhhJoeyeS02:42
MrMagic joined02:43
gast0n left02:47
JoeyeSpshhh02:50
pshhhJoeyeS02:51
jclsn90 left02:54
glik22_ left02:56
lgc joined02:58
lgc left02:59
jclsn90 joined03:00
kaiseisei left03:07
bin101 joined03:16
JoeyeSpshhh03:24
thiago joined03:25
pshhhJoeyeS03:26
xkuru left03:27
domino14 left03:27
xkuru joined03:32
gildasio left03:36
bloody left03:37
xkuru left03:38
causasui left03:40
vdamewood joined03:40
JoeyeSpshhh03:44
pshhhJoeyeS03:44
JoeyeS left03:52
jazzy2 joined03:58
saroy joined03:59
pulse left04:01
jazzy left04:02
rgrinberg joined04:10
FH_thecat left04:12
_9pfs left04:13
_9pfs joined04:13
great_tastegreatest_taste04:17
tyson2 left04:19
bob518 joined04:20
bob518 left04:24
bob518 joined04:25
bob518 left04:25
AnapodoPsalidaki joined04:40
coot joined04:50
ano left04:57
ano joined04:57
bluepenquin_ left04:57
zebrag left04:58
madewokherd` joined04:59
madewokherd left05:01
greatest_taste left05:04
littlebobeep left05:04
great_taste joined05:05
funhouse left05:13
_9pfs left05:22
luke-jr left05:23
Akiva joined05:26
luke-jr joined05:27
epony left05:27
dirtyflag left05:31
barlas left05:31
Kays left05:31
berndj left05:31
ad__ joined05:31
tykling joined05:32
pjlsergeant joined05:32
dmlloyd joined05:32
fury_ joined05:32
cespare joined05:32
mattf joined05:32
sa joined05:32
fakuve joined05:32
ThiefMaster joined05:32
Argorok joined05:32
NiKaN joined05:32
Mutsuhito joined05:32
barlas joined05:32
shush joined05:32
koolazer joined05:32
selckin joined05:32
OnlineCop joined05:32
redrambles joined05:32
rgrinberg left05:32
c4017_ joined05:32
jakesyl__ joined05:32
analpaper__ joined05:32
cfjk joined05:32
merpnderp joined05:32
daemon joined05:32
inversed_ joined05:33
berndj joined05:33
cs-ms[m] joined05:33
ringo__ joined05:33
thiago left05:33
cmn joined05:33
heftig joined05:34
inversed left05:36
analpaper_ left05:36
c4017 left05:36
grantbow joined05:37
multi_io joined05:37
yuu[m] joined05:39
CarlFK joined05:39
colemickens joined05:39
great_taste left05:39
kuhilas joined05:39
cmn left05:40
Guest69 I want git to ignore all of the files in a particular directory except for one, which I want to track. how do I do that?05:42
sentriz left05:43
crs left05:43
scottg489 left05:43
betterOne joined05:43
wolf joined05:43
starfarer joined05:43
robertparkerx joined05:43
Lcawte joined05:43
neoweb joined05:43
Rhvs joined05:43
supernovah joined05:43
petaflot joined05:43
lericson joined05:43
englishm joined05:43
Cromulent joined05:43
robertparkerx left05:43
robertparkerx joined05:43
sentriz joined05:43
silas joined05:43
Pent joined05:43
crs joined05:44
gurkenglas joined05:44
drbeco joined05:44
Sario joined05:44
bjs joined05:44
fdv joined05:44
n-st joined05:44
BtbN joined05:44
scottg489 joined05:44
Henry151 joined05:44
unclechu joined05:45
yosef[m]12 joined05:46
antto joined05:47
parsnip maybe it's here? https://stackoverflow.com/questions/987142/make-gitignore-ignore-everything-except-a-few-files05:48
rudi_s Guest69: Simplest solution is to add the single file to git and then gitignore the rest.05:48
parsnip i've done that05:48
rudi_s gitignore is not used for files tracked by git.05:48
BlessJah joined05:48
parsnip huh?05:48
bluepenquin joined05:49
schuelermine[m] joined05:50
ikke .gitignore does not apply to tracked files, like rudi_s said05:50
JoeyeS joined05:50
ikke it only tells git status to not show the file as untracked, and prevents git add to stage the file without -f05:50
sybariten joined05:52
roadie joined05:54
parsnip oh, tracked05:54
feriman joined05:55
JoeyeS left05:56
viridian joined05:58
viridian left06:00
Murr left06:02
Murr joined06:02
vimal left06:03
viridian joined06:03
funhouse joined06:05
ano left06:05
andypandy left06:08
twb joined06:10
twb For wide CSVs the default git diff is a bit bleh. Is there a secret "make git nicer for CSVs" option?06:11
(This is only a minor annoyance for me, so I don't care to spend a LOT of time on it, but if it's just "apt install X and then git config Y", I can be arsed to do that much)06:12
Jacques60 joined06:14
Misotauros left06:14
ThorMojito joined06:15
ThorMojito left06:15
onizu joined06:16
___nick___ joined06:18
rudi_s twb: What exactly are you looking for? I use git diff --color-words (with a custom word regexp) which works quite well for me.06:19
cliluw left06:20
twb rudi_s: I think probably the word boundary regexp is what I need06:20
cliluw joined06:21
twb I usually use --word-diff ratehr than --color-words; I didn't know about that06:21
ad___angelo_06:22
rudi_s Yeah, that should work.06:24
twb How do you do a per-filetype word boundary regex?06:24
I see "diff.wordRegex" in git-config06:24
Ah "diff.<driver>.wordRegex" and I already have "diff.<driver>.textConv" so let me have a go...06:25
I don't think this is woring in my ~/.gtconfig: [diff "csv"] \n wordRegex = "[^,]+" \n06:28
This definitely works: git diff --word-diff --word-diff-regex="[^,]+" -- *csv06:29
Do I need to explicitly say "*.csv is a csv file" ?06:32
gitattributes(5) seems to say so, but I'm like 90% sure I haven't had to do that for .tar and .xls when using textconv06:32
rudi_s twb: I'm only using a global wordRegexp.06:32
I only used textconv for specific files and I used [diff "pdf"] textconv = ...06:33
jjt joined06:34
rudi_s I didn't configure the pdf part anywhere but I guess it used some default setting.06:34
twb rudi_s: hrm OK. So maybe (per-file-type) textconv and (per-file-type) wordregex behave differently06:34
rudi_s twb: Ah, no. I Was wrong.06:34
I used "*.pdf diff=pdf" in .gitattributes.06:34
twb Oh no here I can see they are defining one for tex in EXACTLY the same way06:34
rudi_s Not sure if there are pre-compiled defaults.06:35
twb This would all make sense if I could find ANY .gitattributes on my system06:35
rudi_s: mmm06:35
let me check git's own source...06:35
palasso joined06:36
a1eaiactaest joined06:46
wonko-the-sane left06:46
a1eaiactaest left06:48
enkeyz joined06:49
jazzy2jazzy06:49
vicfred_ left06:50
a1eaiactaest joined06:52
john_johnk joined06:52
fflam joined06:58
a1eaiactaest left06:59
a1eaiactaest joined07:00
jimklimov joined07:04
mattil joined07:04
srinidhi joined07:08
jimklimov1 joined07:09
momomo left07:09
EvilDMP joined07:10
bkircher left07:10
jimklimov left07:11
rfuentess joined07:13
mexen joined07:14
Jong joined07:16
duxsco joined07:16
MajorBiscuit joined07:17
EvilDMP left07:17
sudoforge left07:21
MajorBiscuit left07:23
geirha left07:24
geirha joined07:24
viridian left07:29
fling joined07:30
Thanatermesis left07:34
kenanmarasli joined07:39
EvilDMP joined07:45
fillx joined07:46
lejocelyn joined07:53
Dev0n joined07:54
MajorBiscuit joined07:54
tulpa_ joined07:54
GNUmoon joined07:56
zeenk joined07:59
Murr left08:02
Murr joined08:02
MajorBiscuit left08:05
Guest69 left08:06
MajorBiscuit joined08:07
Haohmaru joined08:07
Akiva left08:09
srinidhi left08:09
Jacques60 left08:10
skapata left08:12
TheCatBehemoth joined08:12
redoc0 joined08:14
AnapodoPsalidi joined08:14
redoc0redoc08:15
pretty_dumm_guy joined08:15
AnapodoPsalidaki left08:17
fling left08:21
srinidhi joined08:27
dionysus69 joined08:27
hololeap joined08:28
fillx left08:31
amrx left08:33
amrx joined08:34
JoeyeS_ joined08:40
a1eaiactaest left08:41
wonko-the-sane joined08:41
coot left08:44
amrx left08:49
enoq joined08:51
karabaja4 joined08:54
EvilDMP left08:55
EvilDMP joined08:56
EvilDMP left08:56
Visne left08:56
JoeyeS_ left08:56
roadie left08:57
Visne joined08:59
karabaja4 left09:04
MajorBiscuit left09:15
leshaste joined09:16
leshaste I use github and have for years. I want to push a change I have made but it seems that "Bitbucket Cloud recently stopped supporting account passwords for Git authentication"09:17
what is the quickest route to be able to push now?09:17
canton7 leshaste, bitbucket or github? You mention both09:17
kix joined09:17
canton7 Either way, generate an access token in the web UI, and use that09:17
leshaste canton7, bitbucket09:19
MajorBiscuit joined09:19
leshaste canton7, hmm... somewhere on their website? https://bitbucket.org/product/09:19
kix left09:20
leshaste oh I think I see where09:20
squirrel left09:21
roadie joined09:21
ano joined09:21
leshaste now I just have to find "profile picture"09:22
argh.. where is it??09:24
canton7 leshaste, top right09:24
leshaste if I click on the L there I get "view account, view requests, log out"09:25
canton7 leshaste, https://confluence.atlassian.com/bitbucketserver/http-access-tokens-939515499.html09:25
leshaste canton7, yes that is the page I am looking at09:25
but I now have to find "Manage account "09:25
it says Go to Profile picture > Manage account > HTTP access tokens.09:25
canton7 Sorry, can't help you there. It's been several years since I last used bitbucket09:26
leshaste :(09:27
wakeup joined09:29
canton7 leshaste, here, according to a random forum post I found by googling your error message: https://bitbucket.org/account/settings/app-passwords/09:29
leshaste, so it's under profile picture -> Personal Settings09:30
leshaste turns out the problem is that bitbucket and bitbucket support aren’t the same website09:30
vysn joined09:31
germ left09:37
m5zs7k joined09:37
fling joined09:39
lkor joined09:43
kenanmarasli left09:45
john_johnk left09:46
EvilDMP joined09:46
EvilDMP left09:46
EvilDMP joined09:47
mbalmer joined09:57
vishal left10:07
epolanski joined10:07
jjt left10:09
vishal joined10:09
EvilDMP left10:11
duxco joined10:12
duxsco left10:14
duxcoduxsco10:14
chenqisu1 left10:19
gildasio joined10:21
bluepenquin_ joined10:22
coldmountain joined10:25
dionysus69 left10:31
germ joined10:33
lessshaste joined10:36
leshaste left10:36
dionysus69 joined10:48
lessshaste ok I have to do " Profile picture > Manage account > HTTP access tokens." but when I go to Manage account I see https://ibb.co/xHPMvGQ / How do I find the HTTP access token option?10:56
tyson2 joined10:56
lessshaste under security there is an "API token" option but I assume that is wrong?10:57
nyah joined11:01
lessshaste anyone got any ideas?11:03
wakeup left11:06
Visne left11:08
andypandy joined11:10
Visne joined11:12
vaio joined11:13
jim joined11:13
bartman left11:19
Flooo joined11:20
lkor left11:24
bartman joined11:27
wakeup joined11:27
bertvvvs joined11:27
lessshaste help! :)11:28
jazzy left11:29
osse lessshaste: where did you get those instructions?11:34
lessshaste osse, https://confluence.atlassian.com/bitbucketserver/http-access-tokens-939515499.html#HTTPaccesstokens-CreateHTTPaccesstokens11:34
osse, I just want to be able to push to bitbucket as I used to be able to11:34
osse Bitbucket Server and Bitbucket Cloud are different things.11:35
It looks to me like you're using Cloud11:35
lessshaste osse, ok so this is the message I see when I try to push11:35
emote: Bitbucket Cloud recently stopped supporting account passwords for Git authentication.11:35
MajorBiscuit left11:35
lessshaste just as you said11:35
so what do I need to do?11:36
osse I don't know, to be honest11:36
But it looks like you're following the wrong instructions11:36
lessshaste right.. I am meant to follow https://community.atlassian.com/t5/Bitbucket-articles/Announcement-Bitbucket-Cloud-account-password-usage-for-Git-over/ba-p/194823111:37
but I can't see from that page what I actually have to do11:37
JoeyeS_ joined11:37
lessshaste osse, any ideas?11:41
tulpa_ left11:41
jimklimov1 left11:42
dionysus69 left11:42
osse lessshaste: I don't know11:44
if I were you I would switch to using SSH11:44
jimklimov joined11:44
osse I think they want you to create an app password: https://support.atlassian.com/bitbucket-cloud/docs/app-passwords/11:45
tulpa_ joined11:50
MajorBiscuit joined11:57
benni joined12:00
john_johnk joined12:02
lessshaste osse, I am happy to switch to using ssh12:02
dka joined12:02
lessshaste any method that works at this point!12:02
JoeyeS_ left12:03
wakeup left12:10
wakeup joined12:11
pulse joined12:12
___nick___ left12:14
___nick___ joined12:15
___nick___ left12:16
___nick___ joined12:18
coaxing joined12:25
bertvvvs left12:38
fling left12:42
andypandy left12:43
fling joined12:45
TheCatBehemoth left12:45
benni left12:46
dmvrtx joined12:46
thebombzen left12:46
roadie left12:46
Xenguy left12:50
The_Blode left12:52
Guest58 joined12:56
The_Blode joined12:57
thebombzen joined12:58
drogas joined12:59
odoood joined13:01
bertvvvs joined13:05
wakeup left13:09
kix joined13:10
wakeup joined13:10
kix left13:11
coot joined13:11
roadie joined13:13
Visne left13:13
Visne joined13:14
TheCatBehemoth joined13:19
Guest5832 joined13:19
zebrag joined13:24
Guest5832 left13:24
Guest58 left13:24
gurkenglas left13:26
mattil left13:27
wakeup left13:30
andypandy joined13:31
wakeup joined13:34
odoood left13:35
Mmike joined13:36
junktext_ joined13:38
Rhvs left13:38
Rhvs joined13:39
ThorMojito joined13:43
ThorMojito left13:43
Mmike left13:45
Mmike joined13:46
funhouse left13:48
bloody joined13:52
ThorMojito joined13:53
Flooo left13:53
ThorMojito left13:57
Rashad joined13:59
thiago joined14:01
Murr left14:02
Murr joined14:02
great_taste joined14:06
canton7 lessshaste, 10:30 <canton7> leshaste, so it's under profile picture -> Personal Settings14:10
lessshaste, NOT Manage Account14:10
yourfate are there any good ways to speed up git on windows? in this repo even a `git status` takes like 30 seconds on windows14:12
on an SSD14:12
osse yourfate: which git are you using?14:13
yourfate git version 2.31.0.windows.114:13
the project has like 10 submodules to14:14
*tho14:14
ikke yourfate: does the repository has lots of files?14:14
osse You can try git config --global core.fscache true14:14
szkl joined14:14
jimklimov left14:15
osse And make sure it's actually just git status you're measuring, and not git status + whatever your shell prompt does :P14:15
bloody_ joined14:16
ikke apparently that's just a per-process cache14:16
yourfate ye, I used it in regular windows batch14:16
ikke so I don't think it will speed up git status14:16
pcarphin2 joined14:16
vishal left14:16
yourfate is the `in-pack` of `git count-objects` the number of files?14:17
karstensrage_ joined14:18
aindilis_ joined14:18
multi_io left14:18
bloody left14:18
pcarphin left14:18
nullroute left14:18
pcarphin2pcarphin14:18
gxt left14:18
wacko joined14:18
wacko left14:18
wacko joined14:18
roadie left14:18
yourfate that was about 11 000, repo is 121MB14:19
gxt joined14:19
karstensrage_karstensrage14:19
yourfate idk if that even includes submodules14:19
multi_io joined14:19
karstensrage left14:19
karstensrage joined14:19
vishal joined14:19
nullroute joined14:20
nullroute left14:20
nullroute joined14:20
osse yourfate: is git status --ignore-submodules=all quicker?14:20
OnkelTem left14:20
yourfate can't really measure rn, as I have cleaned up a lot of changed files since I last ran it14:20
but oh yes, its a lot quicker14:20
capn joined14:21
OnkelTem joined14:22
ikke makes sense that it speeds up things, as it can avoid checking quite some files14:25
glik22_ joined14:27
yourfate its just that on a similar speced linux machine its so much faster14:29
Muzer joined14:29
osse you can try GIT_TRACE=1 git status (there's also the more fancy GIT_TRACE2) to try to narrow down what takes so long14:30
I wouldn't be surprised if it was a specific thing and not just general perfornace14:31
performance14:31
ikke yourfate: git makes have use of the linux built-in file-system cache to speed up these kinds of operations14:31
windows does not have that14:31
roadie joined14:32
yourfate ah14:32
osse it does have the fscache thing14:32
JoeyeS_ joined14:32
osse bulk reading sounds nice14:32
igemnace ikke: ah, it doesn't? news to me14:33
coldmountain left14:34
jimklimov joined14:36
tulpa_ left14:36
riposte left14:37
saroy left14:38
impermanence left14:40
jimklimov1 joined14:41
vaio left14:41
vaio joined14:42
cap_ joined14:42
jimklimov left14:44
ikwyl6 left14:45
riposte joined14:46
andr01d joined14:47
ikwyl6 joined14:50
andr01d Hello, I have a repo with a submodule. Within the submodule I have a branch that is local custom changes to the repo that I want to track on our git server, instead of the origin upstream of the submodule repo. This branch will never be merged to the projects origin. Can I --set-upstream-to on my submodule branch to push to the parent repo instead of the submodule's origin?14:51
Akiva joined14:51
a1eaiactaest joined14:51
coaxing left14:51
igemnace andr01d: the parent repo? as in the one that has it as a submodule? i don't think that'll do anything desired. but you *can* keep using the separate branch14:53
sudoforge joined14:54
JoeyeS__ joined14:54
andr01d igemnace, yes, I'd like to push the submodule branch to the same remote that contains the parent (the repo containing the submodule)14:55
It could be a 3rd repo, but I just want to define a remote within our infrastructure to allow sharing and backing up the custom branch of the submodule (since it will never be pushed to the submodules origin)14:56
igemnace do you mean to say you want it merged with the parent repo? you can just remove the submodule in that case and check the whole thing in14:57
JoeyeS_ left14:57
igemnace 3rd repo is also fine14:57
andr01d Well, I'd like to continue to track updates to the submodule repo, but separately backup our custom branch14:58
a1eaiactaest left14:59
igemnace well, you already have that right now, yes? even if it's a separate branch, the history is tracked, and you can push to the submodule repo (the original one) to keep it on a central server14:59
andr01d Well, the submodule origin is a project repo that I don't have write accesss to15:00
igemnace changing the origin is fine too. look into git submodule set-url15:00
ah, there's the rub. yes, push the submodule state you currently have into any repo you want15:01
mooz joined15:01
a1eaiactaest joined15:02
andr01d sounds like a 3rd repo is the most straightforward solution. I'll define a new remote and push to that, instead of origin, in the submodule15:03
igemnace sounds like a plan15:04
jancoow joined15:05
a1eaiactaest left15:06
jimklimov joined15:07
a1eaiactaest joined15:08
andr01d Oh, one other aspect of the structure: the submodule is actually a worktree of the separate project. Can I just define a different origin for the worktree than the original separate project?15:09
EvilDMP joined15:09
Laplace joined15:10
jimklimov1 left15:11
EvilDMP left15:11
Laplace Hey folks how can i preemptively prep a git revert for a PR i'll merge which includes 8 commits that get squashed upon merge? Can I just have a PR made that reverts the original 8 commits?15:11
andr01d Thanks for your help igemnace! I don't how else I could have gotten that insight (except endless trial and error, with mostly error 8-)15:12
igemnace andr01d: hmm. but it *was* added as a submodule, with submodule add, yes? if so yes. in fact, i haven't done such an operation in quite some time, but i have a gut feel that just doing the operations in the submodule to change origin should Do The Right Thing™ with the .git/submodules file in the parent repo15:12
zulutango joined15:13
igemnace Laplace: yes, i suppose you could, but would be easier to revert just a single squash commit, yes? what you *can* do is perform the squash merge yourself in a different branch, revert that, then PR *that* instead15:14
andr01d igemnace, The worktree is actually what's added as a submodule. The separate project directory is actually in .gitignore. So, the worktree is actually what was named in the submodule add.15:14
coaxing joined15:14
igemnace andr01d: ah! hmm i don't have experience with that particular combination... perhaps try it and see?15:15
jimklimov1 joined15:15
ThorMojito joined15:15
Laplace igemnace: If I do this on a separate branch does that imply that git squashes are deterministic in the sha's that are generated for the commit that'll be merged in master? The only reason I am doing this ahead fo time is to ensure all CI tests pass so the revert is ready to go as soon as it is needed15:16
ThorMojito left15:16
andr01d It's my first time with worktrees. Adding it as a submodule seems to have worked so far. But the separate remotes is all untread territory for me. I'll try it. Thanks again for your help!15:16
Kulrak joined15:17
EvilDMP joined15:18
jimklimov left15:19
igemnace Laplace: good question. only if you do the commit the same way the VCS provider will (e.g. same commit message, authors, etc)15:20
Laplace It seems then it might be safer for me to just prep individual commits then15:21
riposte left15:22
igemnace indeed15:22
coldmountain joined15:23
JoeyeS__ left15:24
kenanmarasli joined15:24
world-war-v joined15:25
world-war-v You are all being enslaved. ---> watch this video or DIE https://www.bitchute.com/video/h02lLvSyPw7w/ JOE BIDEN AND HIS WIFE ARE NEPHILIM. Please share this video but be aware it may result in your account getting blocked or even banned. This is real. This is really happening. We need to wake up before they enslave us all. If you are a hacker or spammer and can help me spread this video - email me [email@hidden.address] There is not muc15:25
h time left. People like George Soros, Klaus Schwab, Joe Biden, etc are actively working to enslave humanity right now. This is not a "game". This is not a "larp". This is REAL.15:25
jess joined15:25
world-war-v left15:25
Visne left15:26
bremner nice email address.15:26
jess left15:26
a1eaiactaest left15:28
igemnace "If you are a spammer... email me" nice15:30
Nintenuendo joined15:30
Nintenuendo left15:30
Nintenuendo joined15:30
riposte joined15:31
Misotauros joined15:36
oncall-pokemon left15:39
madewokherd` left15:40
analoq left15:41
betterOne left15:41
analoq joined15:42
_angelo_ left15:42
_angelo_ joined15:42
jim left15:50
m0viefreak joined15:50
jim joined15:51
a1eaiactaest joined15:53
jimklimov joined15:55
JoeyeS_ joined15:57
JoeyeS_ left15:57
JoeyeS_ joined15:57
nuttingd joined15:57
jimklimov1 left15:57
lkor joined15:57
vitali64 joined15:58
kix joined16:00
lamein joined16:01
Murr left16:01
Murr joined16:02
Visne joined16:02
kix left16:02
rfuentess left16:02
kix joined16:02
lamein hello is it possible to have one file exist in a branch but in another?16:03
but not*16:03
ProperNoun left16:05
malteger joined16:05
ThorMojito joined16:06
ThorMojito left16:06
ProperNoun joined16:06
enoq left16:06
lionkor joined16:07
lkor left16:08
OMGOMG try it and see16:08
madewokherd joined16:11
nedbat lamein: it's definitely possible, but most branches don't live forever, they get merged16:12
rgrinberg joined16:13
JoeyeS_ left16:20
TomyWork joined16:22
wakeup left16:27
orbyt joined16:27
Visne left16:30
Visne joined16:32
a1eaiactaest left16:33
OnkelTem left16:35
drogas left16:35
OnkelTem joined16:37
xkuru joined16:40
JoeyeS_ joined16:40
aminvakil joined16:43
duderonomy joined16:43
andypandy left16:44
Haohmaru left16:44
MajorBiscuit left16:45
coot left16:45
coot joined16:45
lejocelyn left16:47
coot left16:49
The_Blode_ joined16:49
coot joined16:50
vysn left16:51
JoeyeS_ left16:51
The_Blode left16:52
lamein OMGOMG: did and can't figure out how to make the merge work16:54
nedbat: yeah i was thinking if you can merge with ignoring by some files but idk16:55
by ignoring* o.O16:56
coaxing left16:57
EvilDMP left16:57
coaxing joined16:57
randallb joined16:58
Jong how do I make it so the last commit in my feature branch appears like I just made the branch and made one commit? meaning, the main branch has not had any commits since the branch was made17:00
AnapodoPsalidaki joined17:00
Jacques joined17:01
Jong basically I'm trying to remove history of making the branch a long time ago with a bunch of "Merge branch 'pytorch:main' into main"17:01
lpapp joined17:01
lpapp hi, git log -L :<funcname>:<file> does not seem to work for me. Is it because of namespaces and classes for methods in C+?17:02
C++*17:02
AnapodoPsalidi left17:02
nedbat lamein: it sounds like pain to have a branch with a new file, and you want to merge the branch, but you don't want to merge the file.17:03
Gustavo6046 joined17:03
Jong basically, I want to squash the branch and make it one commit after master17:04
lpapp I never even knew about that trick. I'll try it now17:04
Gustavo6046 left17:06
Gustavo6046 joined17:07
wakeup joined17:10
lamein nedbat: it's probably my own bad intention of a workflow, the idea is to use a branch with various test files and another branch with no test files which will be pulled ontop of production files17:13
XV8 joined17:13
squirrel joined17:14
mexen left17:14
nedbat lamein: why not put those test files in a separate directory instead?17:15
lessshaste canton7, thank you!17:17
mehwork left17:17
t0mm13b joined17:19
andypandy joined17:19
t0mm13b_ left17:19
Tangent-Man joined17:19
lamein nedbat: seems like writing a bash script to cleanup the tests everytime i run the production is the best solution and everything shall be smooth enough17:20
Tangent-Man left17:20
lamein using seperate branches for this is indeed weird17:20
Tangent-Man joined17:21
cap_ left17:22
bluepenquin_ left17:22
mackerman One solution, create package archives that don't include tests, for install and use on production systems.17:22
git repo has full source with tests in one tree, but the generated archives from it might only compile and use what is needed.17:23
nuttingd left17:23
john_johnk left17:24
kenanmarasli left17:24
Guest696 joined17:27
LuKaRo left17:32
gurkenglas joined17:32
LuKaRo_ joined17:32
john_johnk joined17:38
john_johnk left17:43
mx08 joined17:44
fling left17:47
fling joined17:47
wakeup left17:49
coot left17:53
cvmn joined17:54
feriman left17:54
feriman joined17:55
SoniQueerDOVengeance17:55
ThorMojito joined17:55
ThorMojito left17:55
sobkas joined18:05
EvilDMP joined18:07
kix left18:08
MajorBiscuit joined18:09
MajorBiscuit left18:09
MajorBiscuit joined18:09
rgrinberg left18:12
Visne left18:14
Visne joined18:15
Thanatermesis joined18:16
rgrinberg joined18:19
howdoi joined18:25
lpapp left18:28
littlebobeep joined18:29
rgrinberg left18:29
john_johnk joined18:29
Laplace left18:30
evanextreme joined18:32
rsx left18:34
littlebobeep left18:39
a1eaiactaest joined18:40
txtsd joined18:48
Visne left18:48
Visne joined18:49
fling left18:51
fling joined18:53
Visne left18:54
tyson2 left18:56
a1eaiactaest left18:56
Visne joined18:57
Betal joined18:57
dionysus69 joined19:04
Jacques left19:04
Visne left19:08
karstensrage left19:09
karstensrage joined19:09
coot joined19:09
karstensrage left19:09
karstensrage joined19:09
MajorBiscuit left19:10
rgrinberg joined19:10
Visne joined19:11
cliluw left19:16
a1eaiactaest joined19:17
cliluw joined19:17
john_johnk left19:18
roadie left19:18
Visne left19:19
madewokherd left19:32
littlebobeep joined19:33
Visne joined19:33
igemnace left19:38
TomyWork left19:40
cvmn left19:43
coldmountain left19:44
roadie joined19:44
jimklimov1 joined19:48
konrados left19:50
konrados joined19:50
jimklimov left19:51
roadie left19:52
roadie joined19:53
fling left19:55
ThorMojito joined19:56
ThorMojito left19:56
roadie left19:56
roadie joined19:57
fling joined19:57
Murr left20:01
a1eaiactaest left20:02
Murr joined20:02
tyson2 joined20:03
TheCatBehemoth left20:03
___nick___ left20:04
aidalgol_ joined20:04
madewokherd joined20:04
aidalgol left20:04
orbyt left20:06
dionysus69 left20:07
rgrinberg left20:07
john_johnk joined20:08
forgotmynick joined20:11
txtsd left20:16
rgrinberg joined20:19
aidalgol_aidalgol20:20
rgrinberg left20:20
TheCatBehemoth joined20:21
Lord_of_Life_ joined20:22
Lord_of_Life left20:23
Lord_of_Life_Lord_of_Life20:23
TheCatBehemoth left20:23
skapata joined20:32
skapata left20:32
skapata joined20:32
Visne left20:34
causasui joined20:34
Visne joined20:38
vitali64 left20:38
jimklimov1 left20:39
jimklimov joined20:40
randallb left20:41
structoha joined20:43
feriman left20:44
coot left20:49
rgrinberg joined20:50
orbyt joined20:51
MajorBiscuit joined20:52
structoha left20:52
kexec joined20:52
roadie left20:53
Visne left20:54
Flooo joined20:54
kexec is it possible to create commit with custom authordate and commitdate? the paramter --date sets only the authordate20:55
Visne joined20:55
vicfred joined20:57
Guest77 joined20:58
fling left20:59
mat001_ I'm struggling to refactor this line in travis.yaml file such that the repo is pulled and a remote branch checked out: - mkdir $HOME/agent && pushd $HOME/agent && git init && git pull https://github.com/optimizely/agent.git $TAG21:00
wolfshappen joined21:00
Visne left21:00
mat001_ Can I keep git pull <repo> and then add git pull && gt checkout myremotebranch?21:00
Visne joined21:01
fling joined21:01
pretty_dumm_guy left21:02
bertvvvs left21:03
osse kexec: Yes, via an env var21:03
rgrinberg left21:03
osse GIT_COMMITTER_DATE21:03
humanface joined21:05
duxsco left21:07
fling left21:09
fling joined21:10
Visne left21:10
kexec thanks21:10
Rashad left21:11
Visne joined21:11
madewokherd left21:12
Guest77 left21:12
rgrinberg joined21:15
pretty_dumm_guy joined21:15
sobkas left21:15
causasui left21:17
vaio left21:18
vaio joined21:19
roadie joined21:19
Visne left21:19
Visne joined21:22
jazzy joined21:23
Guest696 left21:23
roadie left21:25
causasui joined21:31
causa_sui joined21:32
rgrinberg left21:34
causa_sui left21:37
gildasio left21:37
madewokherd joined21:38
EvilDMP left21:40
EvilDMP joined21:40
EvilDMP left21:41
MajorBiscuit left21:43
m0viefreak left21:46
Noisytoot_ joined21:51
roadie joined21:52
duxsco joined21:52
causa_sui joined21:54
mfiano joined21:54
roadie left21:56
causa_sui left21:58
causa_sui joined21:59
causa_sui left22:03
fling left22:04
orbyt left22:05
fling joined22:05
mannequin left22:07
roadie joined22:09
Noisytoot_ left22:09
Visne left22:10
roadie left22:14
Noisytoot_ joined22:14
fling left22:15
Jacques joined22:17
Visne joined22:18
SuperLag left22:20
SuperLag joined22:21
_9pfs joined22:24
causa_sui joined22:24
roadie joined22:25
roadie left22:30
forgotmynick left22:30
Strom left22:31
_9pfs left22:32
Strom joined22:33
_9pfs joined22:33
hololeap left22:33
causa_sui left22:34
hololeap joined22:35
gasbag joined22:35
enkeyz left22:35
palasso left22:35
gasbag left22:36
john_johnk left22:36
jaggz joined22:39
jaggz I think I somehow added a dubmodule/dir wrong22:39
when I pull on a remote system, it creates the dir, but nothing's in it22:39
oh I didn't do the full: git submodule update --init --recursive22:40
such verbose.22:40
structoha joined22:40
jaggz thank22:44
s22:44
jaggz left22:44
Visne left22:44
stewie925 joined22:46
ano left22:48
mud left22:48
Visne joined22:52
tejr joined22:52
Flooo left22:54
causa_sui joined22:55
roadie joined22:55
roadie left23:00
causa_sui left23:00
Xenguy joined23:00
Visne left23:03
causa_sui joined23:04
Tangent-Man left23:05
Visne joined23:05
Dragoon joined23:06
Dragoon left23:07
causa_sui left23:08
humanface left23:09
sa0 left23:09
lionkor left23:12
sa0 joined23:13
jimklimov left23:14
Jacques left23:15
sa0 left23:17
oriba joined23:23
causa_sui joined23:24
Visne left23:26
duxsco left23:27
gast0n joined23:27
causa_sui left23:29
prplecake joined23:29
causa_sui joined23:29
igemnace joined23:31
szkl left23:34
causa_sui left23:34
oriba left23:35
oriba joined23:35
Visne joined23:35
junktext_ left23:35
Noisytoot_Noisytoot23:38
Dragoon joined23:38
Dragoon left23:38
Visne left23:40
Visne joined23:40
zeenk left23:40
ano joined23:42
stewie925 left23:42
andr01d Are linked worktrees affected by pull updates to the main worktree?23:45
ThorMojito joined23:46
ThorMojito left23:47
andr01d I have 2 linked worktrees, checked out to different branches, that are configured as submodules23:47
another| Well, they're the same repo. So every pull of course affects it23:49
srinidhi left23:50
oriba left23:51
oriba joined23:52
pulse left23:52
causa_sui joined23:55
shokohsc joined23:55
Gustavo6046 left23:55
onizu left23:55
Gustavo6046 joined23:56
Dragoon joined23:56
Guest7465 joined23:57

Logs Search ←Prev date Next date→ Channels Documentation