IRCloggy #git 2023-04-23

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

sam113101 left00:00
sam113102sam11310100:00
BinarySavior joined00:00
hamburgler left00:00
GNUmoon left00:01
roadie joined00:02
GNUmoon joined00:04
user____ joined00:04
Lunatrius left00:05
Lord_of_Life_ joined00:08
ThorMojito joined00:08
user____ left00:09
Lord_of_Life left00:09
Lord_of_Life_Lord_of_Life00:09
Lunatrius joined00:15
roadie left00:15
vysn left00:16
vysn joined00:19
jacobk joined00:20
user____ joined00:22
Yruama_ left00:24
ferdna left00:25
BrandonArnold left00:25
jaykelly450 left00:25
user____ left00:27
squirrel left00:30
giu- left00:33
liefer396 left00:34
ThorMojito left00:38
user____ joined00:38
cdown left00:40
PobodysNerfect left00:42
weaksauc_ joined00:44
gryffus left00:47
arescorpio left00:47
weaksauc_ say you have a commit and branch that's a PR that adds some feature to your project. after sending off that PR what's your general strategy for using that feature in the project in the time between you opening the PR and the time it gets accepted?00:47
ferdna joined00:59
ch create a branch off that branch and work there01:15
catman joined01:15
ch is what i often do01:15
jacobk left01:15
catman left01:17
EdFletcher yup agreed, "stacked branches" is the term i've heard used to describe the technique01:18
roadie joined01:19
sa0 left01:19
money joined01:19
very_sneaky left01:20
very_sneaky joined01:22
weaksauc_ and then just rebase later if the order changes?01:23
like if you have a few different branches and prs at the same time?01:24
hamburgler3 joined01:31
roadie left01:32
hamburgler2 left01:34
ch i try not to work on multiple things in parallel that touch the same parts01:34
but if i must, i often build myself a 'base' branch out of merged submitted branches, and then work off that, and if need be my new work can be rebased01:34
vysn left01:35
hamburgler2 joined01:36
hamburgler3 left01:39
cdown joined01:40
user____ left01:42
oriba left01:45
cdown left01:50
Suchiman left01:51
jacobk joined01:52
user____ joined01:53
user____ left01:56
m0viefreak joined02:00
hbautista__ joined02:03
elastic_dog left02:08
elastic_dog joined02:09
user____ joined02:10
fstd_ joined02:10
user____ left02:12
fstd left02:13
fstd_fstd02:13
gsi left02:23
gsi joined02:25
Traneptora left02:26
user____ joined02:26
terrorjack left02:40
terrorjack joined02:41
roadie joined02:43
keypushe- joined02:46
keypusher left02:48
keypushe-keypusher02:49
catman joined02:50
dviola left02:51
dviola joined02:53
roadie left02:57
dtd-123 joined02:58
FinnElija left02:59
Visor left02:59
Visor joined02:59
daru left03:01
FinnElija joined03:01
daru joined03:01
catman left03:02
dtd-123 left03:04
bret joined03:09
wlemuel left03:10
wlemuel joined03:11
nate1 joined03:15
EvgenyK joined03:18
chemsmith left03:28
chemsmith joined03:29
user____ left03:31
jacobk left03:33
bret left03:35
lucasta left03:36
jbg joined03:43
user____ joined03:43
bret joined03:47
user____ left03:48
user____ joined04:00
user____ left04:02
jacobk joined04:11
catman joined04:16
user____ joined04:16
nate1 left04:18
roadie joined04:18
alexherbo2 left04:18
R2robot left04:21
chemsmith left04:25
chemsmith joined04:27
R2robot joined04:30
bloody left04:31
d[-_-]b left04:32
roadie left04:32
kaisyu joined04:48
EvgenyK left04:49
money left04:49
blupier left04:57
roadie joined05:01
blupier joined05:02
roadie left05:14
user____ left05:18
stewie925 joined05:18
roadie joined05:21
hbautista__ left05:21
JSkilton joined05:24
d[-_-]b joined05:31
user____ joined05:33
user____ left05:35
gast0n left05:36
JSkilton left05:46
gnulinuxuser joined05:47
user____ joined05:49
user____ left05:51
warmana1 joined05:52
warmana left05:53
warmana1warmana05:53
geosmile left05:54
geosmile joined05:54
crb_crb05:57
han-solo joined05:59
user____ joined06:05
user____ left06:07
FH_thecat left06:09
lgc joined06:09
lgc left06:09
user____ joined06:23
feriman joined06:28
mjt0k "your branch foo and remote/foo have divirged and have M and N commits each" - what's the way to see the diff between the set of commits?06:30
ikke mjt0k: do you want to see a list of commits or actual file differences?06:31
mjt0k commits06:31
ikke git log --oneline foo..remote/foo shows you want remote/foo has, but foo has not06:32
git log --oneline remote/foo..foo shows the opposite06:32
mjt0k oh. heh. Never thought about using git log this way06:33
thank you ikke!06:33
ferdna left06:33
mjt0k still it's fun there's no shortcut command for this06:35
ikke if you have foo checked out06:35
git log ..@{u}06:36
or06:36
git log @{u}..06:36
(add --oneline if you want)06:36
mjt0k it looks like I have to re-read the docs about all these shortcuts06:38
actually git log doesn't show me the differences06:38
I have to compare the two git logs06:39
one of the git log ..@{u}/${u}.. shows one extra commit06:39
both shows all commits, but one of them shows one more commit than the other06:40
there's one change at the *beginning* which is missing in one of the 2 branches06:40
and ofcourse all the IDs are different, so diffing should not include the commit-ID06:41
so it's like: git log --oneline ..@{u} | sed 's/^[a-z0-9]* //' > a; ditto for @{u}..; diff a b06:42
sa0 joined06:43
mjt0k but the shortcuts are very useful06:44
terrorjack left06:44
terrorjack joined06:45
Aryan left06:46
ikke mjt0k: if they are rebased branches with similar commits, you can use06:46
git range-diff06:46
valeyard left06:46
mjt0k just read man gitrevisions. What an excellent thing!.. I missed a decade of development in this area :)06:47
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html06:47
terrorjack left06:48
mjt0k and yes, range-diff is what I was looking for.06:48
vaaleyard joined06:49
terrorjack joined06:49
terrorjack left06:50
ikke 99% of what's in gitrevisions has been there for ages :)06:50
mjt0k git range-diff ...@{u}06:51
this is exactly what I was looking fore06:51
when it says the branches have divirged, that'd be a quick check for what's changed, without actually knowing beforehand06:52
terrorjack joined06:52
mjt0k very good stuff06:52
kaisyu left06:58
jashim joined07:00
Inline joined07:01
xx joined07:03
clarkh2 left07:04
skapata left07:15
peas left07:23
shokohsc3 joined07:26
user____ left07:27
shokohsc left07:29
shokohsc3shokohsc07:29
jacobk left07:29
stewie925 left07:32
Aryan joined07:36
user____ joined07:39
theoceaniscool joined07:40
mjt0k one more question. When something gets merged into master branch, it might contain very old commits which were in some other repository which the merge has collected. So, for example, that'll be a commit which committed before a previous master release, which has been merged after the release. How to show all commits which has been *merged* after the last release? Is it git log --topo-order?07:40
user____ left07:44
EvgenyK joined07:52
user____ joined07:56
clime1 joined07:58
user____ left08:01
sam__ joined08:04
sam__Guest747408:05
Guest7474 Hello, as far I know docker uses same kernel as host but in my linux mint when I am printing kernel version of container, it is mismatching.Can some one please tell me the reason? https://pastebin.com/q4MJhb8r08:07
clime1 left08:07
Masklin__Gurder joined08:08
Masklin left08:09
mjt0k I wonder what it has to do with git.. :)08:09
Guest7474 Sorry for wrong window. I did not find any IRC of Docker08:10
user____ joined08:11
wlemuel left08:14
nate1 joined08:16
wlemuel joined08:18
EvgenyK left08:19
nate1 left08:20
EvgenyK joined08:26
theoceaniscool left08:38
gnulinuxuser please +b me08:38
d[-_-]b left08:41
d[-_-]b joined08:47
epony left08:51
alexherbo2 joined08:58
eqw left08:59
_qw left09:00
humanface joined09:00
nektro left09:01
KimK_ joined09:01
EvgenyK left09:02
KimK left09:03
derpydoo left09:03
sb joined09:11
sbsvpb09:12
EvgenyK joined09:14
TeXMasterOblomov09:14
user____ left09:16
d[-_-]b left09:22
EvgenyK left09:22
PobodysNerfect joined09:24
EvgenyK joined09:24
Guest7474 left09:26
Guest7474 joined09:26
epicout_ joined09:26
user____ joined09:26
user____ left09:29
svpb left09:30
Novi left09:30
Novi joined09:33
wlemuel left09:35
wlemuel joined09:35
d[-_-]b joined09:35
d[-_-]bstenno09:43
user____ joined09:43
elastic_dog left09:44
_qw joined09:44
elastic_dog joined09:44
gildasio2 left09:48
gildasio2 joined09:48
f_ joined09:49
Gaboradon joined09:49
Suchiman joined09:50
EvgenyK left09:53
___nick___ joined09:57
___nick___ left09:58
EvgenyK joined09:58
alexherbo2 left09:58
alexherbo2 joined09:59
___nick___ joined10:00
Gaboradon left10:01
EvgenyK left10:04
fspax joined10:04
rosco joined10:05
vysn joined10:07
zulutango left10:11
bkircher left10:12
bkircher joined10:14
zulutango joined10:15
skered left10:16
EvgenyK joined10:18
EvgenyK left10:22
Gaboradon joined10:23
squirrel joined10:25
igemnace joined10:27
hamburgler2 left10:28
hamburgler2 joined10:29
EvgenyK joined10:37
Novi left10:37
Novi joined10:39
rosco left10:39
hinderaker left10:40
EvgenyK left10:42
EvgenyK joined10:44
dviola left10:44
derpydoo joined10:45
clarkh1 joined10:46
user____ left10:47
EvgenyK left10:50
Albright left10:51
Albright joined10:51
nate1 joined10:52
fspax left10:54
nate1 left10:57
cdown joined10:58
coot joined10:58
user____ joined10:58
user____ left11:01
epicout_ left11:03
user____ joined11:03
fspax joined11:05
clime1 joined11:10
gnulinuxuser left11:10
fspax left11:12
user____ left11:12
Sulky__ joined11:16
nyah joined11:18
Sulky_ left11:18
eroux joined11:25
user____ joined11:25
user____ left11:28
tmpm697 joined11:29
clime1 left11:29
vysn left11:35
C-dev joined11:38
jfsimon1981 left11:39
jfsimon1981 joined11:39
C-dev left11:41
user____ joined11:42
hamburgler2 left11:44
hamburgler joined11:45
Guest7474 left11:53
hamburgler left11:55
Guest19 joined12:03
Guest19 Hello12:03
feriman left12:04
vqueiroz joined12:04
cweiss0765321241 joined12:06
KnoP joined12:07
aapost joined12:07
bywaterloo left12:10
ThorMojito joined12:11
igemnace left12:11
gurkenglas left12:14
gurkenglas joined12:19
aapost left12:24
skered joined12:24
skered left12:24
skered joined12:26
skered left12:26
karabaja4 joined12:26
skered joined12:27
wilz joined12:28
jaykelly450 joined12:38
clime1 joined12:38
Yruama joined12:46
user____ left12:46
pepe_ joined12:49
duxsco joined12:51
coot left12:52
coot joined12:53
clime1 left12:57
user____ joined12:58
pepe_ left13:00
Sulky__ left13:02
Sulky__ joined13:02
user____ left13:02
ThorMojito left13:03
ThorMojito joined13:11
Gaboradon left13:12
user____ joined13:16
user____ left13:18
user____ joined13:33
user____ left13:35
m5zs7k left13:37
myme left13:39
myme joined13:40
aapost joined13:41
m5zs7k joined13:43
user____ joined13:50
teut joined13:51
gurkenglas left13:58
Rashad joined14:04
epicout_ joined14:04
gurkenglas joined14:05
duxsco left14:06
Rashad left14:07
rosco joined14:08
hinderaker joined14:10
Gaboradon joined14:22
epony joined14:24
Traneptora joined14:32
ThorMojito left14:35
jbg left14:36
Linkandzelda left14:38
hussein1 left14:38
fling left14:38
FinnElija left14:38
traph left14:38
fling joined14:38
FinnElija joined14:38
traph joined14:38
hussein1 joined14:39
vdamewood joined14:39
duxsco joined14:48
catman left14:51
michele_ joined14:52
catman joined14:52
nate1 joined14:54
duxsco left14:54
user____ left14:56
nate1 left14:59
Linkandzelda joined15:01
fflam left15:01
joakimk joined15:02
fflam joined15:03
joakimk I just `git init` in an existing folder (project) but made the decision to call the branch "master" -- not "main": `git init && git symbolic-ref HEAD refs/heads/master`. When I now push the initial commit to GitHub, I find the default branch (on GH) is expected to be "main"?15:03
bookworm GH doesn't care outside of repo creation15:04
joakimk Should I rename my branch locally to main, or should I change the default on GH? This is a private/toy project, so there are no specific requirements -- I just want to be able to push to GH without going through Pull Requests15:04
bookworm git doesn't care for that matter15:04
you can name your main dev branch trunk, and can directly push to it15:05
the name really doesn't matter15:05
joakimk but when I push my initial commit, I get a PR on GitHub. I (being the single developer etc) want to just push "directly" to <branchname>15:05
whatever it might be :)15:05
bookworm no, pushing gives you a push, not a PR15:06
at least if we talk about git push15:06
joakimk hmm... I did `git push -u origin main` but my local branch was master15:06
that's what's doing it?15:06
bookworm I doubt it.15:07
joakimk ah no, wait -- I couldn't do `git push -u origin main`, I got error "error: src refspec main does not match any"15:07
but, keeping it simple: should I rename my local branch to main?15:08
and then `git push -u origin main` ?15:08
bookworm just push master up15:08
why do you wanna keep main if you use master?15:08
rosco left15:08
joakimk but I get a PR in github...15:08
traph left15:08
bookworm when you do what?15:09
traph joined15:09
joakimk master had recent pushes 1 minute ago -- Compare & pull request15:09
says GH15:09
user____ joined15:09
joakimk after doing `git push -u origin master`15:09
bookworm yeah, that isn't a PR. That means exactly what it says15:09
that you *could* make a PR if you wanted15:09
joakimk ahhoooo15:09
cough cough15:10
bookworm as GH considers main to be the default branch15:10
joakimk I knew that15:10
P15:10
hehe thanks...15:10
I just changed the branch (in GH) and there were all my filez15:10
sorry for the silly question :P15:11
bookworm just delete main if you don't use it15:11
it's fine, we all start somewhere15:11
joakimk yeah15:11
:)15:11
user____ left15:14
demonspork left15:17
feriman joined15:17
wootehfoot joined15:20
jacobk joined15:25
user____ joined15:25
fling left15:26
Tlsx joined15:26
ThorMojito joined15:27
fling joined15:29
traph left15:32
traph joined15:32
bgs joined15:33
geosmile left15:33
Guest7474 joined15:37
nate1 joined15:42
ThorMojito left15:45
jacobk left15:47
nate1 left15:47
joakimk left15:51
geirha left15:52
jaykelly450 left15:55
teut left15:55
cdown left15:56
ritsu[m] left15:56
theobjectivedad left15:57
skapata joined15:59
wootehfoot left16:00
theobjectivedad joined16:00
filePeter joined16:02
liefer396 joined16:05
___nick___ left16:05
R2robot left16:07
R2robot joined16:07
duxsco joined16:08
wootehfoot joined16:08
perrierjouet left16:11
joe9 joined16:12
joe9 I have a patch file to a file llvm/CMakeLists.txt. I want to apply this patch to the file llvm-project/llvm/CMakeLists.txt. Is there a way to add a destination directory to git-add or git-am to do it automatically?16:13
From the man pages, --directory does not do that.16:13
Writing an awk or shell script to change the patch file, seems to be a pita.16:14
esc joined16:14
joe9 just curious if there is a simpler way to migrate the patch files to the new repositiory format?16:14
duxsco left16:15
Guest7474 left16:15
duxsco joined16:15
___nick___ joined16:16
aapost left16:21
Gaboradon left16:26
gsi add and am were built for different purposes, am taking commits not just patches16:28
does man git-apply help? it accepts patches, and should mostly do what patch(1) does16:28
gitinfo the git-apply manpage is available at https://gitirc.eu/git-apply.html16:28
user____ left16:29
Suchiman left16:29
Suchiman joined16:31
epicout__ joined16:39
aapost joined16:39
duxsco left16:41
epicout_ left16:42
user____ joined16:42
Tuor left16:42
Tuor joined16:43
jfsimon1981 left16:44
jfsimon1981 joined16:45
user____ left16:47
perrierjouet joined16:48
stenno left16:48
ferdna joined16:52
alexherbo2 left16:53
perrierjouet left16:54
perrierjouet joined16:56
user____ joined16:58
user____ left17:01
osse joe9: --directory=llvm-project -p217:04
joe9 osse, I think you misundestand my question.17:04
wlemuel left17:04
joe9 I need it the other way.17:04
a patch to llvm/file applied to llvm-project/llvm/file17:05
fling left17:06
fling joined17:06
ThorMojito joined17:07
wilz left17:07
osse joe9: Then --directory is all you need (should be at least)17:10
bloody joined17:10
osse joe9: To be clear, the patch file has this right?17:10
--- a/llvm/blah17:11
joe9 no, the patch file does not have it.17:11
the patch file has --- a/blah17:11
and b/blah17:11
I want it to do /b/llvm/blah17:11
olddogbarks joined17:12
osse --directory=llvm then17:12
But that sounds strange. Where did "-project" go?17:12
wlemuel joined17:12
joe9 osse, the llvm project morphed into a mono repo format.17:13
It moved the llvm project into llvm-project/llvm17:13
ch maybe you should be clearer with us. is llvm-project the git root?17:14
joe9 yes, it is now.17:14
Guest7474 joined17:14
joe9 I have the patch files from when llvm was the root.17:14
I want to add llvm-project/ to the destination files.17:14
when I import the patch17:15
ch so the top level directory name in the patch should not matter, can be a/ or b/ or llvm/ or llvm-project/ or whatever17:15
user____ joined17:15
osse -p removes path components from [ab]/foo/bar, --directory prepend. A combination of those will do the trick. The default is -p117:15
ch it seems like you want to add llvm/17:15
joe9 yes, I want the inverse of -p17:15
osse So, --directory17:16
joe9 a/llvm/blah applied to b/llvm-project/llvm/blah17:16
osse --directory=llvm-project17:16
ch if llvm-project is the root dir, and you want b/llvm-project, you'll also need -p2!?17:17
i mean sure, but why17:17
olddogbarks left17:17
user____ left17:20
osse Something is rotten in the state of Denmark17:20
duxsco joined17:22
dsrt^ left17:25
user____ joined17:31
BUSY joined17:32
KnoP left17:39
alturmann1729 left17:45
ju joined17:46
f_ left17:46
vdamewood left17:47
ThorMojito left17:48
vdamewood joined17:49
lucasta joined17:51
Sulky__ left17:59
Sulky__ joined18:00
jaykelly450 joined18:06
coot left18:08
delay joined18:08
agd left18:09
duxsco left18:14
tmpm697 left18:16
alexherbo2 joined18:17
jacobk joined18:21
delay left18:23
delay joined18:24
gurkenglas left18:25
hyperair left18:28
navi joined18:28
delay left18:30
shailangsa_ left18:32
gurkenglas joined18:33
terminaldweller left18:34
delay joined18:34
user____ left18:35
terminaldweller joined18:37
shokohsc left18:38
user____ joined18:38
delay left18:39
han-solo left18:40
user____ left18:43
wootehfoot left18:43
hyperair joined18:44
shokohsc joined18:45
Guest7474 left18:46
int3r3st3d joined18:54
user____ joined18:55
user____ left18:57
delay joined18:57
money joined18:59
shailangsa joined19:00
coot joined19:01
delay left19:03
peas joined19:04
otisolsen70 joined19:05
delay joined19:05
BlessJah left19:06
delay left19:08
user____ joined19:11
duthils left19:12
BlessJah joined19:12
vdamewood left19:15
theobjectivedad left19:16
vdamewood joined19:17
int3r3st3d left19:20
lmat left19:21
ThorMojito joined19:25
gco joined19:28
coot left19:33
ThorMojito left19:38
nate1 joined19:44
ThorMojito joined19:47
nate1 left19:49
distant left19:51
distant joined19:51
delay joined19:54
delay left19:55
shokohsc3 joined19:55
shokohsc left19:56
shokohsc3shokohsc19:56
weko_ joined19:58
weko left20:01
___nick___ left20:04
mven4 joined20:08
ThorMojito left20:08
coot joined20:10
wlemuel left20:12
mven left20:12
mven4mven20:12
PobodysNerfect left20:13
feriman left20:13
user____ left20:16
bywaterloo joined20:16
theoceaniscool joined20:16
otisolsen70 left20:21
wlemuel joined20:24
user____ joined20:29
vysn joined20:30
user____ left20:32
tirnanog joined20:34
finalriposte left20:34
riposte joined20:35
geosmile joined20:43
a6a45081-2b83 joined20:44
user____ joined20:46
user____ left20:48
theobjectivedad joined20:50
cdown joined20:50
reset left20:51
DomenicoScoppett joined20:53
thiago joined20:54
teut joined20:56
bret left21:00
PobodysNerfect joined21:01
jacobk left21:03
user____ joined21:03
alexherbo2 left21:05
aapost_ joined21:09
filePeter left21:09
aapost left21:09
reset joined21:13
lucasta left21:13
geirha joined21:13
theoceaniscool left21:14
blaklistd1 left21:15
Gaboradon joined21:16
traph left21:18
traph joined21:18
roadie left21:20
clime left21:23
bgs left21:24
traph left21:27
traph joined21:27
xx left21:28
Jong joined21:28
zeenk joined21:32
epicout__ left21:34
roadie joined21:47
pedregalux joined21:47
Atque left21:48
jacobk joined21:52
pedregalux left21:53
pedregalux joined21:56
roadie left21:57
pedregalux left22:02
pedregalux joined22:02
YuGiOhJCJ joined22:03
teut left22:03
pedregalux left22:04
pedregalux joined22:04
Guest19 left22:05
pedregalux left22:05
pedregalux joined22:06
pedregalux_ joined22:06
user____ left22:08
pedregalux_ left22:09
pedregalux left22:10
pedregalux joined22:11
HumanG33k left22:15
user____ joined22:16
HumanG33k joined22:16
pedregalux left22:18
pedregalux joined22:18
humanface left22:19
user____ left22:20
pedregalux left22:20
giu joined22:24
skeer left22:25
EvgenyK joined22:26
sa0 left22:27
DynamiteDan left22:28
DynamiteDan joined22:29
EvgenyK left22:30
coot left22:31
user____ joined22:32
user____ left22:35
ferdna left22:37
clarkh2 joined22:41
clarkh1 left22:42
EvgenyK joined22:43
gurkenglas left22:46
a6a45081-2b83 left22:46
gurkenglas joined22:48
EvgenyK left22:48
ThorMojito joined22:49
user____ joined22:49
Traneptora left22:49
rustyshackleford left22:50
KimK_KimK22:52
skered left22:56
falafel joined23:01
Noisytoot left23:02
Noisytoot joined23:03
lolok left23:03
Yruama left23:06
skered joined23:08
Tlsx left23:09
terrorjack left23:09
ThorMojito left23:10
foul_owl joined23:12
roadie joined23:15
jaykelly450 left23:16
m0viefreak left23:24
vysn left23:24
nyah left23:26
roadie left23:28
wlemuel left23:29
wlemuel joined23:30
zeenk left23:31
terrorjack joined23:31
squirrel left23:35
jbg joined23:36
aapost_ left23:38
agd joined23:40
nate1 joined23:45
nate1 left23:50
gurkenglas left23:53
user____ left23:54
vysn joined23:55

Logs Search ←Prev date Next date→ Channels Documentation