IRCloggy #git 2021-01-22

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.

2021-01-22

tryte joined00:01
cyrus_mc_ joined00:01
g00s left00:01
cyrus_mc_ Doing git subtree pull --prefix .ci [email@hidden.address] master --squash via automation so don't want it to ask me to merge. I tried --non-interactive but it said unknown option. Is there a way I can tell it to just go ahead and merge00:02
royal_screwup21 left00:02
royal_screwup21 joined00:02
herren left00:02
royal_screwup21 left00:07
royal_screwup21 joined00:08
tiin57 left00:08
zulutango joined00:09
tiin57 joined00:12
calcul0n_ left00:13
SwiftMatt joined00:18
dqx_ joined00:19
dqx_ left00:23
dqx_ joined00:23
chewb left00:24
g00s joined00:24
envex joined00:25
akiva left00:26
cbreak_ left00:27
trinityblade left00:28
hololeap left00:33
Ram-Z left00:34
infl00p left00:35
g00s left00:35
Gustavo6046 left00:38
tiin57 left00:38
g00s joined00:39
tryte left00:41
AnAverageHuman left00:41
Hello71 left00:41
tejr left00:41
Nickwiz left00:41
meropyri left00:41
iNs_ left00:41
xelxebar left00:41
denisse left00:41
andreas303 left00:41
reen left00:41
j7k6 left00:41
maxwilliamson left00:41
DiffieHellman left00:41
ghost43 left00:41
tiin57 joined00:41
Gustavo6046 joined00:41
wolfshappen left00:48
developer24 joined00:49
akiva joined00:50
shabius left00:51
shabius joined00:51
ericnoan joined00:52
Mmike joined00:54
Ram-Z joined00:54
infl00p joined00:56
crose_ joined00:56
Hello71 joined00:58
reen joined00:58
tryte joined00:58
royal_screwup21 left00:58
royal_screwup21 joined00:59
ghost43 joined00:59
tejr joined01:00
cyrus_mc_ left01:01
gast0n joined01:02
DiffieHellman joined01:03
xelxebar joined01:03
meropyri joined01:03
denisse joined01:03
developer24 left01:03
maxwilliamson joined01:03
royal_screwup21 left01:03
wolfshappen joined01:05
tejr left01:05
tejr joined01:06
reen left01:06
reen joined01:06
j7k6 joined01:07
AnAverageHuman joined01:07
iNs joined01:08
clime left01:08
tiin57 left01:08
yoh joined01:08
yoh I would like to figure out some detail of how git-remote-https "works" to decide on HTTP_REAUTH, want to gdb it, what is the communication language if I start "git-remote-https origin https://..." ?01:09
durham left01:10
durham joined01:11
tiin57 joined01:12
gordonfish left01:12
Nickwiz joined01:12
andreas303 joined01:12
yoh I think found it: https://git-scm.com/docs/gitremote-helpers01:16
arcatech left01:17
raven-au joined01:19
g00s left01:20
arcatech joined01:20
hurfdurf left01:20
hurfdurf joined01:21
rumbler31_ left01:26
alyawn joined01:29
DevAntoine joined01:30
maxwilli- joined01:30
maxwilliamson left01:30
moldorcoder7 left01:31
moldorcoder7 joined01:31
mowotter left01:32
DevAntoine left01:34
Technodrome joined01:37
tiin57 left01:38
p-core left01:40
p-core joined01:40
tiin57 joined01:42
BUSY joined01:45
gordonfish joined01:47
akasuv joined01:48
Xenguy_ joined01:51
akasuv left01:51
yoh eh, still do not quite get though how git gets 401 and not 404 when trying to access private repos on github: https://git-annex.branchable.com/bugs/be_like_git_and_ask_for_credentials_if_404/#comment-bfe2ec4cc10d7bb543c6bfec850de4c101:53
Xenguy left01:53
Guest20 joined01:56
cr4y1 left01:59
royal_screwup21 joined02:00
arcatech left02:03
akiva left02:04
royal_screwup21 left02:05
tiin57 left02:08
tiin57 joined02:12
nsc joined02:14
nscGuest7601302:14
arcatech joined02:15
Guest58752 left02:16
arcatech left02:22
foul_owl left02:22
arcatech joined02:27
arcatech left02:27
Xenguy_Xenguy02:28
iskander- joined02:32
Betal left02:32
steven left02:33
iskander left02:34
Betal joined02:34
steven joined02:34
Wetmelon left02:36
venmx left02:38
tiin57 left02:38
tiin57 joined02:42
bogartjack left02:46
SwiftMatt left02:50
arcatech joined02:53
Wetmelon joined02:55
F0rTex left02:58
Muimi joined02:59
F0rTex joined02:59
myst1crule joined03:06
arcatech left03:07
tiin57 left03:08
Ranhir left03:08
nomadicmathmo left03:09
Sleepy63 left03:11
tiin57 joined03:11
Ranhir joined03:12
jaziz joined03:12
pedahzur left03:13
PJBoy left03:18
DavidJOwens left03:22
atrus joined03:23
atrus Trying to help a co-worker out of a tough git problem. We're not positive, but we *think* what happened was that while Bob was resolving conflicts while merging Charlie's changes into their branch, they (somehow) removed all of the Charlie's changes, in the merge commit. So Charlie's changes are in the history, but not reflected int he contents post-merge. That merge commit was then merged into master.03:26
I've tried reverting the ->master merge (with "git revert -m 1"), and then attempting to re-merge Charlie's changes in -- but git's just coming back with "Already up to date."03:27
The only solution I'm seeing may require Charlie to cherry-pick each of his commits back in one at a time -- it's not insurrmountable, just frustratingly tedious.03:28
mgedmin left03:30
DevAntoine joined03:30
mgedmin joined03:32
DevAntoine left03:35
atrus over the past 5 years in i've seen 2 instances of users accidentally getting some weird changes into a merge commit. It's rare, but once the change has gone into the merge commit itself, it can be very hard to see before it's too late.03:37
tiin57 left03:39
shush left03:41
tiin57 joined03:41
shush joined03:42
SwiftMatt joined03:42
cd left03:42
Technodrome left03:45
shush left03:46
mirrorbird left03:48
xirhtogal joined03:49
lagothrixGuest2487603:49
Guest24876 left03:49
xirhtogallagothrix03:49
SwiftMatt left03:49
bogartjack joined03:54
adlternative joined03:56
durham left03:57
gast0n left03:59
royal_screwup21 joined04:01
royal_screwup21 left04:06
backthen joined04:06
tiin57 left04:08
chachasmooth left04:09
chachasmooth joined04:11
tiin57 joined04:11
shush joined04:15
arcatech joined04:19
gadget left04:19
kerframil left04:20
shush left04:20
zebrag left04:22
zebrag joined04:23
Jackneill left04:23
Newami joined04:24
mindCrime_ left04:26
Goplat joined04:29
gadget joined04:31
venmx joined04:33
andrologic left04:34
Newami left04:34
sicelo left04:36
arcatech left04:36
mindCrime_ joined04:38
tiin57 left04:38
venmx left04:40
tiin57 joined04:42
arcatech joined04:43
adl_ joined04:47
adlternative left04:47
g00s joined04:48
mindCrime_ left04:48
shush joined04:50
Jackneill joined04:50
bogartjack left04:53
shush left04:55
milkt joined04:58
clarity joined05:00
SwiftMatt joined05:00
Wetmelon left05:07
austin987 left05:07
tiin57 left05:08
nrh^ left05:10
tiin57 joined05:12
austin987 joined05:19
zebrag left05:22
zebrag joined05:23
Sleepy63 joined05:25
AnAverageHuman left05:26
drbean joined05:31
inoteajw joined05:31
DevAntoine joined05:31
mosh joined05:33
tryte left05:34
tryte joined05:34
DevAntoine left05:36
zebrag left05:36
cation21 left05:37
tiin57 left05:38
AyoGuest7941705:40
Guest79417 left05:40
Ayo joined05:40
radu242 left05:41
SwiftMatt left05:41
radu242 joined05:42
tiin57 joined05:42
arcatech left05:43
g00s left05:47
bn_work left05:49
geosmileus left05:50
jl4 joined05:52
pedahzur joined05:53
orbyt_ left05:55
pedahzur left05:57
pedahzur joined05:57
alyawn left06:00
royal_screwup21 joined06:02
madewokherd left06:02
g00s joined06:05
royal_screwup21 left06:06
daysun joined06:07
tiin57 left06:08
arahael joined06:10
arahael How do I run 'git ls-files -om' but have it include modified-but-staged files as well?06:11
tiin57 joined06:11
p-core left06:12
p-core joined06:12
pedahzur left06:14
ackyshake arahael: git ls-files -oms06:15
arahael ackyshake: That doesn't really do that, that seems to have a different interpretation.06:15
It's listing files that were never changed at all in the current working tree.06:16
(But which are, never-the-less, tracked)06:16
g00s left06:16
ackyshake You want to limit the output to _just_ the modified but staged?06:16
arahael I basically want the list you get with `git status`06:17
ackyshake arahael: Why not use git status --porcelain then?06:17
arahael That looks promising.06:18
Yep, `git status --porcelain=2 | cut -d' ' -f 9-` works06:20
That's not going to bite me with renames, I hope.06:23
ackyshake Renames show up as 'R' in the output.06:25
riksteri joined06:25
arahael Yes, but it's still at item 9? The output is unfortunately space-delimited, but space can be in file names.06:27
wrobinso1 joined06:28
ackyshake It starts at field 9 yeah, but non-renames would just print the filename, so I guess you would need to consider that in your logic.06:29
arahael Yeah, it does look like renames will mess up that naive parsing.06:30
wrobinson left06:31
kenwoodfox left06:33
kenwoodfox joined06:34
g00s joined06:34
thiago left06:34
venmx joined06:35
tiin57 left06:38
venmx left06:40
tiin57 joined06:41
herren joined06:42
ferdna joined06:43
sord937 joined06:43
heyitsrama left06:45
OnkelBlade joined06:48
Betal left06:53
YuGiOhJCJ joined06:53
Jackneill hey06:53
how can i add (not merge, just add as uncommitted) the changes from a different branch?06:54
ackyshake Jackneill: git checkout some_branch -- some_file07:04
Jackneill -- . for everything?07:05
thank you07:05
ackyshake Yep,07:06
ferdna left07:07
ackyshake You could also use git cherry-pick --no-commit <commit> for this purpose, which also accepts a commit range.07:07
tiin57 left07:08
venmx joined07:08
Betal joined07:09
__Aqua_Vitae__ joined07:10
mirrorbird joined07:10
g00s left07:11
meropyri- joined07:11
meropyri left07:12
tiin57 joined07:12
__Aqua_Vitae__ left07:12
venmx left07:14
arahael Depending on what you mean by "changes", I usually use a soft reset for that.07:16
venmx joined07:17
atrigent left07:18
justanotheruser left07:21
inoteajw left07:26
vicfred left07:27
cim209 left07:27
vicfred joined07:27
cim209 joined07:27
kjartan left07:29
kjartan joined07:30
DevAntoine joined07:30
kjartan left07:31
kjartan_ joined07:32
mirrorbird left07:34
cbreak joined07:36
tiin57 left07:38
knobi joined07:41
tiin57 joined07:41
blahboybaz left07:43
FRWB left07:44
knobi left07:45
clime joined07:54
cr4y1 joined07:54
DiffieHellman left07:54
DiffieHellman joined07:55
otisolsen70 left07:57
rfuentess joined07:58
Goplat left07:59
unluckyshrubbery left08:02
royal_screwup21 joined08:02
rcoote joined08:02
TomyWork joined08:05
jl4 left08:05
royal_screwup21 left08:07
krkini joined08:08
kini left08:08
tiin57 left08:08
howdoi left08:11
tiin57 joined08:12
DevAntoine left08:15
knobi joined08:15
lawid left08:15
Muimi left08:16
lawid joined08:16
Muimi joined08:16
DevAntoine joined08:18
venmx left08:19
chele joined08:21
cliluw left08:24
cliluw joined08:25
leeN left08:26
drbean left08:27
mat001 left08:33
Haohmaru joined08:35
mirrorbird joined08:36
tiin57 left08:38
clarity left08:38
calcul0n_ joined08:41
tiin57 joined08:42
tonythomas joined08:43
venmx joined08:44
mozgalom joined08:48
g00s joined08:49
tsrt^ joined08:49
venmx left08:50
Betal left08:52
sudoforge left09:01
daysun windows doesn't have an executable file flag. If you pull and edit a +x script in windows and commits it, is the +x flag lost?09:02
ivanc joined09:03
sicelo joined09:04
osse daysun: no09:05
YuGiOhJCJ left09:06
knobi left09:07
tiin57 left09:08
klonn joined09:08
YuGiOhJCJ joined09:09
angusrobot joined09:10
knobi joined09:11
tiin57 joined09:11
bolovanos__ joined09:13
jor left09:14
hexa- left09:14
cdown left09:14
kaisyu[m] left09:14
BloodShot[m] left09:14
leibniz[m] left09:14
greyltc[m] left09:14
Rampoina[m] left09:14
rjstone left09:14
jor joined09:15
Rampoina[m] joined09:15
kaisyu[m] joined09:15
greyltc[m] joined09:15
leibniz[m] joined09:15
BloodShot[m] joined09:15
cdown joined09:15
rjstone joined09:15
cYmen joined09:15
quizzi joined09:15
karstensrage joined09:15
relipse joined09:15
roflin joined09:15
joako joined09:15
ephemera_ joined09:15
Fusl joined09:15
Norrin joined09:15
TimWolla joined09:15
Ragnor joined09:15
nerdypepper joined09:15
nemesit|znc joined09:15
blowry joined09:15
astronavt joined09:15
karstensrage left09:15
leibniz[m] left09:15
deepy joined09:16
ChrisLane left09:16
reprazent left09:16
haxki_ left09:17
hexa- joined09:17
AlexMax left09:17
BloodShot[m] left09:17
greyltc[m] left09:17
Rampoina[m] left09:18
cpackham left09:18
Phase[m] left09:18
kaisyu[m] left09:18
Birdie[m] left09:18
skalexisenvsnet left09:18
haxki joined09:19
reprazent joined09:19
FabioP joined09:20
chibit left09:20
M8zkoscjbf2dhkfz left09:21
blue_penquin left09:21
dunc4n left09:21
aks3n[m] left09:21
finn[m] left09:21
hiq[m] left09:21
hsiktas[m] left09:21
ecrockz123[m] left09:21
colemickens left09:21
bthompson90 left09:21
romanblanco[m] left09:21
cerna left09:21
morguldir left09:21
kb1000 left09:21
sith[m] left09:22
silviof left09:22
ForeverNoob[m] left09:22
hussam left09:22
Guest33533 joined09:23
mirrorbird left09:24
LordRyan left09:24
wunderbar left09:24
lusrx left09:24
royal_screwup21 joined09:25
angusrobot_ joined09:26
LordRyan joined09:26
sammyg joined09:26
mbalmer joined09:27
wunderbar joined09:27
angusrobot left09:27
ChrisLane joined09:27
Ayo left09:27
angusrobot_angusrobot09:29
cation21 joined09:30
mbalmer_ left09:30
adl_ left09:30
nomadicmathmo joined09:31
adlternative joined09:31
mitrokov joined09:34
hnOsmium0001 left09:35
tiin57 left09:38
downunder left09:39
nomadicmathmo left09:39
downunder joined09:41
tiin57 joined09:42
clarity joined09:44
ccrr10 joined09:44
unluckyshrubbery joined09:47
tmm88 joined09:48
tmm88 left09:51
tmm88 joined09:51
DevAntoine left09:53
DevAntoine joined09:53
angusrobot left09:55
Ori_B joined09:56
yawkat left10:00
yawkat joined10:03
onizu joined10:08
nomadicmathmo joined10:08
tiin57 left10:08
PJBoy joined10:09
bthompson90 joined10:10
tiin57 joined10:12
Penagwin24 left10:20
gigasu_shida left10:21
blowry left10:21
jl4 joined10:21
sicelo left10:24
Penagwin24 joined10:24
blowry joined10:25
drag0nius joined10:30
winny joined10:31
jungdongho joined10:35
angusrobot joined10:37
tiin57 left10:38
Pickchea joined10:39
Pickchea Hey, is there a way to stage a directory but not its contents?10:39
ikke No10:41
tiin57 joined10:41
itp_student|50 joined10:42
Pickchea ikke, that sucks pretty hard.10:43
But thanks.10:43
itp_student|50 left10:43
tmm88 left10:43
nedbat Pickchea: git doesn't store directories separately from their contents. What did you want to do?10:45
ikke: btw, "git push --all" doesn't seem to push tags10:45
adlternative When I checkout to some old branch,i find that some empty directory still exist.10:46
Pickchea nedbat, I have a subfolder `data' that contains large files (and no, I don't want to check them in with git-lfs). I want this folder to be in my repository but without the large files.10:46
nedbat Pickchea: put a README in there explaining what it's for.10:47
Pickchea nedbat nice workaround, thanks!10:47
ikke nedbat: I see I misread that. --all pushes refs/heads10:47
osse Pickchea: it also makes sense to put a .gitignore therre10:47
but I guess you have ignored everything already10:47
nedbat ikke: it seems odd that there isn't one git command that will push everything I have. oh well: alias pa = two commandss10:48
Pickchea osse, I have a .gitignore file in the root of my repository. It currently says `data/*.csv' but because `data' does not contain anything else, the directory itself won't be staged.10:48
osse yeah10:49
you can also put '*.csv' in data/.gitignore10:49
that way you also get a file in there that serves a purpose and you don't have to write a README :P10:49
nedbat writing a README will be the best thing you do today :)10:50
Thorn joined10:53
finn[m] joined10:55
blue_penquin joined10:55
Phase[m] joined10:55
kaisyu[m] joined10:55
romanblanco[m] joined10:55
ecrockz123[m] joined10:55
colemickens joined10:55
leibniz[m] joined10:55
M8zkoscjbf2dhkfz joined10:55
Birdie[m] joined10:55
morguldir joined10:55
silviof joined10:55
hussam joined10:55
ForeverNoob[m] joined10:55
sith[m] joined10:55
chibit joined10:55
hiq[m] joined10:55
hsiktas[m] joined10:55
greyltc[m] joined10:55
BloodShot[m] joined10:55
cerna joined10:55
Rampoina[m] joined10:55
kb1000 joined10:55
cpackham joined10:55
AlexMax joined10:55
skalexisenvsnet joined10:55
dunc4n joined10:55
aks3n[m] joined10:55
angusrobotangus10:55
onmeac joined10:56
g00s left10:56
onmeac left10:57
g00s joined10:58
OnkelBlade left11:01
ChrisLane left11:03
Muimi left11:04
Muimi_ joined11:04
Muimi_Muimi11:04
Muimi left11:04
ChrisLane joined11:05
tiin57 left11:08
Lord_of_Life left11:10
tiin57 joined11:12
sweatsuit left11:12
Muimi joined11:12
Muimi left11:12
jungdongho hello! is there any way to commit with previous messages in an editor?11:13
like a --reuse-message but in an editor11:14
I want to do that for keep my log message style consistently11:14
venmx joined11:15
Lord_of_Life joined11:15
osse jungdongho: git commit -C somecommit --edit11:16
you can also customize the template, or write a hook to generate the template11:16
lots of ways11:16
jungdongho osse: ah..! --edit! I missed that11:18
thanks! :D11:18
g00s left11:20
ADG1089__ joined11:22
ADG1089__ I squash merged dev -> qa. Now I'm getting merge conflicts too complex for github web when merging new changes from dev -> qa. Also I can't push directly to dev or qa. What should I do?11:22
since both branches are protected11:22
ikke ADG1089__: squash merges loose history about what has been merged11:23
so doing multiple merges from the same branch and then squash merging it in is indeed bound to conflict11:24
(it's similar to how SVN used to merge branches, which was a disaster as well)11:24
Pickchea left11:24
ADG1089__ ikke: so I should use squash merge only for feature branches and merge-commit merge for public branches11:24
not even rebase, right?11:25
ikke if the branches are protected, you cannot rebase them (and for public branches that should be avoided anyway)11:25
so yes11:25
jl4 left11:25
freimatz joined11:28
dqx_ left11:31
drag0nius left11:32
jungdongho left11:32
otisolsen70 joined11:32
graingert ADG1089__: having a `dev` and `qa` and `main`/`master` branch is a bit odd?11:32
why not just have one default branch for everything and qa each feature branch?11:33
ikke graingert: it totally depends on the workflow11:33
freimatz left11:34
vicfred left11:34
sier81 joined11:34
dionysus69 joined11:38
vicfred joined11:38
tiin57 left11:38
sgn left11:40
tiin57 joined11:41
sgn joined11:42
OnkelBlade joined11:46
nomadicmathmo left11:48
jl4 joined11:48
strk left11:49
ivanc left11:53
ivanc joined11:53
SwiftMatt joined11:54
dionysus69_ joined11:56
dionysus69 left11:56
dionysus69_ left11:56
dionysus69 joined11:57
SwiftMatt left11:58
tmm88 joined12:00
tmm88 left12:00
powerhouse left12:06
Dev0n hey, so when working with git submodules, if feature X is being developed on submodule A on branch X, would you have to create a branch X on the parent module as well to keep things consistent when it comes to merging?12:06
I'm trying to wrap my head around the workflow here12:06
freimatz joined12:06
tmm88 joined12:07
tmm88 left12:07
tmm88 joined12:07
Muimi joined12:08
Muimi left12:08
tiin57 left12:08
freimatz left12:09
MrC joined12:09
powerhouse joined12:10
tiin57 joined12:12
dqx_ joined12:14
venmx left12:18
Pickchea joined12:19
OnkelBlade left12:19
klonn left12:21
jl4 left12:24
rcoote left12:25
nomadicmathmo1 joined12:33
FabioP left12:35
nomadicmathmo1nomadicmathmo12:36
tiin57 left12:38
ivanc left12:40
tmm88 left12:41
ADG1089__ left12:41
sgn left12:42
tiin57 joined12:42
sgn joined12:42
Tobbi_1 joined12:45
cyphase left12:46
Tobbi_ left12:46
Tobbi_1Tobbi_12:46
cyphase joined12:57
gast0n joined12:59
gavlee left13:00
clime left13:00
aw1 joined13:02
gavlee joined13:06
_I3^RELATIVISM joined13:06
NitrousPG left13:06
tiin57 left13:08
OnkelBlade joined13:08
rcoote joined13:10
tiin57 joined13:12
bolovanos_ joined13:14
nomadicmathmo left13:17
bolovanos__ left13:17
axisys left13:21
Raging_Hog joined13:23
Technodrome joined13:30
mat001 joined13:31
ezzieyguywuf left13:34
tmm88 joined13:38
tmm88 left13:38
tmm88 joined13:38
tiin57 left13:38
royal_screwup21 left13:39
royal_screwup21 joined13:39
moldorcoder7 left13:40
Lord_of_Life left13:40
calcul0n__ joined13:41
tiin57 joined13:42
Lord_of_Life joined13:42
tgunr_ left13:43
calcul0n_ left13:44
royal_screwup21 left13:44
AnAverageHuman joined13:45
tgunr joined13:46
__that__ joined13:47
zebrag joined13:47
royal_screwup21 joined13:49
nomadicmathmo joined13:49
rustyshackleford left13:50
tgunr left13:51
cd joined13:52
mitrokov left13:53
royal_screwup21 left13:54
royal_screwup21 joined13:54
lacrymology joined13:55
fastfresh joined13:56
ADG1089__ joined13:59
royal_screwup21 left14:00
klonn joined14:00
sweatsuit joined14:08
tiin57 left14:08
CodeSlingerPaul joined14:11
rwdrich joined14:11
tiin57 joined14:12
royal_screwup21 joined14:12
moldorcoder7 joined14:13
venmx joined14:15
osse Dev0n: short answer: no14:15
tgunr joined14:16
k3yp left14:16
osse Dev0n: longer answer: branches doesn't matter. the parent git repo only cares about which commit the submodule should have checked out14:16
OnkelBlade left14:16
ADG1089__ left14:17
royal_screwup21 left14:17
royal_screwup21 joined14:18
klonn left14:18
klonn joined14:18
aw1 left14:18
Dev0n osse ok, so if feature/branch X is developed in the submodule, when this is ready to be included in the parent git repo, you would just make your merge from feature X to master in the submodule. Ideally the parent master branch would be tracking the master branch of the submodule right?14:19
Then it should *just work* without an additional workflow14:19
osse Dev0n: Yes, but it's at the "ideally" part it breaks down. there is no branch tracking with submodules14:20
zebrag left14:20
venmx left14:20
zebrag joined14:20
osse i mean, there is some convenience stuff to make it easier to update14:20
but a submodules will not magically be at the lastest commit on a branch by itself14:20
Dev0n osse, so just to clarify, on the parent master branch, you're not able to say the submodule in that parent is the master branch of that submodule, only an specific commit?14:21
osse correct14:22
Dev0n ahh14:22
that does mess with the workflow a bit I guess14:22
osse submodules are not very good if the submodule and the parent repo are developed in tandem14:22
royal_screwup21 left14:22
osse but they work quite weill if the parent repo just upgrade from v1.2 to v1.3 of the submdoule14:23
nomadicmathmo1 joined14:23
Dev0n osse, I'm in the process of having to rip out a monorepo into individual repos but trying to use submodules as an interim solution until it's completely detached14:24
seeing as submodules are only tracked by a specific commit, I guess the flow would be: branch x in submodule, merge submodule branch x to master, checkout parent master, update parent submodule to track latest commit of submodule master, push/deploy etc?14:25
nomadicmathmo left14:25
nomadicmathmo1nomadicmathmo14:25
royal_screwup21 joined14:26
osse yes14:26
but in the parent repo different branches can have different commits checked out of the submodule14:26
and that will be carried over when merging and stuff14:26
mowotter joined14:26
osse it could make sense (and it will work) to have a branch in the parent repo dedicated to updating the submodule, make any other necessary changes in that branch, and then merge that branch to master in the parent14:27
Dev0n ahh in that case, referring back to my original question, as a part of developing a feature, you would then create a branch on the parent *and* the submodule, where the flow would be to merge the submodule, then merge the parent14:27
osse, think we're on the same page14:28
cool, I think that's clear, thanks!14:28
Xenguy left14:28
osse I would develop the feature in the submodule (feature branches, whatever), *and then* I would update the parent repo in much the same way as I would if it were a 3rd party dependency14:29
The latter step could just be a le update and rebuild, or whether that requires changing API calls or whatever.14:29
ugh14:30
royal_screwup21 left14:30
Dev0n ahh, that's a better way to put it14:30
osse The latter step could just be a simple update and rebuild, or it could be a longer process that it would make sense to make a branch for (ie. changing API stuff)14:30
royal_screwup21 joined14:30
Dev0n yup, makes sense14:30
osse but all that is easier said than done... maybe the guys who develop something new in the submodule wants the other guys dealing with the parent repo to test the changes14:32
and maybe all those guys are just one guy!14:32
But if you at least try to treat the submodule as if it were a 3rd party thing it becomes easier.14:33
Dev0n yea, I think that's going to be a lot clearer to explain to the team, plus documentation on the process and *nothing can go wrong*, rite? >.>14:33
chele left14:33
Benzi-Junior left14:34
Technodrome left14:34
chele joined14:35
royal_screwup21 left14:36
ccrr10_ joined14:37
Benzi-Junior joined14:37
Fokst left14:38
tiin57 left14:38
royal_screwup21 joined14:38
Fokst joined14:38
ccrr10 left14:38
barteks2x left14:41
osse Documentation? What documentation?14:42
tiin57 joined14:42
osse ... is what I say at work all the time14:42
adlternative left14:47
royal_screwup21 left14:47
adlternative joined14:47
royal_screwup21 joined14:47
vdamewood joined14:47
Peetz1r joined14:48
kes joined14:49
mowotter left14:50
Sonderblade left14:50
Technodrome joined14:52
royal_screwup21 left14:52
gareppa joined14:52
adl_ joined14:54
adlternative left14:54
Learath2 I seem to have an untracked file in a commit? keeps showing up in status, I can't even google for it since idk what this "state" is called14:54
ivanc joined14:55
Learath2 oh nvm, the cherry-pick I aborted really created that file14:55
rustyshackleford joined15:05
FRWB joined15:05
v0n left15:05
Guest98408 joined15:06
justanotheruser joined15:06
tiin57 left15:08
gareppa left15:08
OnkelBlade joined15:10
adl_ left15:10
tiin57 joined15:11
sweatsuit left15:11
adl_ joined15:12
Gustavo6046 left15:12
Gustavo6046 joined15:16
ADG1089__ joined15:17
worc3131 joined15:18
zebrag left15:20
zebrag joined15:20
Guest98408 left15:21
madewokherd joined15:22
wawrek joined15:25
averell joined15:26
tgunr left15:26
wawrek I want to migrate projects from gitlab to github. how to move all the branches and their commits to another host?15:27
Haohmaru o_O15:27
Learath2 just push the repo to github? wawrek15:28
wawrek does it take care of branches15:28
?15:28
Learath2 `git push --all origin` should do all the branches15:28
well not origin, the new remote you add15:28
wawrek 'git push --all origin' should do15:30
thanks15:30
Lord_of_Life left15:30
rsx joined15:31
feriman joined15:33
tgunr joined15:34
shush joined15:34
Lord_of_Life joined15:34
SwiftMatt joined15:36
Longshanks joined15:36
YuGiOhJCJ left15:37
Longshanks left15:38
tiin57 left15:38
Longshanks joined15:38
ivanc left15:39
shush left15:39
tgunr left15:40
Longshanks Hi all15:40
gitinfo Longshanks: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.15:40
sweatsuit joined15:42
tiin57 joined15:42
thiago joined15:42
adl_ left15:42
adl_ joined15:43
tgunr joined15:43
angus left15:43
rosco_y joined15:44
theorangeone left15:46
theorangeone joined15:46
Newami joined15:50
tgunr left15:51
ccrr10__ joined15:51
Newami left15:53
mrkx joined15:53
tgunr joined15:54
ccrr10_ left15:54
clime joined15:54
adl_ left15:56
chele left15:56
Longshanks left15:57
wawrek left15:57
wawrek joined15:57
adlternative joined15:58
kenwoodfox_ joined15:58
kenwoodfox left15:58
tgunr left15:59
wawrek left16:07
tiin57 left16:08
wawrek joined16:08
akiva joined16:09
thiago left16:11
tiin57 joined16:11
cisco87 joined16:12
thiago joined16:13
tgunr joined16:14
wawrek left16:15
wawrek joined16:15
venmx joined16:16
luke-jr left16:20
zebrag left16:20
zebrag joined16:20
venmx left16:20
luke-jr joined16:20
milkt left16:23
tgunr left16:24
milkt joined16:24
shush joined16:26
Guest33533 left16:26
OnkelBlade left16:28
karstensrage joined16:29
zsoc joined16:31
zsoc left16:31
zsoc joined16:31
k3yp joined16:33
Maxattax joined16:37
rsx left16:37
wawrek left16:38
tiin57 left16:38
mowotter joined16:38
mozgalom left16:40
tgunr joined16:40
__that__ left16:41
jl4 joined16:41
tiin57 joined16:41
mindCrime_ joined16:42
hnOsmium0001 joined16:42
nvmd joined16:43
CoolerX joined16:44
CoolerX Hi16:44
How do you annotate16:44
git attributes?16:44
imMute CoolerX: https://git-scm.com/docs/gitattributes16:45
CoolerX yeah16:45
there was some way to ignore a file when showing diff16:45
I think it was like binary?16:45
tarkus joined16:45
fastfresh left16:45
CoolerX ?16:46
/path/to/file diff set binary16:46
something like that?16:46
imMute CoolerX: https://git-scm.com/docs/gitattributes#_marking_files_as_binary16:46
CoolerX in .gitattributes16:46
shabius left16:47
royal_screwup21 joined16:48
CoolerX is this it? https://github.com/kubernetes/kubernetes/blob/master/.gitattributes#L416:48
rfuentess left16:51
royal_screwup21 left16:52
CoolerX anyone?16:53
andi_ what's the difference between a fork and a new repo with a git pull remote/old-repo/master e.g?16:54
imMute CoolerX: did you read the link I posted?16:54
CoolerX imMute, yeah but what about the link I posted?16:54
the linguist-generated16:55
Lord_of_Life_ joined16:55
osse andi_: none16:55
imMute CoolerX: never seen that before. sounds like something custom.16:55
andi_ osse: so probably a fork is just a git pull on all the existing branches from the old repo?16:55
Lord_of_Life left16:56
arcatech joined16:56
osse maybe the github web site doesn't say "osse/coolproject is a fork of andi_/coolproject"16:56
andi_: it's a clone that's pushed somewhere else16:56
CoolerX https://github.com/github/linguist#generated-code16:56
Lord_of_Life_Lord_of_Life16:56
CoolerX it's custom for github16:56
andi_ osse: yeah switching namespaces. alright nice that's great16:56
CoolerX osse, you can see all the forks of a repo16:58
so if you do the pull thing then it probably won't list it as a fork16:58
also github allows you to compare across forks while starting a pull request16:58
andi_ CoolerX: yeah but that doesn't matter to git and is just a github/gitlab/whatever feature16:58
CoolerX actually does github even allow PRs from non fork repos?16:59
andi_, usually when talking about forks you mean some hosted service like github, gitlab, bitbucket, etc16:59
durham joined17:00
andi_ yeah :)17:00
orbyt_ joined17:00
andi_ what made me curious was that there's no git fork command17:00
so git must do something under the hood17:01
imMute andi_: it's called "clone"17:01
or rather, what would a "git fork" command do that a "git clone" command doesn't?17:01
andi_ is it a clone and then switching the remote?17:01
tarkus left17:01
andi_ or is it git pull into an empty directory17:02
or repo17:02
imMute andi_: "git clone" sets up a new repo with a remote called "origin" that points at the original repo.17:02
andi_ yes17:02
CoolerX osse, what bad things can happen if I mark a code file as binary?17:03
using https://git-scm.com/docs/gitattributes#_marking_files_as_binary17:03
osse git diff won't show it by default17:03
rwdrich left17:03
rumbler31_ joined17:04
andi_ CoolerX: i think that the CRLF/LF is also disabled17:04
durham left17:04
osse hmm probably17:04
CoolerX osse, well the git diff treating it as binary is what I want17:05
what do you mean won't show it?17:05
durham joined17:05
CoolerX it should say binary file changed17:05
osse that's what I meant17:05
CoolerX andi_, oh noes17:05
that's bad17:05
osse it won't show a patch17:05
CoolerX the file is a generated file17:05
we are embedding some binary data in the code17:06
it's a golang file btw17:06
osse maybe you just want -diff17:06
CoolerX path/to/file -diff17:06
imMute CoolerX: why are you checking in generated files to the repo?17:06
sier81 left17:06
CoolerX what about the CRLF/LF problem?17:06
osse that's why I suggest -diff instead of binary17:07
imMute andi_: what's this about CRLF/LF problem?17:07
CoolerX imMute, lots of people do that17:07
for various reasons17:07
rwdrich joined17:07
imMute CoolerX: doesn't mean it's not a bad idea...17:07
CoolerX mostly it saves the trouble of regenerating the files17:07
for anyone who clones the repo17:08
rwdrich left17:08
osse lemme guess: protobuf?17:08
tiin57 left17:08
CoolerX it especially sucks to regenerate on every build17:08
sier81 joined17:08
andi_ imMute: well as far as i know git takes care (auto) of crlf/lf17:08
imMute andi_: oh that. that's only if you turn it on (I explicitly turn it off everywhere)17:08
andi_ imMute: isn't it as default set to "auto"17:09
CoolerX osse, so -diff won't mark it as binary then?17:09
osse correct17:09
imMute andi_: dunno. the docs don't say.17:09
osse it will just produce a diff as if it were binary17:10
kes left17:10
CoolerX nice17:10
osse you can even create your own diff if you want17:11
andi_ imMute: i'm not sure either, what i do know is that the CRLF/LF is off (which makes sense) for binary files17:11
osse andi_, imMute: by default git falls back to the core.autocrlf setting17:11
tiin57 joined17:11
imMute osse: yeah, what's the default for that setting?17:11
osse I have no clue :P17:12
andi_ i think "true"17:12
but i'm not sure about it17:12
osse I would guess it's true on windows and false otherwise17:12
bolovanos__ joined17:14
mindCrime_ left17:16
rcoote left17:17
hololeap joined17:17
bolovanos_ left17:18
Betal joined17:18
tarkus joined17:18
zebrag left17:20
zebrag joined17:20
mrkx left17:21
dimi1947 joined17:21
ADG1089__ left17:24
ADG1089__ joined17:24
kenwoodfox_ left17:26
kenwoodfox joined17:26
jaziz left17:27
dionysus69 left17:27
dionysus69 joined17:28
heyitsrama joined17:30
dionysus69 left17:30
sier81 left17:30
dionysus69 joined17:31
calcul0n__ left17:34
calcul0n joined17:35
APic joined17:36
tiin57 left17:38
faisal joined17:38
austin987 left17:41
Haohmaru left17:41
onizu left17:41
gast0n left17:42
tiin57 joined17:42
orbyt_ left17:44
clime left17:46
tmm88 left17:47
flex14 joined17:48
kjartan_ left17:53
austin987 joined17:54
klonn left17:54
sudoforge joined17:54
dimi1947 left17:55
tgunr left17:56
TomyWork left17:57
g00s joined17:58
tonythomas left18:01
CoolerX left18:02
kjartan joined18:02
zulutango left18:03
zulutango joined18:04
tgunr joined18:04
dqx_ left18:05
RandomGuy90 left18:10
tiin57 left18:11
blahboybaz joined18:13
RandomGuy90 joined18:13
tiin57 joined18:13
clime joined18:14
tgunr left18:14
venmx joined18:16
dqx_ joined18:16
Blukunfando joined18:17
BSaboia joined18:18
g00s left18:18
jl4 left18:18
blahboybaz left18:19
klonn joined18:19
theoceaniscool joined18:19
wootehfoot joined18:20
zebrag left18:20
zebrag joined18:20
venmx left18:21
pedahzur joined18:22
royal_screwup21 joined18:23
tgunr joined18:25
orbyt_v7 joined18:27
orbyt_ joined18:27
mozgalom joined18:28
blahboybaz joined18:30
fmlatghor joined18:31
klonn left18:33
klonn joined18:33
arcatech left18:33
HumanG33k left18:34
arcatech joined18:36
ccrr10__ left18:36
flex14 left18:37
tiin57 left18:38
Wetmelon joined18:41
tiin57 joined18:45
howdoi joined18:46
hendry left18:47
luke-jr left18:47
p-core left18:48
luke-jr joined18:48
hendry joined18:48
p-core joined18:48
crose_ left18:48
worc3131 left18:50
Technodrome left18:51
j`ey joined18:53
j`ey with git format-patch, it produces a file with a Subject: line, it has split that over 2 lines, but will it be sent with the full thing as the subject?18:54
dob1 left18:55
jstein joined18:57
Guest20 left18:58
tgunr left19:03
dob1 joined19:03
DarthRadar left19:05
tgunr joined19:06
tiin57 left19:08
tiin57 joined19:12
skered joined19:15
DonRichie left19:17
Technodrome joined19:19
daysun left19:23
shored left19:23
royal_screwup21 left19:26
royal_screwup21 joined19:26
shored joined19:26
nomadicmathmo left19:27
vorona joined19:30
royal_screwup21 left19:31
DonRichie joined19:32
dextercd joined19:36
tiin57 left19:38
osse j`ey: https://serverfault.com/a/51223519:38
I suppose that's what's happening19:38
tiin57 joined19:42
fmlatghor left19:42
blahboybaz left19:42
g00s joined19:43
mozgalom left19:43
tarkus left19:43
blahboybaz joined19:43
royal_screwup21 joined19:43
bkuhlmann joined19:44
tgunr left19:44
j`ey osse: ill just test email it to myselfi guess19:45
axisys joined19:47
bkuhlmann left19:50
osse did it work?19:52
vorona left19:52
LordRyanryab19:53
bogartjack joined19:53
CC joined19:53
j`ey osse: I havent tried yet, had to eat dinner :P19:54
CCGuest937219:54
Guest9372 left19:56
jnavila joined19:57
nedbat joined19:58
nedbat left19:58
nedbat joined19:58
tgunr joined19:59
osse the wrapping is hard-coded into format-patch20:01
nedbat left20:01
nedbat joined20:02
nedbat left20:02
nedbat joined20:02
AnAverageHuman left20:03
tgunr left20:03
tiin57 left20:08
AnAverageHuman joined20:08
Mmike left20:10
Mmike joined20:10
energizer left20:11
tiin57 joined20:11
k3yp left20:12
k3yp joined20:12
g00s left20:13
HYWTYD joined20:13
shokohsc left20:15
parsnipuser-agent-nokia20:16
kjartan left20:17
venmx joined20:17
knobi left20:17
kjartan_ joined20:17
kjartan_ left20:19
kjartan joined20:19
zebrag left20:20
nomadicmathmo joined20:20
zebrag joined20:20
venmx left20:22
austin987 left20:26
HYWTYD I'm trying to do a conversion from SVN and it's starting to drive me insane. We have branches that were only partial copies of trunk. After the git conversion, I'm trying to graph those branches back on to main, since they all just have root commits. I managed to do this successfully once, and then I wrote a script for it, but my script didn't work20:28
and now I can't get it to work anymore. I'm doing the following, which is what I thought I did when it worked, but it doesn't seem to be working anymore.20:28
git replace --graft <hashOfFirstCommitInTheBranch> <hashOfCommitWhereWasOriginallyBranchedFromTrunk>20:28
git filter-repo --force20:28
otisolsen70_ joined20:28
user-agent-nokiaparsnip20:30
milkt_ joined20:31
otisolsen70 left20:31
milkt left20:33
clime left20:35
Wetmelon left20:35
andy25225 left20:37
tiin57 left20:38
cyphase left20:40
tiin57 joined20:42
mindCrime_ joined20:43
andy25225 joined20:49
Azrael_- joined20:49
Azrael_- hi20:49
kjartan left20:50
sord937 left20:52
mindCrime_ left20:52
Pickchea left20:52
BSaboia left20:53
BSaboia joined20:54
bogartjack left20:55
diverger left20:55
g00s joined20:55
Maxattax left20:55
Azrael_- i need some help managing the source base i'm currently using. i checked out an oss and modified it. now i've got lots of changes and am in the detached head state. from the master i now created a new branch and want to commit my changes to it. in order to do this, do i have to rebase to this branch or what would be the right way?20:57
brunosaboia_ joined21:00
cyphase joined21:00
BSaboia left21:00
HYWTYD left21:01
HYWTYD joined21:01
tiin57 left21:08
clime joined21:08
Hello71 left21:09
dextercd Azrael_-: branches are just pointers to commits, so you most likely just want to create a branch that points to the newest commit you made. git branch <branch-name> <commit-sha> will create a branch on a particular commit, without <commit-sha> it'll default to the commit you're currently on. after that you can go onto that branch with git checkout <branch-name>21:12
tiin57 joined21:12
Hello71 joined21:17
flex14 joined21:17
flex14 left21:18
otisolsen70_ left21:22
Azrael_- ok, will try (didn't do any commits yet)21:27
feriman left21:28
dextercd ah, I misread, in that case just checkout the new branch and create your commits21:28
feriman joined21:32
brunosaboia_ left21:35
calcul0n left21:35
tiin57 left21:38
LuxuryMode joined21:38
feriman left21:38
SwiftMatt left21:38
wootehfoot left21:39
tiin57 joined21:41
faisal_ joined21:41
faisal left21:42
Wetmelon joined21:45
SwiftMatt joined21:45
faisal_ left21:47
ADG1089__ left21:48
shush left21:48
shush joined21:49
ccrr10 joined21:54
Technodrome left21:54
cyphase left21:56
g00s left21:57
Technodrome joined21:59
ketas left22:04
HYWTYD left22:06
shush left22:07
shush joined22:07
tiin57 left22:08
cyphase joined22:09
ccrr10_ joined22:09
ketas joined22:10
tiin57 joined22:12
shush left22:12
ccrr10 left22:12
energizer joined22:15
shush joined22:16
venmx joined22:18
cr4y1 left22:19
zebrag left22:20
zebrag joined22:20
cr4y1 joined22:21
orbyt_v7 left22:21
venmx left22:23
m0viefreak joined22:23
brunosaboia_ joined22:24
dionysus69 left22:25
ccrr10 joined22:28
ccrr10_ left22:28
sammyg left22:30
ccrr10 left22:33
CoolerX joined22:34
dansan_dansan22:35
tiin57 left22:38
envex left22:40
tiin57 joined22:41
CoolerX left22:42
jnavila left22:44
Sonderblade joined22:46
tgunr joined22:47
gigasu_shida joined22:48
jimklimov left22:49
arcatech left22:50
sudoforge left22:53
clime left22:55
royal_screwup21 left22:56
royal_screwup21 joined22:56
sudoforge joined22:57
klonn left22:59
royal_screwup21 left23:01
clime joined23:01
royal_screwup21 joined23:06
tiin57 left23:08
blahboybaz left23:09
rangergord left23:10
tiin57 joined23:12
arcatech joined23:12
m0viefreak left23:12
orbyt_ left23:14
rangergord joined23:16
nvmd left23:17
segnior joined23:17
sgen joined23:18
mirrorbird joined23:18
sgen left23:19
nvmd joined23:19
sgen joined23:19
sgen left23:19
tgunr left23:20
zebrag left23:20
sgen joined23:20
Raging_Hog left23:20
zebrag joined23:20
sgen left23:21
sgen joined23:21
backthen left23:23
snits left23:24
snits joined23:25
cr4y1 left23:31
bolovanos__ left23:36
nvmd left23:38
tiin57 left23:38
sz0 joined23:39
envex joined23:39
nvmd joined23:39
segnior left23:41
rangergord left23:41
tiin57 joined23:42
sgen left23:44
Xenguy joined23:45
RandomGuy90 left23:46
RandomGuy90 joined23:46
RandomGuy90 left23:47
orbyt_ joined23:47
igemnace left23:49
RandomGuy90 joined23:49
theoceaniscool left23:52
herren left23:53
rangergord joined23:55
segnior joined23:56
brunosaboia_ left23:58
Lyqyd joined23:59
RandomGuy90 left23:59

Logs Search ←Prev date Next date→ Channels Documentation