IRCloggy #git 2019-08-18

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.

2019-08-18

← Crocodillian left00:00
→ Crocodillian joined00:00
← de-facto left00:01
→ de-facto joined00:01
← greatgatsby left00:02
← lacrymology left00:06
→ lacrymology joined00:07
← moo left00:13
← fphilipe_ left00:25
→ ElFerna joined00:32
← mowcat left00:37
← jubal left00:38
qpdb → Guest4065000:39
→ qpdb joined00:39
→ nly joined00:39
→ _ADN_ joined00:39
← atrigent left00:39
← ElFerna left00:39
← Guest40650 left00:41
← randomdude999 left00:47
→ ElFerna joined00:49
← nly left00:49
← thiago left00:50
→ fphilipe_ joined00:56
← _ADN_ left00:57
→ atrigent joined01:08
← courrier left01:10
← ryantrinkle left01:14
→ libertyprime joined01:17
← tufteddeer left01:27
→ tufteddeer joined01:28
→ ryantrinkle joined01:30
← tufteddeer left01:32
← fphilipe_ left01:32
← F0rTex left01:36
→ F0rTex joined01:37
← queip left01:43
→ tufteddeer joined01:44
rafasc _ikke_: are you around?01:46
yesterday you mentioned that rm file; git restore file would not work. Are you sure about that?01:48
Just tried and it seemed to work, maybe I misunderstood?01:48
← yyy left01:48
Hello71 um... if git restore doesn't do that then it's named very badly01:49
→ kerframil joined01:49
← CryptoDavid left01:49
rafasc maybe his info was outdated.01:50
themill (if you don't have a new enough git then it won't work)01:50
rafasc if you don't have a new enough git you won't have restore at all, given it was added on recent 2.2301:51
→ dansan_ joined01:54
themill indeed01:54
← dansan left01:54
← AtumT left01:56
→ n000g joined01:57
rafasc I think I like the two new commands.01:58
switch --orphan is really nice for those dealing with orphan branches. Farewell `git read-tree --empty`01:59
← surfist left02:00
→ surfist joined02:00
→ queip joined02:01
← fructose left02:03
← n3wborn left02:04
→ fphilipe_ joined02:07
← ElFerna left02:08
← n000g left02:11
→ fructose joined02:12
→ beastDiv_ joined02:26
← Cabanossi left02:30
→ Cabanossi joined02:34
dansan_ → dansan02:38
← random_yanek left02:39
→ R2robot joined02:40
← fphilipe_ left02:42
← oatmealraisin left02:45
← R2robot left02:45
→ R2robot joined02:46
→ random_yanek joined02:47
lagothrix → Guest5198002:47
← Guest51980 left02:47
→ lagothrix joined02:47
← libertyprime left02:50
← R2robot left02:51
→ JeffH joined03:09
→ R2robot joined03:13
→ fphilipe_ joined03:15
← Wetmelon left03:17
← JeffH left03:27
← isan left03:32
→ libertyprime joined03:32
← diogenese left03:37
← libertyprime left03:37
← dopie left03:43
← fphilipe_ left03:51
justanotheruser → justanotherchad03:51
← freeman42y left03:52
← beastDiv_ left03:56
← smccarthy left03:59
→ _xor joined04:03
← dviola left04:04
← kiki_lamb left04:08
→ beastDiv_ joined04:12
→ Dirak joined04:13
← deltam_ left04:18
Oleg_ if I don't know which files/directories were altered/removed, I can simply type git checkout master -- * ?04:20
with the * sign at the end?04:20
→ omnireq joined04:20
→ kiki_lamb joined04:21
Oleg_ okay, it didn't work04:24
→ deltam_ joined04:25
← Karyon left04:26
→ fphilipe_ joined04:27
Oleg_ maybe git reset --hard HEAD will work04:27
→ freeman42x joined04:27
rafasc Oleg_: do you want to discard changes?04:29
Oleg_ I want to ignore my own changes04:29
rafasc then reset --hard; should work.04:29
→ Karyon joined04:30
← batrick left04:33
→ batrick joined04:35
← netj left04:43
→ netj joined04:48
← beastDiv_ left04:56
← Dirak left05:00
→ pks_ joined05:02
← pks left05:03
pks_ → pks05:03
← fphilipe_ left05:05
← yonder left05:06
← netj left05:10
→ diogenese joined05:13
→ netj joined05:17
← netj left05:20
→ Dirak joined05:21
→ thiago joined05:25
→ beastDiv_ joined05:26
→ Phylock joined05:26
→ jubal joined05:33
→ fphilipe_ joined05:33
← thiago left05:35
→ libertyprime joined05:35
← scottj left05:40
← libertyprime left05:42
← orbyt_ left05:53
← xcm left06:00
→ g00s joined06:00
→ xcm joined06:00
→ pyfgcr joined06:05
← pyfgcr left06:07
← fphilipe_ left06:10
→ malina joined06:11
← atrigent left06:11
→ n3wborn joined06:12
→ fphilipe_ joined06:15
← malina left06:27
← nullniverse left06:32
→ malina joined06:33
← Dirak left06:39
← tufteddeer left06:53
→ tufteddeer joined06:55
← kezimo left06:55
← cd left06:55
← Milos left06:58
← tufteddeer left07:00
→ kezimo joined07:01
← Goplat left07:02
← g00s left07:02
→ tufteddeer joined07:03
→ Milos joined07:06
→ igemnace joined07:06
→ dartmouthed joined07:15
→ g00s joined07:16
← fphilipe_ left07:19
← igemnace left07:24
← Nickeeh_ left07:25
← rkta left07:25
→ rkta joined07:26
→ Nickeeh joined07:26
→ igemnace joined07:28
→ howdoi joined07:29
← mojisun left07:29
→ mojisun joined07:30
_ikke_ rafasc: It would not restore any uncomitted changes07:33
→ alfredb joined07:34
← justanotherchad left07:34
→ locrian9 joined07:36
rafasc ah... well... no miracles. You would need something like a hook that added the changes to an index on file modification or something.07:36
→ cdown joined07:43
→ locrian9_ joined07:47
→ Mattiaslndstrm joined07:47
← locrian9 left07:48
→ liberiga joined07:50
→ veegee_ joined07:51
← veegee left07:52
→ TomTom joined07:59
← cdown left08:03
→ bluesmonk joined08:14
→ Dirak joined08:14
← Mattiaslndstrm left08:19
→ Mattiaslndstrm joined08:25
← causa_sui left08:28
← Dirak left08:29
→ feriman joined08:30
← liberiga left08:33
→ mase-tech joined08:37
← alfredb left08:38
← kerframil left08:39
→ plexigras joined08:42
→ wildermind joined08:47
← igemnace left08:56
→ fstd joined08:56
→ causa_sui joined08:56
← rafasc left09:01
← beastDiv_ left09:01
← is_null left09:03
→ _ADN_ joined09:06
← g00s left09:08
→ fphilipe_ joined09:08
→ Bobguy joined09:10
← Bobdude left09:12
→ beastDiv_ joined09:12
← fphilipe_ left09:14
← Mattiaslndstrm left09:19
← zamba left09:20
→ zamba joined09:22
← locrian9_ left09:26
→ Cork joined09:27
→ fphilipe_ joined09:42
→ randomdude999 joined09:45
deltam_ → deltam09:48
→ lalilulelo joined09:50
← queip left09:52
→ xelxebar_ joined09:56
← xelxebar left09:56
→ justanotheruser joined09:56
→ queip joined09:59
← catsup left10:02
→ catsup joined10:03
→ hcit joined10:07
→ Lucas_Gray joined10:10
← fphilipe_ left10:17
← Bobguy left10:19
← queip left10:24
→ courrier joined10:28
← randomdude999 left10:31
→ randomdude999 joined10:32
→ queip joined10:37
→ Bobguy joined10:39
← Nokurn left10:42
→ Nokurn joined10:43
→ learningc joined10:44
← Bobguy left10:54
← queip left10:55
→ Anticom joined10:57
→ craigo joined11:00
→ greatgatsby joined11:06
← Lucas_Gray left11:07
← feriman left11:10
→ queip joined11:13
→ tombusby joined11:13
→ tiggster79 joined11:14
← lacrymology left11:22
→ lacrymology joined11:22
← gxt left11:23
← queip left11:25
← plexigras left11:28
← beastDiv_ left11:29
→ hays_ joined11:30
← hays left11:31
← wildlander left11:33
← lacrymology left11:33
← wildermind left11:35
→ plexigras joined11:43
→ Lucas_Gray joined11:44
→ queip joined11:45
→ beastDiv_ joined11:48
← Anticom left11:51
← bertschneider__ left11:54
← plexigras left11:55
← courrier left11:55
→ jtmusky joined12:00
← causa_sui left12:02
← jtmusky__ left12:03
← bluesmonk left12:10
→ bluesmonk joined12:11
← vishal left12:12
→ zaherdirkey joined12:12
← bachler left12:12
← hqdruxn08 left12:12
→ fphilipe_ joined12:13
→ czart joined12:13
→ bachler joined12:13
zaherdirkey is there authenticated server for git, not http or ssh can use it?, i wont to open ssh port (22) to public12:14
← Lucas_Gray left12:14
→ vishal joined12:14
→ hqdruxn08 joined12:16
bremner zaherdirkey: afaik, https and ssh are the two options. You can run ssh on a different port if you want (although I'm not sure that provides much real security)12:16
zaherdirkey yes for security i wont to make ssh public, i will fall into https, but that force me to install webserver12:17
bremner I doubt very much that installing a web server will be more secure than an ssh server12:18
→ malmalmal joined12:18
← malmalmal left12:18
bremner but, *shrug*, I'm not your security consultant.12:18
_ikke_ a webserver doesn't generally give you a shell on the host server12:19
← kezimo left12:19
← learningc left12:20
→ learningc joined12:20
bremner true enough.12:20
there still seems to be a fair number of CVEs in most webservers.12:21
← queip left12:22
→ AtumT joined12:22
→ Inline joined12:23
bremner anyway, are there any other sane choices than ssh and https?12:24
_ikke_ afaik those are the only options if you want to give write access12:25
read-only, you have git daemon as well12:25
← n3wborn left12:31
← q-u-a-n left12:34
→ sainathvd joined12:34
→ thefatma joined12:38
→ queip joined12:39
→ kezimo joined12:44
← fphilipe_ left12:46
→ tchan joined12:47
→ isan joined12:49
← mojisun left12:52
→ igemnace joined13:04
← isan left13:06
← d1b left13:07
→ d1b joined13:08
→ mowcat joined13:10
← queip left13:17
→ fphilipe_ joined13:19
← sainathvd left13:22
← thefatma left13:22
← malina left13:26
← czart left13:29
→ caskd joined13:31
→ queip joined13:35
← greatgatsby left13:36
← cbreak left13:39
→ cbreak joined13:40
← Milijus left13:41
→ isan joined13:41
← isan left13:43
← igemnace left13:44
→ igemnace joined13:45
← caskd left13:46
→ malmalmal joined13:47
→ isan joined13:50
→ sainathvd joined13:53
← fphilipe_ left13:54
→ clime joined14:01
← howdoi left14:05
→ inkbottle joined14:07
← Karyon left14:08
← malmalmal left14:09
→ Karyon joined14:11
→ malmalmal joined14:14
← kezimo left14:18
→ lucasb joined14:22
← Cabanossi left14:23
→ gxt joined14:24
→ fphilipe_ joined14:26
← queip left14:28
← igemnace left14:32
→ wootehfoot joined14:34
→ CryptoDavid joined14:35
→ Cabanossi joined14:35
→ queip joined14:38
→ igemnace joined14:45
→ Lucas_Gray joined14:49
→ Karyon_ joined14:55
← khisanth_ left14:55
← Karyon left14:57
→ dawidc joined14:57
Karyon_ → Karyon14:58
← fphilipe_ left14:59
← styler2go left15:00
← mase-tech left15:01
← queip left15:02
→ storrgie joined15:05
← TomTom left15:08
→ khisanth_ joined15:08
← gxt left15:09
→ thiago joined15:11
→ kp__ joined15:14
→ paws_ joined15:17
→ ryanff joined15:18
→ azwieg103 joined15:26
→ queip joined15:26
← isan left15:27
→ isan joined15:29
→ savolla joined15:32
→ nowhereman joined15:33
← zaherdirkey left15:37
← isan left15:43
→ isan joined15:45
← tiggster79 left15:47
← beastDiv_ left15:48
→ causa_sui joined15:59
← clime left16:00
← crose left16:00
← mingdao left16:00
← savolla left16:01
→ mingdao joined16:01
← Phylock left16:07
→ Es0teric joined16:11
← isan left16:13
→ isan joined16:15
← Es0teric left16:15
→ cdown joined16:18
← pks left16:19
cbreak bremner: there's dumb https16:19
and "smart" https16:19
with different requirements16:19
→ rafasc joined16:19
cbreak I'd expect SSH security to be superior to anything web servers can offer though16:20
bremner I guess you could argue that dump https is more secure, since it doesn't need CGI?16:20
cbreak yeah16:21
less features is probably safer16:21
bremner: and you can hide it behind some proxy / load balancer easier16:21
→ beastDiv_ joined16:23
→ pks joined16:28
thiago SSH key based authentication is superior to password authentication16:29
But that doesn't mean the whole setup is better, since the user may have an unencrypted private key file16:29
bremner sure. they may also use their username as a password ;)16:30
thiago the other drawback of https is whether you've got the weak ciphers turned off16:30
← wootehfoot left16:32
cbreak tls 1.3 or no connection16:32
thiago I can't even test if github.com has RC4 since my OpenSSL does not16:33
→ Goplat joined16:34
← skered left16:35
cbreak thiago: https://www.ssllabs.com/ssltest/analyze.html?d=github.com16:35
→ skered joined16:37
← kfoonamalik left16:37
justanotheruser is there a way to ignore /src/doc/foo.pdf if /src/doc/foo.org exists? I don't want to commit pdf files generated from org files, but I *do* want to commit all other pdf files16:40
← shabius left16:40
_ikke_ justanotheruser: git has no mechanism for this16:40
justanotheruser ok thanks16:40
I guess I could make it publish to /src/doc/generated/foo.pdf and ignore */autogenerated/*16:41
← malmalmal left16:42
→ malmalmal joined16:42
→ greatgatsby joined16:43
← lupine left16:44
→ lupine joined16:45
← queip left16:45
← malmalmal left16:52
→ atrigent joined16:53
→ malmalmal joined16:55
← malmalmal left16:55
→ malmalmal joined16:57
← malmalmal left16:57
→ fphilipe_ joined16:57
→ queip joined17:00
→ clime joined17:01
← sainathvd left17:01
← queip left17:05
← macroprep left17:06
→ malmalmal joined17:06
← greatgatsby left17:11
→ plongshot joined17:11
→ queip joined17:13
← plongshot left17:18
← Lucas_Gray left17:18
→ Bobdude joined17:18
← malmalmal left17:19
← clime left17:19
← cdown left17:21
← F0rTex left17:22
→ kerframil joined17:27
→ Lucas_Gray joined17:28
→ Newami joined17:29
← BrianBlaze left17:29
→ orbyt_ joined17:29
← fphilipe_ left17:30
→ cd joined17:32
← kerframil left17:33
← Xiti left17:34
→ yyy joined17:35
← Lucas_Gray left17:36
→ BrianBlaze joined17:37
→ Xiti joined17:38
← tufteddeer left17:45
→ tufteddeer joined17:46
→ jil joined17:46
jil hello17:46
_ikke_ o/17:46
← bluesmonk left17:47
jil I'm trying to diff a foo.baz with biz.fip from a previsou commit using magit short cuts (in emacs). I think I am stuck because I don't well know how to give the biz.fip path when asked for a range.17:48
→ kezimo joined17:48
jil can range point to specific files ?17:48
← queip left17:48
_ikke_ diff doess not work with renges17:49
moritz diff -u <(git show commit1:file1) <(git show commit2:file2)17:49
_ikke_ no need to use external diff17:50
git diff commit:file1 commit2:file217:50
→ kerframil joined17:51
← jcbitter left17:52
→ jcbitter joined17:53
→ Superfox_il_volp joined17:55
→ wildlander joined17:55
Superfox_il_volp dear folks, any idea how to set sqldiff as diff tool in the configuration for *.sqlite3 files?17:55
jil yes _ikke_ but I was hopping for a magit shortcut. The easiest seems the cmd line. Thank you17:56
_ikke_ I'm not familiar with magit, so I cannot help you there17:56
Superfox_il_volp: first, set diff.<driver>.command (see man git config17:57
gitinfo Superfox_il_volp: the git-config manpage is available at https://gitirc.eu/git-config.html17:57
_ikke_ Superfox_il_volp: then, use man gitattributes to use this driver for sqlite3 files17:57
gitinfo Superfox_il_volp: the gitattributes manpage is available at https://gitirc.eu/gitattributes.html17:57
← sgn left17:57
→ fphilipe_ joined17:58
Superfox_il_volp so I'm actually lost looking into this documentation. Whta is the driver?17:58
is it the ID in .gitattributes: *.sqlite3 diff=mydriver ?17:58
_ikke_ yes17:58
→ Dirak joined17:59
← jcbitter left17:59
→ macroprep joined17:59
→ sgn joined17:59
→ jcbitter joined18:00
Superfox_il_volp ok so, I've a hook to compress/decompress the sqlite3 on commit/retrieval, so I have set diff.mydriver.textconv to decompress a *.sqlite3 database in case18:01
right now I'm stuck because git diff now performs an ASCII comparison between the two sqlite3 in binary18:01
← tufteddeer left18:02
Superfox_il_volp I wonder whether there is another entry to tell git to use sqldiff to run the final diff18:03
*entry in the config18:03
→ tufteddeer joined18:04
← jcbitter left18:05
→ clime joined18:05
→ jcbitter joined18:06
← jcbitter left18:11
→ jcbitter joined18:13
→ queip joined18:14
→ wreed joined18:20
→ yyy- joined18:21
← yyy- left18:21
← kezimo left18:23
← atrigent left18:25
← jil left18:26
← causa_sui left18:29
→ dviola joined18:29
← Dirak left18:29
← beastDiv_ left18:30
← moldybits left18:32
→ moldybits joined18:32
← fphilipe_ left18:34
← nowhereman left18:36
→ yonder joined18:37
→ nowhereman joined18:38
← moldybits left18:38
→ moldybits joined18:38
← maxel left18:38
→ fphilipe_ joined18:39
→ armyriad joined18:40
← queip left18:42
← fphilipe_ left18:44
← wreed left18:47
← clime left18:49
→ clime joined18:57
← nowhereman left18:57
→ atrigent joined18:58
→ ferdna joined18:59
← isan left19:00
→ queip joined19:02
← shored left19:02
→ shored joined19:02
→ isan joined19:03
rafasc Superfox_il_volp: textconv is doing exactly what is says, converting something to text so you can text-diff it.19:07
→ ldh_ joined19:07
rafasc Superfox_il_volp: if you want it to run sqldiff, you need to configure it as a external diff driver19:08
as in: configure diff.mydriver.command <some cmd>19:09
ldh_ I'm having trouble using a submodule. I've got a .gitmodules file (https://gist.github.com/lhanson/dd67f8ecf2f45b4217a75c6288c4ca2c), and I clone the parent repo. `git submodule update` doesn't do anything.19:10
_ikke_ git submodule update --init --recursive19:10
→ Mattiaslndstrm joined19:10
ldh_ also does nothing19:10
returns 0 status code, the subdirectory isn't created, the module isn't cloned19:11
git version 2.22.119:11
_ikke_ git ls-tree HEAD path/to/dir19:11
← shored left19:11
→ shored joined19:11
ldh_ git ls-tree libs/iniparser gives "fatal: Not a valid object name libs/iniparser"19:12
_ikke_ and iniparser is a directory?19:12
apparently, at least for the commit you are on, that directory is not tracked by git (git does not know it's a submodule)19:13
ldh_ So I need to check in an empty directory for git to clone into it?19:13
_ikke_ no19:13
You need to add it as an actual submodule19:13
git submodule add http://github.com/ndevilla/iniparser.git libs/iniparser19:14
ldh_ So my parent repo needs to check in the submodule's files, and then git uses the fact that it exists in .gitmodules to pull from it as needed?19:16
_ikke_ It only tracks the parent directory (libs/iniparser) with a note that it's a submodule19:17
Then it uses the .gitmodules file to find out where to find the repository19:17
→ fphilipe_ joined19:17
ldh_ Aha, makes sense now, that's what I was missing. Thanks a bunch.19:18
→ im0nde_ joined19:22
← Mattiaslndstrm left19:22
→ fethio joined19:23
← im0nde1 left19:24
→ plexigras joined19:24
→ savolla joined19:27
→ kezimo joined19:27
→ orjan78 joined19:30
→ greatgatsby joined19:31
orjan78 Hi, I'm new here. Can I ask questions about Git Bash on Windows here?19:33
_ikke_ you can, but not everyone is capable of helping though19:34
orjan78 i'll give it a try :)19:36
→ cutecycle joined19:36
cutecycle given it's not recommended to put git inside dropbox/syncthing/something like that, what would be the best way to have automatic synchronization of a git repo (say, without you manually commit/pushing)? a separate sync branch with inotifywatch doing a commit/push?19:38
← fethio left19:38
bremner automatic commits don't make sense for software developement projects. They might for other things.19:39
_ikke_ cutecycle: inotifywait + rsync19:39
← azwieg103 left19:39
_ikke_ no git involved19:39
cutecycle: that's what I use to sync files for development, before I commit things19:39
cutecycle thanks19:39
← mowcat left19:40
_ikke_ syncronization is almost instant (depends on the latency to the remote end)19:40
orjan78 I'm trying to generate a new SSH key using Git Bash (MINGW64) on Windows 7, using this command: ssh-keygen -t rsa -b 4096 -C "your_email@example.com" But it does not work. I expect to be able to type the name of the key file, but what I get is either "Generating public/private rsa key pair", then I get a prompt, OR it give me "Enter file in whic19:41
h to save the key (c///.ssh/id_rsa)", but immediately jumps to new line/prompt. I'm basically not able to provide user input, as it just gives me a new prompt. Any idea?19:41
cutecycle bremner: philosophically speaking: what is the difference between a software development project and any other project where you would want automated synchronization (especially given many projects are now, in a way, software)?19:41
bremner in a software project, the history is work product19:41
so, mostly, you don't want it to be meaningless crap19:41
cutecycle what about the period before you can manually write the history?19:42
bremner I don't understand the question19:42
cutecycle why aren't we always forcing manual commit and push for google docs19:42
← randomdude999 left19:42
→ randomdude999 joined19:42
→ oatmealraisin joined19:43
_ikke_ Because it would be too much of a hassle for people19:43
And the output is not interpreted by machines, so it does not have to be correct19:44
bremner otoh, I mainly use text files in git for document production19:45
← queip left19:45
bremner but yeah, that tends to be cases where precision matters.19:45
cutecycle I'd probably do that if I didn't need to do a manual push where I could forget or something could happen to the computer/to the power/etc... notable looks pretty nice19:45
→ Xiti` joined19:46
rafasc with Latex, or markup languages, you can have meaningfull diffs and history. With WYSIWYG editor, not as easy.19:46
foo Is there anything similar to github that allows for private code review? We're highly careful about where we put code and to date have nothing on Github and we're looking for a tool/process to help with code reviews between 4 of us. Thank you19:47
cutecycle gitlab?19:47
you can host a private gitlab server19:47
rafasc gerrit19:47
foo cutecycle: thank you, will take a look. We currently host our git repos with gitolite.19:47
cutecycle there's AMIs and even a docker compose if you want to do that management19:47
← Xiti left19:50
→ queip joined19:52
← clime left19:55
→ fethio joined20:01
← _xor left20:01
→ _xor joined20:01
← queip left20:01
→ n000g joined20:02
→ hellauer joined20:04
← ferdna left20:04
→ queip joined20:08
← fphilipe_ left20:11
← isan left20:14
← orjan78 left20:14
→ isan joined20:18
→ bolovanos joined20:27
→ barteks2x joined20:28
→ rsrx joined20:29
← _ADN_ left20:32
→ _ADN_ joined20:33
→ shabius joined20:34
← isan left20:34
← fethio left20:35
→ isan joined20:35
← jcbitter left20:36
→ jcbitter joined20:37
← _ADN_ left20:37
→ fphilipe_ joined20:38
→ cdown joined20:39
→ Xizor joined20:41
← jcbitter left20:42
→ jcbitter joined20:44
← bolovanos left20:44
← paws_ left20:47
← jcbitter left20:49
Superfox_il_volp @rafasc I think I solved the issue with sqldiff20:49
rafasc: the missing entry for me was diff.mydriver.command20:49
im0nde_ → im0nde120:50
→ jcbitter joined20:50
Superfox_il_volp rafasc: however it needed a little wrapper as git passes 7 parameters20:50
rafasc yeah, that is explained at man git20:50
gitinfo the git manpage is available at https://gitirc.eu/git.html20:50
Superfox_il_volp I also set the diff.mydriver.binary = true but it's not clear what it does20:51
→ fethio joined20:51
← savolla left20:51
rafasc GIT_EXTERNAL_DIFF= cmd path old-file old-hex old-mode new-file new-hex new-mode20:51
Superfox_il_volp perhaps it's simply ignored when you already have a command specified20:51
→ SkarmoutsosV joined20:51
Superfox_il_volp at least for me also it wasn't clear how diff.mydriver.textconv and diff.mydriver.command are combined. It turns out that the first is executed, possibly for both old-file and new-file, before being passed to diff.mydriver.command.20:54
→ clime joined20:55
← jcbitter left20:55
rafasc if you are using the external driver, you probably don't want the textconv one.20:55
→ jcbitter joined20:56
← queip left20:58
→ bolovanos joined21:01
← jcbitter left21:02
→ jcbitter joined21:03
Superfox_il_volp rafasc: do you mean to implement the functionality of `textconv' inside the diff command?21:03
I guess the input to diff would become having the database files still compressed21:04
→ Achylles joined21:04
← jcbitter left21:08
→ jcbitter joined21:09
→ malmalmal joined21:09
rafasc Superfox_il_volp: usually you should either use one or the other. Doesn't sqldiff already give you a diff-like output?21:10
← clime left21:10
Superfox_il_volp rafasc: the files are sql dumps compressed with gzip, so textconv merely decompress them and recreates the database from the dump, while sqldiff only acts on the final databases21:12
← Whiskey left21:12
← bolovanos left21:12
Superfox_il_volp there is also a smudge and clean filter to perform this compression/decompression21:12
← fphilipe_ left21:12
→ stux|RC-only joined21:13
rafasc why not just do it inside the cmdwrapper?21:15
unless you're trying to take advantage of using --no-textconv and --no-extdiff to disable them on demand.21:16
→ n3wborn joined21:16
Superfox_il_volp which one is cmdwrapper?21:16
→ queip joined21:16
Superfox_il_volp do you mean to skip textconv and perform the decompression in diff.mydriver.command?21:17
rafasc that's what I meant.21:18
Superfox_il_volp cause I didn't know beforehand :-)21:18
rafasc although textconv has the ability to cache results... hmm..21:19
← cdown left21:19
Superfox_il_volp any idea what diff.mydriver.binary = true is supposed to do? While trying I was not able to perceive any noticeable difference when enabling or disabling it.21:20
rafasc Does it still textconv if you set binary?21:20
Superfox_il_volp yes21:20
ah right, the config for textconv caching I've not yet tried. I imagine it needs to be explicitly enabled21:22
← igemnace left21:23
rafasc binnary = -diff -merge -text21:23
so not sure why textconv still applies..21:23
← plexigras left21:24
→ gxt joined21:30
→ cdown joined21:32
← jcbitter left21:33
→ jcbitter joined21:34
← queip left21:36
← cdown left21:38
← mooasaurus left21:39
→ mooasaurus joined21:39
← jcbitter left21:39
→ jcbitter joined21:40
→ Lucas_Gray joined21:40
← barteks2x left21:41
→ queip joined21:45
→ duderonomy joined21:47
← sborza left21:49
← greatgatsby left21:50
→ sborza joined21:50
← randomdude999 left21:50
→ randomdude999_ joined21:50
randomdude999_ → randomdude99921:50
→ Whiskey joined21:51
← duderonomy left21:53
← dartmouthed left21:55
← Frobozz left21:56
→ clime joined22:01
← cognition left22:02
→ duderonomy joined22:03
← cim209 left22:04
→ cim209 joined22:05
← rigid left22:05
→ rigid joined22:05
← jtmusky left22:06
→ jtmusky joined22:07
→ Juzzika joined22:09
← shored left22:11
→ shored joined22:12
← queip left22:16
← learningc left22:21
→ Milijus joined22:23
← Cabanossi left22:23
← Milijus left22:23
→ bayman joined22:23
bayman how come when i run git status on local, it says Your branch is up to date with 'origin/master' when I added a file and pushed that to my repo from a different machine?22:26
nedbat bayman: because you haven't pull origin/master again.22:27
← duderonomy left22:27
nedbat bayman: locally, all git knows is to compare your local master and your local origin/master22:27
bayman how can I check if there has been a change on remote origin/master?22:28
nedbat bayman: the simplest thing is to just pull it22:28
→ _ADN_ joined22:33
→ queip joined22:35
→ Cabanossi joined22:36
← _ADN_ left22:38
← n000g left22:38
← malmalmal left22:38
→ n000g joined22:39
→ zmt00 joined22:42
rafasc fetch should be enough.22:42
← Inline left22:44
← AtumT left22:47
← SkarmoutsosV left22:48
rafasc Superfox_il_volp: One thing that was throwing me off, is that git log --patch doesn't use the external driver unless you ask it with --ext-diff.22:49
Superfox_il_volp: but it does the --textconv by default.22:49
Superfox_il_volp is this because of the binary setting22:54
?22:54
← hellauer left22:54
← Atlenohen left22:54
← lalilulelo left22:54
→ Atlenohen joined22:55
← gxt left22:56
← yyy left23:00
← clime left23:01
← zmt00 left23:02
← Lucas_Gray left23:02
← bayman left23:05
→ fphilipe_ joined23:09
rafasc Superfox_il_volp: if you do *not* have a textconv configured, setting binary to true, git log will show Binary files a/read.me and b/read.me differ23:12
I am not sure, but seems like having textconv set, is an implicit binary=false, because it assumes you are converting it to text.23:13
Superfox_il_volp so it sounds like the binary flag is to force the behaviour of git, if it doesn't correctly guess the file type23:14
oky, I'm satisfied :-) thanks!23:14
leaving, bye!23:15
← Superfox_il_volp left23:15
← rafasc left23:16
← kjartan left23:17
→ kjartan joined23:19
→ liberiga joined23:23
→ feriman joined23:24
← kp__ left23:27
→ Wulf4 joined23:30
← Wulf left23:34
Wulf4 → Wulf23:34
← ChrisLane left23:34
→ ChrisLane joined23:36
← fphilipe_ left23:42
→ yyy joined23:45
← feriman left23:45
← Juzzika left23:46
→ ElFerna joined23:48
← n3wborn left23:49
← craigo left23:50
← silverwhitefish left23:59

Logs Search ←Prev date Next date→ Channels Documentation