IRCloggy #git 2018-12-30

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.

2018-12-30

danielj_co left00:00
dreiss joined00:03
finalbeta left00:04
AtumT left00:05
donofrio left00:06
snowgoggles joined00:08
donofrio joined00:08
oojacoboo left00:11
oojacoboo joined00:13
armyriad joined00:15
th3m1s joined00:16
Regon left00:16
dansan_ joined00:19
donofrio left00:21
thiago left00:23
reactormonk left00:24
orbyt_ joined00:28
thiago joined00:28
iam730 joined00:29
n3wborn left00:33
thiago left00:36
TheRuckus left00:36
boombatower left00:38
dreiss left00:38
donofrio joined00:41
danielj_co joined00:51
danielj44 left00:53
im0nde joined00:55
life23 joined00:58
yyy joined00:58
donofrio left01:00
snowgoggles left01:07
mobile_c_ left01:08
thomasross_ joined01:10
thomasross left01:10
thomasross_thomasross01:10
thomasross left01:11
dreiss joined01:11
thomasross joined01:11
thomasross left01:13
yyy left01:13
thomasross joined01:13
netj left01:20
netj joined01:20
acidjnk left01:20
dreiss left01:21
shiva__ joined01:23
dege left01:31
KnoP joined01:39
th3m1s left01:40
KnoP left01:44
iam730 left01:46
plexigras left01:54
Cabanossi left01:56
Cabanossi joined01:57
cfoch left01:57
xcm left01:58
xcm joined01:58
finalbeta joined02:02
DolphinDream joined02:03
ph88 left02:03
thomasross left02:05
thomasross joined02:05
jhammons left02:06
thomasross left02:06
ph88 joined02:07
thomasross joined02:08
dviola left02:15
gxt left02:24
YuGiOhJCJ left02:26
YuGiOhJCJ joined02:27
DolphinDream left02:38
noboruma left02:41
lagothrixGuest673803:09
Guest6738 left03:09
lagothrix joined03:09
YuGiOhJCJ left03:13
YuGiOhJCJ2 joined03:13
justanotheruser joined03:14
ph88 left03:16
aw1 left03:18
mitchell left03:19
DolphinDream joined03:20
YuGiOhJCJ2 left03:29
SwiftMatt joined03:34
SwiftMatt left03:35
shiva__ left03:35
in1t3r joined03:36
heroux joined03:40
liefer left03:47
liefer joined03:47
SwiftMatt joined03:47
SwiftMatt left03:49
mat001 joined03:51
snowgoggles joined03:55
chrisml joined03:57
libertyprime joined04:04
libertyprime left04:04
libertyprime joined04:05
dreiss joined04:14
manuelschneid3r left04:27
orbyt_ left04:45
dreiss left04:45
inkbottle left04:54
Cabanoss- joined04:54
Cabanossi left04:55
Mattiaslndstrm left04:56
inkbottle joined04:56
kerframil left04:59
kerframil joined04:59
netj left05:00
netj joined05:00
pks_ joined05:02
snowgoggles left05:03
pks left05:04
pks_pks05:04
Essadon left05:04
kapil____ joined05:07
mobile_c joined05:11
dreiss joined05:17
DrillTherapy joined05:20
KeyJoo joined05:22
mowcat left05:33
Envil left05:49
shaarad joined05:58
dreiss left05:59
TrentonDAdams joined06:02
downer06 joined06:11
DolphinDream left06:16
SwiftMatt joined06:19
DolphinDream joined06:21
bneo99 left06:25
armyriad left06:26
shaarad left06:34
SwiftMatt left06:38
xcm left06:39
xcm joined06:39
DolphinDream left06:47
DolphinDream joined06:48
geekodour08 joined06:48
sourcream joined06:56
moei joined07:05
PioneerAxon_ left07:07
PioneerAxon joined07:08
sourcream left07:11
dreiss joined07:11
fatalhalt joined07:14
stitched_unicorn joined07:14
SwiftMatt joined07:17
SwiftMatt left07:17
crimastergogo joined07:22
libertyprime left07:23
crimastergogo left07:37
reactormonk joined07:37
shaarad joined07:39
danielj81 joined07:41
danielj_co left07:44
TrentonDAdams left07:45
TrentonDAdams joined07:46
strugee joined07:49
stitched_unicorn left07:56
crimastergogo joined07:58
crimastergogo left08:00
reactormonk left08:02
DolphinDream left08:03
reactormonk joined08:04
KeyJoo left08:08
cafx joined08:11
stitched_unicorn joined08:12
czart joined08:12
dreiss left08:15
dreiss joined08:16
stitched_unicorn left08:22
reactormonk left08:28
silverfall left08:29
shaarad left08:36
reactormonk joined08:40
mat001 left08:40
silverfall joined08:42
ferdna joined08:49
dansan_ left08:51
keepLearning512 joined08:53
mooasaurus left09:04
mooasaurus joined09:05
GreenJello left09:09
dreiss left09:10
geekodour08 left09:13
geekodour08 joined09:15
agowa338 joined09:16
ferdna left09:17
strugee left09:17
n3wborn joined09:18
strugee joined09:20
geekodour08 left09:20
dermoth left09:20
Goplat left09:24
kerframil left09:26
stitched_unicorn joined09:45
strugee left09:52
strugee joined09:54
stitched_unicorn left10:02
dre_ joined10:05
Milos joined10:08
plexigras joined10:12
Envil joined10:14
mbalmer joined10:15
mbalmer howdy. is this the right channel to ask questions about git problems? (git subtree split in my case)10:16
catsup left10:17
kadoban left10:17
catsup joined10:17
bremner mbalmer: this is the git user support channel, yes. You may have to be a bit patient, depending on the time of day.10:18
catsup left10:18
catsup joined10:19
mbalmer ok fine then. git version 2.20.1 on Fedora 29, x86_64. git subtree split suddenly stops counting up the first number in its output, hangs forever, seems to consume memory, then segfaults, error messages hints at process_split_commit.10:20
git fsck shown no anomalies, same thing happens when I freshly clone the repo. on macOS (git version 2.7.1) the same repo works wo issues.10:21
agowa338 left10:23
bremner have you noticed the problem in other repos?10:24
just tried 2.20 on a random repo here and split completed ok10:25
mbalmer No, only on this particular repo and only on fedora.10:26
CentOS 7 is ok, macOS is ok.10:26
(with the same repo)10:26
kapil____ left10:27
bremner CentOS probably has a different git version10:27
agowa338 joined10:28
mbalmer when I do split -d, I see tons of "Processing commit: ...", "parents: ...", "incorrect order: ..." until it segfaults10:28
CentOS 7 has 1.8.3.110:28
bremner sounds like it could be a regression in 2.20, but hard to debug if it's only that one repo10:29
mbalmer yes, indeed... otoh /usr/libexec/git-core/git-subtree is "only" a shell script.10:30
bremner if you are motivated you could try building git from source and running git-bisect on git.git10:33
mbalmer I never used git bisect, but maybe it's time to learn it. whats the url of the git repo? and, can I install a "home made" version alongside with the one from fedora?10:34
bremner https://github.com/git/git.git10:35
and sure, just install it in /usr/local. Or your homedir.10:35
mbalmer ok, cloning it.10:36
SwiftMatt joined10:37
mbalmer so the correct tags are v2.20.1 and so on? I would now first try if the last version of v2.19 has the issue and then got back to 18 etc.10:38
bremner sounds right, although I don't have a clone of git.git here10:38
mbalmer bah, how to build that biest.....?10:39
bremner I suppose there's probably README and / or INSTALL10:39
libertyprime joined10:42
mbalmer there is... building it now.10:42
bremner hopefully you can run it from the build dir, not sure, but that would make debugging faster10:45
hussam joined10:47
mbalmer for now it says: git: 'subtree' is not a git command. See 'git --help'.10:47
git-subtree seems not to be part of git proper...10:49
SwiftMatt left10:50
jpf137 joined10:51
yyy joined10:53
bremner yeah, look in contrib/subtree10:53
agowa338 left10:56
mbalmer so it's a regression. git-subtree from v2.19.2 works.11:00
bremner !list11:00
gitinfo [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git11:00
bremner you can report the regression ^. If you can share the data that will increase the chance of someone fixing it.11:01
mbalmer v2.20.0 shows the bug11:01
bremner you can also run git bisect to find the exact commit that broke things for you11:01
dre_ left11:01
bremner e.g. git bisect good v2.19.211:02
mbalmer I think I alread found it.11:03
kapil____ joined11:05
mbalmer yep. found it. reverting 315a84f9aa0e2e629b0680068646b0032518ebed seems to fix it (actually reverted the last three commits)11:06
AtumT joined11:14
arch-1980 joined11:15
[Brain] joined11:16
dolphy joined11:17
Madmanden joined11:27
netj left11:32
netj joined11:33
Fernando-Basso joined11:38
dpyro left12:02
Regon joined12:05
KeyJoo joined12:08
RoriconKnight joined12:11
CodeSlingerPaul joined12:12
RoriconKnight left12:14
SwiftMatt joined12:16
noboruma joined12:18
RoriconKnight joined12:19
SwiftMatt left12:19
SwiftMatt joined12:25
RoriconKnight left12:25
yyy left12:27
SwiftMatt left12:27
stitched_unicorn joined12:35
liefer left12:45
strugee left12:46
liefer joined12:46
liefer left12:49
liefer joined12:49
strugee joined12:49
liefer left12:55
liefer joined12:56
liefer left12:59
CodeSlingerPaul left13:03
liefer joined13:04
liefer left13:07
Noti joined13:08
arch-1980 left13:08
liefer joined13:09
SwiftMatt joined13:16
dolphy left13:18
SwiftMatt left13:19
yyy joined13:19
gitinfo joined13:20
ChanServ set mode: +o13:20
YuGiOhJCJ joined13:28
manuelschneid3r joined13:29
Noti left13:38
Regon left13:44
YuGiOhJCJ left13:51
xcm left13:54
xcm joined13:54
xcm left13:55
xcm joined13:56
Fusl left14:03
YuGiOhJCJ joined14:03
Fusl joined14:03
n3wborn left14:04
inkbottle left14:06
Essadon joined14:06
inkbottle joined14:07
Essadon left14:08
Essadon joined14:08
bebbet joined14:11
czart left14:11
Madmanden left14:14
shaarad joined14:23
mintux joined14:24
mintux my last commit is not master . how can i put master lable on last commit? http://upload.ericomgroup.com/uploads/47130.jpeg14:24
_kk22kk_ joined14:26
_ikke_ mintux: In this case, git merge master should work14:30
mat001 joined14:38
sauvin left14:44
ph88 joined14:46
reactormonk left14:46
mobile_c_ joined14:46
mobile_c left14:48
fahadash joined14:49
Regon joined14:50
czart joined14:56
jim can I get a hash to one of my commits, then get the next commit that happened?14:56
czart left14:56
_ikke_ jim: You can easily get the previous commit, but not the next one15:02
jim that's what I was afraid of15:02
so the only real way to do that is have a program get the whole list of commits and put them in an array or something like that15:05
furrymcgee a branch15:05
jim that's kinda what I was thinking, only something that I can move either way with15:06
this gitkraken thing, it's closed-source?15:06
_ikke_ yes15:08
jim anything close that's open15:08
??15:08
-?15:09
Copenhagen_Bram left15:10
shaarad left15:10
sauvin joined15:17
gxt joined15:17
reactormonk joined15:17
yohnnyjoe joined15:26
Copenhagen_Bram joined15:30
_ikke_ git cola perhaps15:31
jpf137 left15:33
kapil____ left15:35
jim I'll look at that15:37
thiago joined15:39
liefer left15:45
liefer joined15:45
mintux _ikke_: if i don't want mereg and i want the current coomit be master15:46
davidfetter joined15:46
Mattiaslndstrm joined15:46
_ikke_ mintux: git merge should fast-forward, so no merge commit is created15:47
mintux _ikke_: i did your command and some files from master commit add to this commit and make conflict15:48
i mean: git merge master15:48
i just want master lable come to current commit15:48
strugee left15:49
skered joined15:50
oojacoboo left15:54
strugee joined15:54
thiago left16:02
Copenhagen_Bram left16:03
mowcat joined16:04
KeyJoo left16:07
Mattiaslndstrm left16:08
edman007 joined16:10
skered left16:11
_kk22kk_ left16:14
edman007 Hi, so I'm trying to figure out how to do this right, I have a (rather large) kernel patch from an old kernel, and I want to port it to a newer kernel, so I got the mainline stable git repository and I applied to patch into a new branch against the original, old kernel (3.4.113, I applied it against the commit tagged v3.4.113), anyways, I want to see if I can merge in all the changes after 3.4.113 on top of my patched branch, but I seem16:14
to be getting conflicts doing this that are unrelated to my patch, how do I merge in these changes with git?16:14
yohnnyjoe left16:17
Copenhagen_Bram joined16:17
czart joined16:19
jottr joined16:20
skered joined16:21
jim hmm. git cola doesn't seem to do anything when I try to open the repo16:24
dreiss joined16:30
jim yeah, git cola shows a window and the file->open command displays a file view (of my home dir, not the dir I'm cd-ed to), and, I navigate to projects, and it doesn't display anything16:30
tarkus joined16:32
tarkus left16:33
jim err, ...navigate to projects, and I select one I know is under git, and it doesn't display anythying16:33
sometimes I get: KSambaShare: Could not find smb.conf!, but I don't have any samba running16:34
dfee joined16:41
marataziat joined16:45
jottr left16:50
dpyro joined16:56
TJ- joined16:59
dfaught joined17:00
iam730 joined17:00
dfaught left17:01
dfaught joined17:02
jottr joined17:03
dfaught left17:04
tarkus joined17:04
yyy- joined17:04
dfaught joined17:04
Essadon left17:06
yyy left17:06
jottr left17:08
yyy- left17:09
yyy joined17:10
Essadon joined17:12
cbrt64 left17:12
Essadon left17:12
Essadon joined17:13
cbrt64 joined17:13
Geminizer joined17:14
cbrt64 left17:19
strugee left17:21
jottr joined17:22
armyriad joined17:24
cbrt64 joined17:26
jottr left17:27
strugee joined17:27
dfee left17:34
dreiss left17:34
khisanth_Khisanth17:35
Anthaas left17:37
Anthaas joined17:37
mintux left17:38
Mattiaslndstrm joined17:39
YuGiOhJCJ left17:39
dpyro left17:44
estodiMania joined17:49
dpyro joined17:52
jottr joined17:58
orbyt_ joined18:00
dege joined18:00
tarkus left18:00
GreenJello joined18:01
jottr left18:09
iam730 left18:10
Phylock joined18:11
iam730 joined18:13
blackmesa joined18:18
kadoban joined18:23
iam730 left18:27
leeN joined18:28
Geminizer left18:30
mingdao I don't want someone to hold my hand, but I would like a suggested reference.18:32
I want to setup my own git repo for storing files.18:32
Preferably on my own domain; if git is available for me to install there.18:32
bremner I guess this is discussed in !book18:32
gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable18:32
bremner well, some of the the generic sysadmin stuff will not be there.18:33
mingdao If not, I can set it up on my LAN. I have 4 spare public IPs and intend to put another server online using one of them soon.18:33
bremner I don't understand the question "Preferably on my own domain; if git is available for me to18:34
install there."18:34
You'd have to get some kind of (virtual) server and install git on it.18:34
probably a linux server unless you are a masochist.18:35
mingdao I only use Linux.18:35
I have a domain hosted at 1and1.com18:35
But the command `git` is not available there.18:35
regiontog joined18:36
mingdao I would like to store the repo on that domain ( http://www.happypenguincomputers.com/)18:36
But maybe I can't, so I can just store in on a server here on my LAN.18:36
bremner that's a question you'd have sort out with whoever provides the hosting18:37
ferdna joined18:39
Goplat joined18:40
nowhere_man left18:41
cbrt64 left18:45
czart left18:47
cbrt64 joined18:47
mingdao Looking in the online stuff it states "No, Git is pre-installed in the Web Hosting already. You can use Git immediately."18:49
And To use Git, you need a Web Hosting Linux package. Git is not available on Web HostingWindows packages.18:49
Which I do.18:49
So, off to learning for me.18:49
estodiMania left18:49
mostlybadfly joined18:51
Makaveli7 joined18:53
Makaveli7 left18:54
marataziat left18:55
Khisanth left19:02
jstimm joined19:07
nowhere_man joined19:14
Khisanth joined19:16
Narrat joined19:17
sauvin left19:19
sauvin joined19:20
nowhere_man left19:26
shicks2525 joined19:27
jottr joined19:30
orbyt_ left19:32
nowhere_man joined19:33
jayjo joined19:34
jayjo I have a git repo on my workstation in my small home network... how do I run a daemon on my workstation so I can push/pull from my laptop on the same network?19:34
Do I need to treat it as a full server? Do the --bare from the working git repo etc ?19:35
nowhere_man left19:35
jottr left19:36
nowhere_man joined19:36
nowhere_man left19:41
troyt joined19:42
discopatrick joined19:46
keepLearning512 left19:46
strugee left19:47
keepLearning512 joined19:47
strugee joined19:47
ph88 left19:49
libertyprime left19:50
keepLearning512 left19:52
ph88 joined19:52
noboruma left19:53
troyt left19:53
mobile_c_mobile_c20:00
libertyprime joined20:06
jottr joined20:08
nowhere_man joined20:10
jottr left20:12
ijash joined20:15
Fernando-Basso left20:16
nowhere_man left20:17
sanscoeur joined20:21
AtumT_ joined20:25
orbyt_ joined20:25
stitched_unicorn left20:26
egc joined20:26
ph88 left20:28
AtumT left20:28
ph88 joined20:28
troyt joined20:30
thebope left20:32
AtumT joined20:39
jottr joined20:39
AtumT_ left20:39
Makaveli7 joined20:40
nowhere_man joined20:42
jottr left20:44
sanscoeur left20:44
grawity jayjo: yes20:44
the transport can be just regular SSH, for simplicity20:45
fstd_ joined20:46
grawity there's an option to allow pushes into the working tree (receive.denyCurrentBranch=updateInstead), but imho, if you want a central server, then make it a --bare repo20:46
gitinfo left20:47
jsatk joined20:47
Makaveli7 left20:47
nowhere_man left20:49
ijash left20:49
fstd left20:49
fstd_fstd20:49
gitinfo joined20:51
ChanServ set mode: +o20:51
translucentCode left21:02
spacesuitdiver joined21:05
noboruma joined21:10
diogenese left21:13
diogenese joined21:13
jottr joined21:15
nowhere_man joined21:17
jottr left21:19
jottr joined21:20
mostlybadfly left21:21
thebope joined21:31
Phylock left21:31
strugee left21:32
lucasb joined21:32
irc_viewer_test joined21:36
strugee joined21:36
Mattiaslndstrm left21:36
cafxraindrop21:38
supernovah joined21:39
rewt joined21:42
irc_viewer_test left21:44
netj left21:47
netj joined21:47
rewt left21:49
rewt`` joined21:49
rewt``rewt21:50
libertyprime left21:53
shabius left21:54
hahuang65 joined21:54
shabius joined21:54
settermjd joined21:54
discopatrick left21:55
settermjd left21:56
adfeno joined21:56
adfeno Hi there21:57
Cabanoss- left21:57
Cabanossi joined21:57
rewt left21:58
adfeno `git format-patch HEAD~1` is including some base64-encoded data for files that are actually removed in HEAD (they were removed using `git rm` and the commit with such information was made)21:58
thebope left21:59
adfeno Is that base64 inclusion normal for git format-patch? I expected it to just say that it had zero size or was removed.21:59
thebope joined21:59
osse adfeno: Not really sure, but my intuition says yes. Otherwise it could potentially remove a completely different version of the file22:00
adfeno Oh... so there goes my attempt to send the patch by email without having to subscribe to GitHub22:03
thebope_ joined22:03
adfeno Actually, no I still have another way :D22:03
thebope left22:03
grawity joined22:04
rewt joined22:05
Anthaas left22:06
heroux left22:07
heroux joined22:08
Anthaas joined22:10
arminhajrovic joined22:11
arminhajrovic left22:13
ProbabilityMoon joined22:16
arminhajrovic joined22:21
shabius left22:22
adfeno Are information regarding remotes saved/pushed to the repository host for other contributors to get those when getting updates through clone/pull ?22:25
arminhajrovic left22:27
ketas- joined22:27
shabius joined22:27
Mattiaslndstrm joined22:30
adfeno For example, if I add a remote such as "upstream", push to my project which already has an origin, will people, when cloning my project, automatically get the "upstream" remote added?22:31
grawity adfeno: no22:37
adfeno Oh, OK, I see22:38
blackmesa1 joined22:38
dfee joined22:38
blackmesa left22:39
adfeno grawity: is there a way to make Git do that?22:39
grawity also no22:39
adfeno Hm, OK22:39
Thanks for the information22:39
grawity you can include a shellscript and tell people to run it – there's nothing in a repository that could automatically affect clones' configuration22:40
adfeno Hm, I see, thanks :D22:40
plexigras is there something like `git add --patch` but instead of hunks i get to choose which files to add?22:42
_ikke_ plexigras: git add -i22:43
blackmesa1 left22:43
_ikke_ plexigras: git add -p is basically a subset of git add -i (--interactive)22:43
plexigras thanks i will take a look at that22:43
venmx joined22:44
plexigras any other cool alternatives to go about doing these kinds of things?22:45
ProbabilityMoon left22:46
ProbabilityMoon joined22:46
Mattiaslndstrm left22:49
dansan_ joined22:51
nowhere_man left22:51
dviola joined22:51
ProbabilityMoon left22:52
rewt left22:54
rewt`` joined22:54
rewt``rewt22:55
inkbottle left22:56
arminhajrovic joined22:57
arminhajrovic left22:59
arminhajrovic joined23:00
arminhajrovic left23:01
arminhajrovic joined23:01
TJ- left23:03
strugee left23:06
strugee joined23:10
noboruma left23:10
nowhere_man joined23:12
arminhajrovic left23:12
arminhajrovic joined23:13
arminhajrovic left23:14
arminhajrovic joined23:15
boombatower joined23:15
yohnnyjoe joined23:19
tomfarr joined23:19
xcm left23:24
arminhajrovic left23:24
adfeno left23:24
atrus joined23:25
Envil left23:25
libertyprime joined23:26
arminhajrovic joined23:26
xcm joined23:26
ProbabilityMoon joined23:28
Makaveli7 joined23:28
spacesuitdiver left23:28
nowhere_man left23:29
arminhajrovic left23:29
arminhajrovic joined23:29
diogenese left23:31
ferdna left23:33
Narrat left23:33
Makaveli7 left23:34
xcm left23:34
thebope_ left23:35
thebope joined23:36
xcm joined23:38
thebope left23:40
diogenese joined23:41
arminhajrovic left23:41
lucasb left23:42
kfoonamalik joined23:43
rewt left23:44
rewt`` joined23:44
rewt``rewt23:44
reactormonk left23:51
q6AA4FD joined23:52
nowhere_man joined23:53
reactormonk joined23:57
rewt left23:57
rewt`` joined23:58
rewt``rewt23:58

Logs Search ←Prev date Next date→ Channels Documentation