IRCloggy #git 2023-08-02

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-08-02

gildasio joined00:05
clime left00:06
kkawg left00:08
UrsoBranco left00:08
zeenk left00:12
samuelbernardo left00:19
samuelbernardo joined00:20
noord left00:23
rapmoc left00:23
jaeckel left00:23
noord joined00:24
rapmoc joined00:24
jaeckel joined00:25
jacobk joined00:30
acidjnk_new left00:49
gildasio left00:52
countach202020 joined00:53
cdown left00:58
RiFo joined01:00
rafspiny left01:01
rafspiny joined01:01
ghost43_ joined01:01
ghost43 left01:01
[RiFo] left01:02
countach202020 left01:05
countach202020 joined01:05
thuna` left01:05
ash_m joined01:13
konsolebox left01:15
ThorMojito joined01:15
countach202020 left01:17
CaCode_ joined01:22
rama_ left01:25
CaCode left01:25
rama_ joined01:25
rama_ left01:30
konsolebox joined01:32
codaraxis left01:35
falafel left01:40
Wuzzy left02:02
deltab left02:04
zumba_addict joined02:05
jklfds_ left02:06
shokohsc510 joined02:06
shokohsc51 left02:07
ezio joined02:07
geirha left02:09
rama_ joined02:09
Millicent left02:11
ezio left02:12
deltab joined02:14
rama_ left02:15
jklfds_ joined02:15
nate2 joined02:16
jklfds_ left02:19
codaraxis joined02:21
jklfds_ joined02:22
bywaterloo joined02:24
Millicent joined02:24
jklfds_ left02:27
pert left02:28
jacobk left02:29
c0dehu1k joined02:30
c0dehu1k left02:32
Cache_Money joined02:39
nanobot567 joined02:44
rama_ joined02:45
theobjectivedad left02:45
theobjectivedad joined02:45
nanobot567 left02:46
Vonter joined02:47
rama_ left02:49
c0dehu1k joined02:50
gast0n left02:52
skered left02:54
ash_m left02:57
skered joined02:57
skered left02:57
skered joined02:58
jklfds_ joined02:59
FinnElija left02:59
finn_elija joined02:59
finn_elijaFinnElija02:59
ash_m joined03:00
codaraxis__ joined03:00
fcser left03:02
fcser joined03:03
EvgenyK joined03:03
jklfds_ left03:04
c0dehu1k left03:04
codaraxis left03:04
gsi_ joined03:07
EvgenyK left03:08
c0dehu1k joined03:08
gsi left03:10
EvgenyK joined03:15
radix0 left03:16
c0dehu1k left03:17
Vonter left03:18
nate2 left03:18
ThorMojito left03:19
Vonter joined03:21
codaraxis__ left03:29
jklfds_ joined03:31
jklfds_ left03:35
Millicent left03:37
chandash joined03:38
EvgenyK left03:43
Millicent joined03:49
konsolebox left03:50
jklfds_ joined04:00
hbautista joined04:03
jklfds_ left04:05
konsolebox joined04:10
jklfds_ joined04:11
bloody left04:14
chandash left04:15
jklfds_ left04:15
Millicent left04:15
bleb left04:27
jklfds_ joined04:30
bleb joined04:30
Millicent joined04:32
jklfds_ left04:34
duderonomy left04:35
FH_thecat joined04:35
duderonomy joined04:36
gep joined04:49
jklfds_ joined04:56
Millicent left04:58
jklfds_ left05:01
teut joined05:04
teut Hi, so I have the following problem, I have a git repo react-frontend and another repo flask-backend05:05
I developed them locally without docker yet05:06
Now I need to create a docker compose stack, so I created a new folder with those two git reps cloned05:06
Also I added the docker-compose.yaml in that new folder and dockerfile was already in those two repos, now I want to create a new githib repo for this new folder05:07
Can someone tell how to do it?05:08
ezio joined05:09
Millicent joined05:11
ikke teut: as the other 2 directories are already repositories, you probably want to include them as submodules05:15
ezio left05:15
teut oh ok, let me check that05:15
thanks05:15
ikke Note that updating the commit that is checked out for those submodules requires a new commit in the parent repo05:15
so each submodule is pinned to a specific commit05:15
konsolebox left05:18
Cache_Money left05:18
panella32 joined05:19
rama_ joined05:20
JanC left05:20
m_antis joined05:21
teut oh ok, thanks I would also look into that05:21
rama_ left05:23
han-solo joined05:25
JanC joined05:27
zumba_addict left05:29
jklfds_ joined05:29
jklfds_ left05:33
larryv left05:41
thiago left05:43
clime joined05:55
bn_work left05:55
bywaterloo left05:56
feriman joined06:00
Dotz0cat left06:01
Dotz0cat joined06:02
jklfds_ joined06:03
jklfds_ left06:07
weedmic joined06:16
Vonter left06:16
rama_ joined06:18
gep left06:18
panella32 left06:21
igemnace joined06:24
panella32 joined06:25
mncheck left06:25
rama__ joined06:26
ezio joined06:26
jklfds_ joined06:26
rama_ left06:29
jklfds_ left06:31
arunkumar413 joined06:31
jklfds_ joined06:32
arunkumar413 Hi Team, I have two branches and trying to merge one into another but it says already up to date though the file contents are different. Please help.06:33
grawity could it be that the other branch is strictly "older" than the one you're merging to? what does the commit graph look like (in gitk or tig or such)?06:35
ikke !situation06:35
gitinfo Please post the url returned by ' git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de ' to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)06:35
arunkumar413 grawity, how to view the commit graph?06:36
grawity git log --graph --oneline BRANCH1 BRANCH2, tig BRANCH1 BRANCH2, gitk BRANCH1 BRANCH2,06:37
jklfds_ left06:37
ikke arunkumar413: use the command provided by gitinfo and you get something that we can look at as well06:37
arunkumar413 gitinfo https://upaste.de/t2o06:38
Vonter joined06:38
arunkumar413 I'm trying to merge the branch 'development' into 'arun'06:38
grawity what is the 'current' branch, and what is the branch that you're trying to merge?06:38
yeah, that shows that the tip of 'arun' is *already* a merge commit06:39
there's nothing more left to merge, is there?06:39
arunkumar413 currently I'm in the branch name called 'arun' and want to merge the 'development' branch.06:41
grawity right but it's already merged06:42
arunkumar413 grawity, yes, it's says merged but the file contents are not the same.06:42
jab416171 left06:43
grawity sounds normal, that's how merges work06:43
if both branches had some changes after diverging, a merge won't completely overwrite 'arun' changes with 'development' changes, it'll literally merge both06:44
(though there's an option to fully overwrite the changes; two options even; but that is not the default or usual way of merging)06:44
rfuentess joined06:44
grawity (with only the relevant branches specified https://upaste.de/YFx is probably what the graph looks like)06:48
jab416171 joined06:48
gep joined06:50
ash_m left06:54
jklfds_ joined06:54
panella32 left06:56
Leonarbro left06:56
ether56k joined07:00
ash_m joined07:02
jklfds_ left07:04
iomari891 joined07:07
ezio left07:07
ether56k left07:08
Cirdo joined07:10
coot joined07:10
jklfds_ joined07:12
Vonter left07:14
nate2 joined07:16
jklfds_ left07:19
jklfds_ joined07:19
hbautista left07:20
nate2 left07:20
iomari891 left07:21
iomari891 joined07:21
ezio joined07:21
rkta left07:21
rkta joined07:21
crabbedhaloablut joined07:24
apteryx left07:28
clime left07:34
iomari892 joined07:40
MapMan joined07:40
iomari892 left07:41
iomari893 joined07:41
iomari891 left07:41
MapMan Hi! I have branches main and develop. Branch main is ahead of develop and it should stay like that (i.e. can't merge main into develop but I can merge develop into main). I need to do a hotfix that will go to both branches. What's the best way to go about this?07:42
apteryx joined07:42
iomari893 left07:42
jrofd joined07:42
iomari893 joined07:43
Gary_Sinise left07:43
coot left07:43
welder joined07:46
mane joined07:46
Vonter joined07:47
coot joined07:47
welder I've created 2 branches, added some commits on both. How to check if there is a file that was modified on both branches?07:47
grawity MapMan: do it on develop, then git cherry-pick it from develop into main07:47
teut left07:50
jmd joined07:53
acidjnk_new joined07:54
MapMan grawity: that was my thinking, thanks07:55
itaipu left07:56
dviola left07:58
iomari891 joined08:03
iomari893 left08:04
m1dnight left08:04
Vonter left08:04
iomari891 left08:05
Vonter joined08:05
iomari891 joined08:05
m1dnight joined08:06
iomari891 left08:09
iomari891 joined08:10
gryffus left08:10
Vonter left08:10
iomari891 left08:11
iomari891 joined08:12
iomari891 left08:12
iomari891 joined08:12
danse-nr3_ joined08:14
iomari891 left08:19
iomari891 joined08:20
rosco joined08:21
vysn joined08:25
dviola joined08:26
danse-nr3 joined08:29
danse-nr3_ left08:31
j416 welder: git log branch -- file08:34
danse-nr3 left08:46
nyah joined08:48
Anticom joined08:50
keypusher left08:51
danse-nr3 joined09:03
duxsco joined09:10
duxsco left09:12
ether56k joined09:17
iomari891 left09:19
samuelbernardo left09:20
inom left09:21
Schrostfutz joined09:22
keypusher joined09:27
jfsimon1981 left09:29
jfsimon1981 joined09:29
iomari891 joined09:29
tirnanog joined09:33
iomari891 left09:33
iomari891 joined09:33
JanC left09:35
mane left09:35
iomari891 left09:39
iomari891 joined09:39
JanC joined09:39
Vonter joined09:43
rsx joined09:44
ShanTaL joined09:44
ezio left09:44
Lord_of_Life_ joined09:46
Lord_of_Life left09:47
iomari891 left09:47
Lord_of_Life_Lord_of_Life09:49
skapata left09:50
TomyLobo joined09:51
mane joined09:54
igemnace left09:55
hussein1_ left09:56
hussein1_ joined09:57
danse-nr3_ joined09:59
danse-nr3 left10:00
arunkumar413 left10:00
cdown joined10:02
coot left10:06
ThorMojito joined10:06
igemnace joined10:09
qqq left10:09
srinidhi joined10:16
qwerty_ joined10:18
gareppa joined10:18
ThorMojito left10:18
Schrostfutz left10:18
qwerty_ left10:19
srinidhi left10:25
konsolebox joined10:31
xandris left10:33
xandris joined10:33
mane left10:40
geirha joined10:43
shokohsc510 left10:43
gildasio joined10:48
dvopgy joined10:52
dvopgy left10:52
gep left10:53
konsolebox left10:53
rama__ left10:56
srinidhi joined10:57
Cirdo left10:59
Cirdo joined10:59
vishal left11:03
rama_ joined11:04
vishal joined11:05
rama_ left11:08
arunkumar413 joined11:09
jrofd left11:10
shokohsc510 joined11:12
Schrostfutz joined11:14
rama_ joined11:16
nate2 joined11:17
Betal left11:17
gildasio left11:20
rama_ left11:20
CaCode_ left11:20
nate2 left11:22
srinidhi left11:23
ShanTaL left11:24
rama_ joined11:28
EvgenyK joined11:29
countach202020 joined11:37
hamburgler3 left11:39
hamburgler joined11:39
dmvrtx left11:40
Cirdo left11:42
dmvrtx joined11:42
Cirdo joined11:43
ezio joined11:43
memset left11:44
memset joined11:44
EvgenyK left11:44
mane joined11:46
dvopgy joined11:46
MajorBiscuit joined11:48
dvopgy left11:56
ezio left11:57
akimbo5334308470 left11:59
gryffus joined12:00
gareppa left12:06
BlessJah left12:08
BlessJah joined12:10
sd5 joined12:10
jrofd joined12:14
aspirin joined12:18
shokohsc5103 joined12:25
clime joined12:25
shokohsc510 left12:26
shokohsc5103shokohsc51012:26
danse-nr3_ left12:28
rama_ left12:31
danse-nr3_ joined12:35
ThorMojito joined12:35
itaipu joined12:36
bloody joined12:38
gareppa joined12:40
srinidhi joined12:43
ThorMojito1 joined12:43
rama_ joined12:44
shokohsc5105 joined12:44
ThorMojito left12:45
Vonter left12:45
shokohsc510 left12:46
shokohsc5105shokohsc51012:46
Schrostfutz left12:48
ueberall left12:50
Schrostfutz joined12:50
lucasta joined12:52
ueberall joined12:54
srinidhi left12:58
kjartan joined12:59
clime left13:04
danse-nr3_ left13:09
danse-nr3_ joined13:09
krushia joined13:11
itaipu left13:12
jmd left13:13
CaCode joined13:15
Xenguy left13:16
Schrostfutz left13:16
Schrostfutz joined13:17
jrofd left13:17
m_antis left13:21
weedmic left13:23
welder left13:24
m_antis joined13:24
njt_ joined13:24
rom1v_ joined13:24
umbramalison_alt left13:26
rom1v left13:26
njt left13:26
Gamah left13:26
umbramalison joined13:26
njt_njt13:26
JAA left13:26
Gamah joined13:26
JAA joined13:27
ncf left13:30
ferdna joined13:31
d1b_ left13:35
itaipu joined13:35
d1b joined13:35
bywaterloo joined13:38
indigo-oce joined13:39
Xaldafax joined13:43
itaipu left13:44
ThorMojito1 left13:44
RiFo left13:47
ThorMojito joined13:48
Cirdo left13:48
Cirdo joined13:49
rama_ left13:49
GNUmoon left13:50
GNUmoon joined13:50
obskep joined13:53
Schrostfutz left13:55
welder joined13:56
Schrostfutz joined13:57
itaipu joined13:58
danse-nr3__ joined13:59
rom1v_rom1v13:59
danse-nr3_ left13:59
rama_ joined14:02
akimbo5334308470 joined14:04
rama_ left14:07
thiago joined14:07
rama_ joined14:07
bgs joined14:10
arunkumar413 left14:10
Schrostfutz_ joined14:11
Schrostfutz left14:12
Schrostfutz_ left14:19
hussein1_ left14:20
hussein1_ joined14:21
mane left14:22
apteryx left14:22
itaipu left14:23
warmana joined14:23
mane joined14:24
mane error: RPC failed; HTTP 408 curl 22 The requested URL returned error: 40814:26
send-pack: unexpected disconnect while reading sideband packet14:26
fatal: the remote end hung up unexpectedly14:26
this is what i'm getting14:26
any clues how to fix that?14:27
arunkumar413 joined14:28
ggherdov joined14:32
srinidhi joined14:33
ezio joined14:34
thiago left14:35
ggherdov Hello, I'm trying to list all tags in my repo, next to the hash of the commit they're pointing to. How's that done?14:35
I've tried git tag --format "%(objectname) %(refname)", but it seems %(objectname) isn't what I want: multiple tags pointing to the same commit will all have distinct "objectname".14:35
ggherdov uhm, maybe `--format "%(object) %(refname)"`14:38
obskep left14:39
arunkumar413 left14:41
gast0n joined14:41
countach202020 left14:42
gareppa left14:45
LuKaRo_ left14:46
LuKaRo joined14:48
ezio left14:48
ThorMojito left14:50
itaipu joined14:52
ether56k left14:52
ether56k joined14:52
warmana left14:54
ezio joined14:56
ezio left15:00
bywaterloo left15:02
bywaterloo joined15:03
Anticom left15:10
Schrostfutz_ joined15:10
tirnanog left15:10
rama_ left15:11
Arsen can i disasble inexact rename detection on cherry-picks?15:12
i am cherry picking across repos and it keeps getting false positives15:12
MajorBiscuit left15:13
jklfds joined15:15
ikke Arsen: try git -c merge.renames=false cherry-pick ..15:16
jklfds_ left15:18
Arsen still says: Performing inexact rename detection: 64% (1848648/2888501)15:18
for: git -c merge.renames=false cherry-pick ab4f385b3c31e6bca198d2eef1a8c5268e28cd7615:18
I tried that too (but with 'no')15:18
jubalh left15:19
nate2 joined15:19
jubalh joined15:20
thiago joined15:21
YellowSuB joined15:21
ikke and what about git cherry-pick -X find-renames=100 ab4f385b3c31e6bca198d2eef1a8c5268e28cd7615:21
Schrostfutz_ left15:22
ikke oh, find-renaames=100%15:22
chandash joined15:23
nate2 left15:24
Arsen ikke: that seems to have been effective, yeah15:26
thanks :>15:26
heapify joined15:27
kkawg joined15:28
Schrostfutz_ joined15:30
rama_ joined15:32
danse-nr3__ left15:33
danse-nr3__ joined15:34
Soliton ggherdov: if you have annotated tags you can dereference them with *objectname.15:34
danse-nr3__ left15:34
ggherdov Soliton: thanks15:36
larryv joined15:36
YuGiOhJCJ left15:38
danse-nr3 joined15:42
duxsco joined15:43
danse-nr3 left15:43
Gary_Sinise joined15:43
danse-nr3 joined15:43
danse-nr3 left15:44
rfuentess left15:45
funhouse joined15:46
Soliton looks like you can even do logic: --format='%(if)%(*objectname)%(then)%(*objectname)%(else)%(objectname)%(end) %(refname)'15:48
esc left15:49
gh34 joined15:49
ezio joined15:50
hussein1_ left15:52
BtbN left15:53
BtbN joined15:53
ezio left15:54
hussein1_ joined15:55
theobjectivedad left15:57
Cirdo left16:02
Traneptora left16:02
bf_ left16:03
bf_ joined16:04
bywaterloo left16:14
danse-nr3 joined16:17
danse-nr3 left16:18
funhouse left16:19
Schrostfutz_ left16:22
Schrostfutz_ joined16:23
gareppa joined16:25
danse-nr3 joined16:25
danse-nr3 left16:26
Vonter joined16:28
nvmd joined16:30
nanobot567 joined16:33
rama_ left16:34
nanobot567 left16:35
Schrostfutz_ left16:42
rama_ joined16:47
bywaterloo joined16:48
chandas2 joined16:49
chandash left16:51
rama_ left16:51
lucasta left16:52
chandas2 left16:57
rsx left17:00
clime joined17:01
clime left17:02
clime joined17:02
Vonter left17:02
JanC left17:05
hussein1_ left17:05
JanC joined17:05
hussein1_ joined17:06
igemnace left17:06
rama_ joined17:09
jfsimon1981 left17:11
jfsimon1981 joined17:12
ketas left17:14
ketas joined17:17
Yruama joined17:20
igemnace joined17:20
RoyalYork left17:21
RoyalYork joined17:24
ezio joined17:25
zumba_addict joined17:28
vysn left17:31
igemnace left17:32
ferdna left17:35
kkawg left17:36
ash_m_ joined17:39
ash_m left17:39
ezio left17:40
Leonarbro joined17:41
Yruama left17:42
bn_work joined17:43
Yruama joined17:44
cdown left17:44
ezio joined17:45
igemnace joined17:46
mane left17:48
ThorMojito joined17:48
itaipu left17:51
skapata joined17:52
rama_ left17:52
rama_ joined17:52
Xatenev joined18:00
Xatenev left18:00
Xatenev joined18:00
knolle left18:01
ash_m_ left18:01
itaipu joined18:03
ezio left18:03
ash_m joined18:06
knolle joined18:08
memset left18:08
indigo-oce left18:08
memset joined18:09
han-solo left18:09
Xatenev left18:11
funhouse joined18:11
Yruama left18:11
Xatenev joined18:11
Xatenev left18:11
Xatenev joined18:11
hbautista joined18:19
Yruama joined18:20
navirc joined18:22
doc left18:27
doc joined18:29
codaraxis joined18:32
Techcable joined18:32
thiago left18:36
thiago joined18:36
duxsco left18:36
ezio joined18:41
coot joined18:42
coot left18:45
coot joined18:47
thiago left18:49
thiago joined18:49
Yruama left18:49
Yruama joined18:52
funhouse left18:53
Yruama left18:54
Yruama joined18:56
jmd joined18:58
heapify left19:01
howdoi joined19:03
qeez joined19:05
Yruama left19:08
Yruama joined19:10
aspirin left19:11
gareppa left19:11
jklfds left19:16
navirc left19:16
feriman left19:17
aspirin joined19:18
Xatenev left19:20
nate2 joined19:20
nate2 left19:25
Yruama left19:29
rosco left19:30
qeez left19:35
qeez joined19:35
CaCode left19:39
qeez left19:41
Yruama joined19:42
ThorMojito left19:44
ThorMojito joined19:48
cdown joined19:53
ThorMojito left19:54
ThorMojito joined19:56
Yruama left19:56
Yruama joined19:58
ThorMojito left19:58
kkawg joined20:02
jklfds joined20:11
srinidhi left20:13
Traneptora joined20:14
wolfravenous joined20:15
jklfds left20:15
igemnace left20:20
ursa left20:25
jmd left20:25
feriman joined20:33
clime left20:34
crabbedhaloablut left20:34
gh34 left20:43
heftigheftig[m]20:47
bgs left20:54
Guest19 joined20:56
sd5 left21:00
aspirin left21:00
kjartan left21:00
ajfriesen847 joined21:02
ajfriesen84 left21:03
ajfriesen847ajfriesen8421:03
bywaterloo left21:03
rama_ left21:05
rama_ joined21:06
wolfravenous left21:07
k3rnelpanic[m] joined21:08
rama_ left21:10
chandash joined21:11
inom joined21:16
ursa joined21:18
rama_ joined21:19
feriman left21:20
thiago left21:21
fluid left21:23
rama__ joined21:23
rama_ left21:24
navirc joined21:27
toast- joined21:28
coot left21:34
mkosmo left21:36
cbreak left21:37
cbreak joined21:40
mkosmo joined21:44
hussein1_ left21:45
hussein1_ joined21:46
doc left21:51
skapata left21:56
acidjnk_new left21:56
rama__ left21:58
rama_ joined22:00
bn_work left22:03
mud left22:03
mud joined22:04
bn_work joined22:06
Guest19 left22:07
rama_ left22:07
Dotz0cat left22:08
Crocodillian left22:11
JanC left22:20
konsolebox joined22:20
rama_ joined22:21
JanC joined22:22
ether56k left22:24
Dotz0cat joined22:24
rama_ left22:25
jacobk joined22:25
ThorMojito joined22:26
thuna` joined22:28
ThorMojito1 joined22:29
rama_ joined22:31
ThorMojito left22:32
theobjectivedad joined22:33
rama_ left22:36
ThorMojito1 left22:37
countach202020 joined22:42
rama_ joined22:42
nvmd left22:42
konsolebox left22:43
konsolebox joined22:44
chandash left22:44
rama_ left22:46
thiago joined22:49
hussein1_ left22:52
hussein1_ joined22:55
JanC_ joined22:58
JanC left22:58
JanC_JanC22:58
rama_ joined23:00
brw6 joined23:02
brw left23:03
brw6brw23:03
thuna` left23:07
Ranhir left23:10
skapata joined23:14
ash_m left23:20
nate2 joined23:22
nate2 left23:26
Pikk3wyn joined23:29
Betal joined23:33
Guest72 joined23:36
Guest72 left23:36
TomyLobo left23:42
Betal left23:50
Betal joined23:55

Logs Search ←Prev date Next date→ Channels Documentation