IRCloggy #git 2019-09-10

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-09-10

→ nabil__ joined00:01
← nabil_ left00:02
← alystair left00:03
← AtumT left00:04
← esotericnonsense left00:04
→ esotericnonsense joined00:06
← nabil__ left00:07
→ causa_sui joined00:09
← MaximusColourum left00:12
← johnny56 left00:15
→ jstimm joined00:18
← kaokao left00:19
← dartmouthed left00:20
← b0nn left00:23
→ omnireq joined00:24
→ publio joined00:27
← thiago left00:29
→ b0nn joined00:30
→ ferdna joined00:33
← sythe left00:36
← sozuba left00:39
← rjsalts left00:42
→ rjsalts joined00:42
← rjsalts left00:43
→ rjsalts joined00:43
→ igemnace joined00:47
← RoriconKnight left00:48
← causa_sui left00:49
← stitched_unicorn left00:50
→ ghost43 joined00:55
← rafasc left00:56
← igemnace left00:59
→ howdoi joined00:59
← Inconveniece left01:04
→ BrianBlaze joined01:04
← Sasazuka left01:07
→ causa_sui joined01:11
← dviola left01:12
← amcclure left01:20
→ thiago joined01:20
← orbitex left01:21
← CryptoDavid left01:23
→ igemnace joined01:27
→ SkarmoutsosV joined01:29
← igemnace left01:29
← Fernando-Basso left01:29
← Atlenohen left01:43
← kerframil left01:50
→ Goplat joined01:51
← causa_sui left01:52
← libertyprime left01:56
← F0rTex left01:57
→ F0rTex joined01:59
→ alystair joined02:04
← javashin left02:05
→ johnny56 joined02:05
→ nabil joined02:05
← crose left02:15
→ fstd_ joined02:16
← SteenJobs left02:16
← ferdna left02:19
← fstd left02:20
fstd_ → fstd02:20
← lankanmon left02:23
→ lankanmon joined02:25
← agg left02:29
← Enphuego left02:31
→ esrse joined02:34
→ libertyprime joined02:36
→ omnireq_ joined02:37
← omnireq left02:39
← spacesuitdiver left02:44
← chachasmooth left02:45
→ chachasmooth joined02:46
← nic-hartley left02:49
← Anthaas_ left02:51
→ Anthaas joined02:51
→ rople joined02:53
→ Takkun joined02:54
← Cabanossi left02:56
lagothrix → Guest268702:56
← Guest2687 left02:56
→ lagothrix joined02:56
← rople left02:58
Takkun Hi! is there a way to automatically fetch updates to pc1 from git-server when pc2 git pushes?02:58
→ rople joined03:01
→ Cabanossi joined03:03
→ dege joined03:03
→ nabil_ joined03:11
← z8z left03:12
← nabil left03:14
← deltab left03:20
thomasross → Guest4124603:28
→ thomasross_ joined03:28
← Guest41246 left03:28
thomasross_ → thomasross03:28
→ deltab joined03:30
→ ericfreese joined03:39
← dege left03:40
→ ycon_ joined03:50
ycon_ Hi all, I've got a strange problem where my commits are ending up on a branch I don't intend03:51
I wrote a script to automate my git, so it can automatically deploy a folder on a branch. https://dpaste.de/LqcP#L1803:52
→ z8z joined03:58
→ im0nde_ joined03:59
← z8z left04:00
→ z8z joined04:00
→ pabs3 joined04:00
← im0nde left04:01
← z8z left04:02
→ z8z joined04:02
pabs3 is there a command to determine if a string is a valid tree-ish for passing to git ls-tree?04:02
← trestopochic left04:03
← ycon_ left04:03
→ resetpacket joined04:12
← uidzer0 left04:15
← SkarmoutsosV left04:19
← resetpacket left04:22
→ uidzer0 joined04:24
← z8z left04:25
→ dartmouthed joined04:25
← waveclaw left04:29
→ nabil__ joined04:32
← Aquazi left04:33
← nabil_ left04:35
← publio left04:36
← xcm left04:36
→ xcm joined04:37
→ stitched_unicorn joined04:37
→ wilbert joined04:41
→ steven joined04:44
→ wilbert_ joined04:53
← wilbert left04:55
→ ycon_ joined04:57
← wilbert_ left04:58
→ nabil_ joined04:59
ycon_ Hi all, I've got a strange problem where my commits are ending up on a branch I don't intend. Do I need to git checkout or something? I wrote a script to do it, as it's my "deploy" branch https://dpaste.de/LqcP04:59
→ SteenJobs joined05:01
← nabil__ left05:02
→ z8z joined05:02
← mszyszko left05:05
← malina left05:05
→ nabil joined05:05
← ycon_ left05:06
→ null1337 joined05:06
→ g00s joined05:07
← nabil_ left05:07
→ Keytap joined05:07
← Keytap left05:13
Hoffman → Ron_Paul05:14
← nabil left05:14
→ dijitol joined05:14
← z8z left05:18
→ pks joined05:20
← stitched_unicorn left05:21
→ YuGiOhJCJ joined05:24
← hojang left05:31
→ sauvin joined05:32
→ stitched_unicorn joined05:33
← Inline left05:34
← dijitol left05:34
← SteenJobs left05:38
→ clime joined05:40
MACscr how can i get clone into a specific directory that already has contents in it? I do want it to overwrite if any files its pulling in from the git repo exist in that directory05:44
← ericfreese left05:44
MACscr http://paste.debian.net/1099785/05:47
→ fphilipe joined05:47
thiago rename the directory, then clone05:49
afterwards, merge the contents by your own means05:49
MACscr ugh05:49
i just want to fetch some files into a directory =(05:50
→ fjellfras joined05:53
← thiago left05:56
im0nde_ → im0nde05:59
← clime left06:06
→ TomTom joined06:17
← Takkun left06:19
← cd left06:19
→ Unode joined06:22
Unode hi all, does anyone have a command/link/reference to how to obtain the size of each commit in git history. I have a git repository with a few text files that have been changing over the years and I want to know how many bytes each commit added/removed or modified (added+removed). The goal is to know if some specific commits expanded the repository considerably or if the growth has been consistent through time.06:24
← Anthaas left06:24
Unode thank06:24
*s06:24
→ Anthaas joined06:25
Unode I found a few snippets online but they mostly focus on individual objects (i.e. what commit added a big file).06:25
→ Takkun joined06:26
Unode In my case all files have been present since the initial commit but have been tracked over the years.06:26
← tufteddeer left06:27
→ sQVe joined06:30
← TomyLobo left06:31
→ FetusDeletus joined06:32
→ oxymoron93 joined06:33
→ rfuentess joined06:33
← rople left06:34
→ NwS joined06:34
→ ExeciN joined06:37
→ Jitta joined06:37
← alystair left06:39
← ExeciN left06:41
← fphilipe left06:43
← gxt left06:44
← oxymoron93 left06:45
→ mase-tech joined06:45
→ n3wborn joined06:48
→ courrier joined06:52
← courrier left06:52
→ courrier joined06:52
→ chele joined06:53
→ TomyWork joined06:54
← lankanmon left06:57
→ lem-fr joined06:58
← hussam left07:00
→ lankanmon joined07:00
→ ExeciN joined07:01
→ rople joined07:10
→ oxymoron93 joined07:10
← rople left07:11
→ rople joined07:11
→ fphilipe joined07:12
← fphilipe left07:13
→ fphilipe joined07:13
→ abbiya joined07:13
→ nabil_ joined07:14
← TomyWork left07:14
← paraxial left07:15
→ clime joined07:15
→ paraxial joined07:16
← stitched_unicorn left07:17
→ stitched_unicorn joined07:17
← stitched_unicorn left07:17
← paraxial left07:20
→ floppydh joined07:23
→ stitched_unicorn joined07:24
→ nabil__ joined07:25
← stitched_unicorn left07:26
← nabil_ left07:26
→ paraxial joined07:26
← Anthaas left07:27
→ Anthaas joined07:28
→ malina joined07:32
→ rfuentess__ joined07:40
← rfuentess left07:40
→ hojang joined07:42
← libertyprime left07:42
→ libertyprime joined07:44
→ nabil_ joined07:49
→ aweb joined07:50
→ jerry_ joined07:50
← FetusDeletus left07:50
→ nowhere_man joined07:51
← nabil__ left07:51
→ nabil__ joined07:51
→ Makaveli7 joined07:53
← xcm left07:53
→ xcm joined07:54
← nabil_ left07:54
← nowhere_man left07:57
← fphilipe left08:00
→ nowhere_man joined08:01
→ stitched_unicorn joined08:01
→ fphilipe joined08:03
→ Anticom joined08:03
← planigan left08:09
→ planigan joined08:09
← mase-tech left08:12
← Furai left08:30
→ feriman joined08:32
→ Furai joined08:33
← stitched_unicorn left08:35
← Anthaas left08:36
→ Anthaas joined08:36
← grumble left08:40
← n3wborn left08:41
← fphilipe left08:42
← g00s left08:43
→ fphilipe joined08:45
→ ave_milia joined08:50
← pabs3 left08:50
← hussar left08:50
→ SkarmoutsosV joined08:55
← xcm left09:00
→ xcm joined09:00
← Goplat left09:02
→ stitched_unicorn joined09:02
← libertyprime left09:02
← stitched_unicorn left09:03
→ stitched_unicorn joined09:05
← stitched_unicorn left09:09
→ crose joined09:10
← nowhere_man left09:15
← crose left09:21
→ crose joined09:22
← crose left09:23
→ crose joined09:24
← Joel left09:31
→ sudomann_ joined09:31
→ figuinhas joined09:32
sudomann_ How can i reveal the credentials that `git` is using to push/pull to a repository I was granted access to?09:32
not the email and name09:32
I mean like a key or something. I assume thats what it's using since it does not ask for my username and password when I try to push09:33
henrebotha[m] It's using an ssh key then09:33
Look in ~/.ssh09:33
sudomann_ strangely enough that folder does not seem to exist on my filesystem09:33
which is what is baffling me09:33
Im on windows by the way09:34
henrebotha[m] Ah ok, not sure where Windows stores them09:34
Which interface are you using for Git?09:34
← zamba left09:34
henrebotha[m] Check /c/Users/$your_username/.ssh09:35
sudomann_ Well the command line tool works just fine for pulling and pushing, but my GUI (GitKraken) says "doublecheck your remote url then make sure your have permission to do that action on the remote and try again"09:36
henrebotha[m] Ok so that's your actual problem? CLI Git works just fine but GitKraken won't authenticate?09:37
sudomann_ henrebotha[m]: I looked for the folder there and it did not exist09:37
yes09:37
Its works with my other repositories that I created09:37
But this is someone elses repo i was added to. I cloned with the CLI tool and tried to then push from GitKraken, but it wont authenticate09:38
I was hoping to figure out what key the cli tool is using so I can supply it to gitkraken and hopefully it would work09:38
← catsup left09:39
→ gloomy joined09:40
→ catsup joined09:40
henrebotha[m] Are you signed in to GitHub in GitKraken?09:40
→ zamba joined09:42
sudomann_ yes09:42
Is it possible the repo owner could have placed some sort of restriction that's preventing me from using anything but the CLI tool?09:43
→ Joel joined09:44
henrebotha[m] No, I don't think such a thing exists09:45
← feriman left09:46
sudomann_ I think it might be important to mention that I was added to this repository via Github Classroom09:46
henrebotha[m] https://support.gitkraken.com/integrations/github/#why-cant-i-see-my-remotes-or-repositories-in-the-drop-down-menu09:48
^ That might illuminate something09:48
sudomann_ But I cant see I still cant push/pull from gitkraken09:48
henrebotha[m] It sounds like GitKraken actually needs to be authorised in GitHub09:48
→ libertyprime joined09:49
← courrier left09:49
sudomann_ aaaahhh that must be it09:49
→ deathwishdave joined09:50
sudomann_ Will see my professor about this. If he'll allow me to use GitKraken for submissions, and Organization approval takes too long, I may just submit my work as pull requests instead of committing directly09:51
Thanks for helping me figure that out09:51
henrebotha[m] You're welcome09:53
← jerry_ left09:53
← aweb left09:54
← gloomy left09:56
← Newami left09:57
← Crocodillian left09:58
→ Crocodillian joined09:59
← sudomann_ left09:59
→ Newami joined10:00
← fphilipe left10:01
→ fphilipe joined10:02
← Orbitrix left10:10
→ Orbitrix joined10:11
← nuc left10:18
← NwS left10:19
→ nuc joined10:20
→ feriman joined10:20
← nuc left10:22
→ nuc joined10:22
→ rafasc joined10:23
← nuc left10:23
→ royal_screwup213 joined10:24
→ nuc joined10:24
→ grumble joined10:24
→ TomyWork joined10:34
→ TJ- joined10:37
← YuGiOhJCJ left10:37
← oatmealraisin left10:45
← fjellfras left10:45
← rople left10:47
→ rople joined10:48
→ enoq joined10:57
← Eryn_1983_FL left10:58
→ Aquazi joined10:59
← hojang left11:01
→ emsjessec joined11:03
→ Toxmi joined11:07
← dhollinger left11:13
→ dhollinger joined11:14
← libertyprime left11:18
→ stitched_unicorn joined11:18
→ libertyprime joined11:19
← cebor left11:24
← stitched_unicorn left11:25
→ cebor joined11:25
→ stitched_unicorn joined11:28
→ Hounddog joined11:28
← cebor left11:29
→ cebor joined11:30
→ Eryn_1983_FL joined11:38
← rople left11:42
→ rople joined11:42
→ hojang joined11:50
← royal_screwup213 left11:51
← rople left11:59
→ Fischmiep joined12:00
→ tufteddeer joined12:00
← stitched_unicorn left12:00
→ nerosnm joined12:00
→ MaximusColourum joined12:02
→ Franciman joined12:05
← Franciman left12:05
→ nic-hartley joined12:06
→ Kaivo joined12:07
← esrse left12:16
← malina left12:16
→ kerframil joined12:17
→ CodeSlingerPaul joined12:19
→ sozuba joined12:20
← feriman left12:22
← crose left12:24
→ Lucas_Gray joined12:25
→ crose joined12:25
← abbiya left12:25
→ boombatower joined12:30
← Lucas_Gray left12:32
→ Wryhder joined12:32
Wryhder → Lucas_Gray12:33
grumble → \emph{grumble}12:36
→ cyberpear joined12:51
cyberpear is it possible to make `git diff` automatically add `--textconv` for binary files with a specified diff driver?12:52
→ gloomy joined12:54
rafasc cyberpear: isn't that the default?12:54
→ shaarad joined12:54
cyberpear somehow it isn't on my systems, using git 2.1812:55
maybe I've got a config file somewhere?12:55
→ lucasb joined12:55
cyberpear I have to pass --textconv every time if I want t he diff driver to do its thing12:55
is there a way to dump non-default config options specified?12:56
rafasc maybe you have a bad pattern in the .gitattribute?12:56
cyberpear: git config -l; git var -l; git config -l --source;12:57
also_uplime → ^12:57
cyberpear strangely, it works when I specify `--textconv`, but it suppresses the diff w/o the flag13:00
but the output from the commands you suggest show only my configured diff driver and a gitattributes file; nothing further13:01
← gloomy left13:03
→ azwieg103 joined13:04
← random_yanek left13:05
← hojang left13:06
rafasc cyberpear: can you show a sample of a gitattributes line where you set the diff= ?13:06
→ igemnace joined13:08
→ agowa338 joined13:09
rafasc there's a section on man gitattributes 'Marking files as binary' that may interest you.13:10
gitinfo the gitattributes manpage is available at https://gitirc.eu/gitattributes.html13:10
← shaarad left13:10
→ random_yanek joined13:11
→ octav1a joined13:12
→ courrier joined13:14
← courrier left13:15
← nic-hartley left13:15
→ courrier joined13:15
→ chandoo joined13:16
← Makaveli7 left13:17
← azwieg103 left13:20
← nerosnm left13:21
← Toxmi left13:22
cyberpear in my .gitattributes: `*.gz diff=gzip`13:22
then in my ~/.gitconfig, I've got `diff.gzip.binary=true` and `diff.gzip.textconv=/bin/zcat` (as shown by `git var -l`)13:23
→ renihs joined13:29
→ SteenJobs joined13:31
rafasc just tested in 2.23.0, and in 2.18.0, and with that setting I always see the textconv.13:32
→ nerosnm joined13:32
rafasc can you put *.gz diff=gzip inside .git/info/attributes and try again?13:33
renihs hello, not sure if this the right channel for this question (possibly not) but i would be interested for input/ideas: i would like to use git as configuration mgmt for servers, and create a project per server: however, there are only specific trees/configs i would want to checkin like apache/haproxy/php or like (per server). is it a bad idea to structure this in branches? e.g servername +master (contains descriptions/readmes) -> + apache branch + etc branch?13:33
← kerframil left13:33
rafasc cyberpear: could it be you're trying to checkout something from a time where the .gitattribute wasn't set?13:33
← nerosnm left13:37
← TJ- left13:38
← apetresc left13:38
rafasc renihs: not a bad idea, the execution is where most people get it wrong. If the trees are not related, you could use an orphan branch per tree, see git switch --orphan= / git checkout --orphan; and keep it all inside the same repo. Then steal some ideas from !deploy to deploy those branches.13:39
gitinfo renihs: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html13:39
→ apetresc joined13:42
← Hounddog left13:42
→ gloomy joined13:45
→ john2496 joined13:46
→ phobosoph joined13:48
phobosoph hi13:48
gitinfo phobosoph: 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.13:48
phobosoph So I just pulled from Github upstream master to local repo master13:48
but there are conflicts13:48
→ Es0teric joined13:49
phobosoph well, I want to have the upstream on the local for that master branch thing13:49
so can I force-pull everything from upstream?13:49
just resolve the conflicts "theirs"?13:49
anyone? :)13:50
ah, git pull for fast forwarding13:50
lol13:50
no, it still complains13:51
:(13:51
oxymoron93: you are typing right now? wow, my irc client indicates that13:51
oxymoron93 yeah just noticed that13:51
phobosoph nice13:51
oxymoron93 well, if you are in merge procedure `git checkout --theirs -- *` would work13:51
phobosoph thanks13:51
is that ... is typing an IRC thing or an extra thing from irccloud?13:51
henrebotha[m] > I want to have the upstream on the local for that master branch thing13:51
What does that mean?13:51
oxymoron93 that wasn't understandable yeah13:52
phobosoph henrebotha[m]: I want to clone the local master from the upstream, master branch should always be identical to upstream13:52
then I can merge master to my own customized branch on local repo13:52
oxymoron93 but last message. "just resolve as theirs" gave a hint for the real issue?13:52
phobosoph yes13:52
git checkout --theirs -- *13:52
looks right13:52
I try that13:52
→ nerosnm joined13:52
phobosoph but I ned to tell git to use the upstream as source, right?13:52
cyberpear phobosoph: can you just remove your entire repo and re-clone? -- that's probably the fastest solution if you don't care about any local changes you've made13:53
oxymoron93 hm... if you want it to be identical, then this isn't solution13:53
phobosoph cyberpear: hm, right. But I also got a customized branch13:53
ah13:53
master on local should be like master on upstream (github)13:53
oxymoron93 solution is to `git reset --hard origin/master`13:53
phobosoph ah thanks13:53
oxymoron93 or upstream/master13:53
whatever the remote is13:53
phobosoph ok13:53
hurra13:53
log looks good13:54
ah, the master pointer thing was moved to last log reflog, right?13:54
oxymoron93 reflog keeps track of HEAD movement13:54
phobosoph ah13:54
oxymoron93 simply said, it actually manages lots more13:55
robertson I have a clean filter that seems to randomly skip files and the files it skips aren't consistent in name or file extension has anyone experienced anything similar?13:57
→ stitched_unicorn joined13:58
← howdoi left13:59
renihs rafasc, gitinfo: thanks hmm i will look into the urls13:59
gitinfo renihs: you're welcome, but please note that I'm a bot. I'm not programmed to care.13:59
renihs its already good to know that its not a completely bad idea13:59
though i am still a bit sad that i seem to lose the metainformations like filechange with git compared to svn? (still looking into that, its not a killer but would be nice to have)14:00
rafasc renihs: people use a similar setup for managing .dotfiles. You mean stuff like timestamps, etc? Yea.. git doesn't track that.14:01
renihs rafasc: yeah, specificially timestamps14:03
the rest of the metadata isnt that important (to me) but ... still a bit sad git considers this "unneeded metadata" :)14:03
← gloomy left14:04
rafasc in git the date of commit is more important than whatever the file says.14:05
renihs yeah, and it tracks content not other things... i get that, still would have been nice14:05
→ Keytap joined14:05
rafasc oxymoron93: cyberpear: what IRC client are you guys using? typying detection on IRC? o.o14:06
renihs ah well, thanks a lot, this is helping!14:06
rafasc I meant phobosoph14:06
oxymoron93 kiwiirc14:06
← nerosnm left14:07
oxymoron93 I am on browser tho. This is the first client I used, and I never changed not did I try out any other.14:08
So, don't ask me anything specific. There is no point :D14:08
rafasc Sure, I was just wondering, because that must use a different side channel to communicate that the user is typing.14:08
oxymoron93 apparently I don't see when you are typing14:09
rafasc I guess the other person is using the same thing.14:09
oxymoron93 "Share when I'm typing message" option seems like checked by default. And yeah, that is logical.14:10
← Anticom left14:12
← sQVe left14:17
← omnireq_ left14:20
← deathwishdave left14:21
→ macroprep joined14:22
← inkbottle left14:23
→ greggerz joined14:23
← Lucas_Gray left14:24
→ Lucas_Gray joined14:25
→ deathwishdave joined14:25
→ Anticom joined14:26
← macroprep left14:27
→ aweb joined14:27
→ spacesuitdiver joined14:28
← Lucas_Gray left14:30
← courrier left14:34
→ Lucas_Gray joined14:37
→ thiago joined14:39
← Jitta left14:39
← Anticom left14:45
← floppydh left14:46
→ Anticom joined14:51
← aweb left14:51
→ hojang joined14:52
← Lucas_Gray left14:52
→ leeN joined14:54
→ hussam joined14:57
← MaximusColourum left14:59
← SkarmoutsosV left15:01
← oxymoron93 left15:02
← Anticom left15:02
← vostok4 left15:04
→ vostok4 joined15:07
← clime left15:09
→ AbleBacon joined15:13
← hojang left15:14
→ acercle joined15:15
← leeN left15:17
→ nabil_ joined15:19
→ leeN joined15:21
← nabil__ left15:21
→ nabil__ joined15:22
→ hojang joined15:24
← rfuentess__ left15:24
← nabil_ left15:25
→ nabil joined15:28
← Fischmiep left15:29
← nabil__ left15:30
→ dijitol joined15:32
← AbleBacon left15:33
→ AbleBacon joined15:34
← AbleBacon left15:34
→ AbleBacon joined15:34
← AbleBacon left15:34
→ AbleBacon joined15:35
← AbleBacon left15:35
→ omnireq joined15:35
→ AbleBacon joined15:35
← AbleBacon left15:35
← TomyWork left15:38
← phobosoph left15:42
→ nabil_ joined15:42
← nabil left15:42
→ stfn joined15:45
→ nabil__ joined15:46
← nabil_ left15:47
← craigo left15:48
→ sainathvd joined15:49
→ nabil_ joined15:54
→ mszyszko joined15:56
← nabil__ left15:56
← sainathvd left15:56
← thiago left15:57
→ magic_ninja_work joined15:58
→ Anticom joined15:59
→ hussar joined15:59
← dAnjou left16:02
← treehug88 left16:03
→ aweb joined16:07
→ timer91 joined16:07
→ oxymoron93 joined16:09
← timer91 left16:13
→ alystair joined16:14
← aweb left16:16
→ aweb joined16:16
→ nika joined16:27
→ Jitta joined16:27
← deathwishdave left16:31
← fphilipe left16:34
→ nabil__ joined16:35
← aweb left16:35
← alystair left16:37
← nabil_ left16:37
← tchan left16:42
← Keytap left16:42
→ tchan joined16:42
→ gaurav1620 joined16:43
← Anticom left16:43
← agowa338 left16:43
gaurav1620 zrhoffman: hello16:44
← gaurav1620 left16:47
← stitched_unicorn left16:54
→ thiago joined17:00
Ron_Paul → Hoffman17:02
→ miklcct joined17:02
→ AtumT joined17:03
← JanC left17:10
→ fission6 joined17:12
← crose left17:12
→ crose joined17:12
→ AtumT_ joined17:13
← AtumT left17:14
→ Keytap joined17:14
← xcm left17:16
← BonusPlay left17:16
→ BonusPlay joined17:16
→ xcm joined17:16
→ veegee_ joined17:17
← veegee left17:18
← enoq left17:20
← vavkamil left17:22
→ czart joined17:23
← rafasc left17:23
← figuinhas left17:25
→ vavkamil joined17:27
← AtumT_ left17:29
→ rafasc joined17:31
→ wootehfoot joined17:31
→ causasui joined17:32
← acercle left17:34
→ acercle joined17:35
→ JanC joined17:36
← JanC left17:38
→ gareppa joined17:38
→ JanC joined17:38
→ nerosnm joined17:41
→ gloomy joined17:41
foo Huh, I have a merge in my git log... but I have no idea what it is or how it got there. If I do git show <commit> - shouldn't it show me the changes in the merge? It's blank.17:47
← tango_ left17:47
→ tango_ joined17:47
← gloomy left17:49
rafasc foo: no. A merge has two parents, so to you need to specify against which one you want to compare.17:50
← Newami left17:50
foo rafasc: is there a way to see, from the git log, what two parents were merged?17:50
rafasc usually it's the mainline: git diff merge^..merge17:50
→ gloomy joined17:51
rafasc foo: git log --graph --oneline merge; is a visual way.17:51
with git show --format=raw; you can see the parent list.17:52
foo rafasc: thanks, that helps. What's odd is it shows the merge under my user but I don't remember doing this. :)17:53
Will look into it17:53
rafasc foo: !pull17:53
gitinfo foo: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/17:53
← chele left17:53
← Es0teric left17:54
rafasc you either don't remember; have merged without realising by making a pull; someone is forging authorship of your commits.17:54
foo rafasc: ahhhh. that would explain it. I probably did a git pull, and it merged remote staging into my local staging... that's probably what I'm seeing17:54
rafasc: thank you17:55
rafasc yw.17:55
← gareppa left17:58
→ Es0teric joined17:59
→ Samian joined18:01
Samian hi18:01
I want to go back to a previous commit just to play with the program in an earlier state, and then go back to latest18:02
I thought that would be easy18:02
but it's not18:02
→ nabil_ joined18:02
Samian I can't go to my history log and say I want to get version X18:02
← ave_milia left18:02
→ shaarad joined18:02
← Es0teric left18:03
→ kerframil joined18:03
← czart left18:03
bin_bash Samian: usually what i do is check out a new branch and then reset to the previous committ18:04
that way you dont lose anything on the main feature branch18:04
oxymoron93 or simply checkout the revision you want. It will left you in detached HEAD state, but you can look around!18:05
← nabil__ left18:05
oxymoron93 and if you, in case, decide to work on it, you can create branch while being there18:05
foo q/w 218:06
w/w 218:06
oxymoron93 mind, that if you have uncommited or unstashed changes, git may forbid you to checkout18:06
Samian I freaking hate git. I suck at it. I need to dedicate time to learning it for real18:07
do any of you use tortoise?18:07
→ Sasazuka joined18:07
Samian If git were a person, I'd want to strangle git with my bare hands!18:07
→ Es0teric joined18:13
Samian hi oxymoron9318:14
oxymoron93 Hello, and I do not use any git client. :D18:14
← shaarad left18:15
→ m1dnight_ joined18:15
vishal Samian: step 1: remove tortoise. step 2: read !parable and !book18:16
gitinfo Samian: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html18:16
Samian: 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:16
→ e^1 joined18:17
e^1 I commited my work, after that in experimentation i lost the track of all the content that i was dealing, is it possible to jump back to the last commit that i had made and undo all the mess i did ?18:18
vishal e^1: !reflog18:18
gitinfo e^1: The git reflog (`git log -g`) temporarily (90 days by default) snapshots your branch states at each operation that changes the branch, making it easy to undo e.g. merges and rebases. The usual warnings about !rewriting/undoing history apply. See http://sethrobertson.github.com/GitFixUm/ for full details.18:18
Samian bin_bash when I create a branch, it clones the entire thing?18:19
bin_bash no it checks out a new branch18:19
Samian vishal what's wrong with tortoise ?18:19
vishal unless the commit is still in your history (git log), and in that case, just git reset --hard <sha>18:19
bin_bash oxymoron93: oh cool i didnt realize you could do that18:19
Samian bin_bash but you said <bin_bash> Samian: usually what i do is check out a new branch and then reset to the previous committ18:19
vishal Samian: it won't let you develop the right mental model for git that you need to really understand things18:20
e^1 vishal: bit complicated for those starting with git18:20
anyways thanks :)18:20
vishal e^1: is the commit in your git log?18:20
if so, just use the resaet --hard command above18:20
e^1 vishal: i have pushed the commit to github18:20
yes it's there18:20
Samian man it's been over 10 years since I graduated with my CS degree and got my first software dev job, and still I hate git and suck at it18:20
I feel pathetic18:21
e^1 vishal: at HEAD -> master18:21
← rkta left18:21
bin_bash Samian: yeah that is what i do, because i didnt know you could checkout a specific revision18:21
vishal yep, so the reset should get you to its state, and you'll lose any changes (committed or otherwise) made after that commit18:21
→ rkta joined18:21
Samian bin_bash cool I'll just checkout a sepcific revision18:21
oxymoron93 `git checkout` has many forms. :)18:21
Samian and when I want to go back to the latest checkin what do I do? git latest ?18:21
e^1 vishal: all the changes are shown as untracked and not stage for commit18:22
vishal: what will be the command ?18:22
vishal e^1: right, you will lost them, which is what you want right18:22
git reset --hard <sha>18:22
e^1 yes right18:22
oxymoron93 the changes which are not staged. Clearly, git doesn't care about untracked files.18:22
← sauvin left18:23
oxymoron93 except for identifying them18:23
e^1 e^1: still it is showing untracked files18:23
→ lmat joined18:23
← Orbitrix left18:23
vishal reset wont touch untracked files. do you just need to remove them?18:23
bin_bash isn't git clean used for that18:24
(removing untracked files)18:24
vishal correct18:24
lmat When I git commit; git opens vi for a commit message, but I would like to use vim. running git config core.editer; and git config --global core.editor; returns nothing. echo $EDITOR $VISUAL; returns "vim vim"18:24
oxymoron93 Or you want to ignore them?18:24
bin_bash git clean -f --dry-run iirc to test18:24
→ Orbitrix joined18:24
e^1 vishal: yes all of them18:24
vishal git clean -fdx to remove all untracked files, recursively18:24
lmat Oh yeah, I checked $PROJECTROOT/.git/config and ~/.gitconfig and neither have "editor" in them.18:24
I guess I'm missing something.18:25
bin_bash -f =file -d=directory, what's -x18:25
lmat bin_bash: "Don't use the standard ignore rules"18:25
bin_bash ah cool18:25
lmat bin_bash: So git will remove files and directories even if they are git-ignored.18:25
bin_bash interesting18:26
useful for like .swo/swp files18:26
lmat bin_bash: sure, and 'bin' directory, .o files, etc., etc. :-)18:26
bin_bash ya18:26
lmat Ah, here's something weird... EDITOR=vim git commit --amend; opens vim :-o echo $EDITOR; shows vim.18:27
I ran export EDITOR; and now git commit --amend; does the right thing. :sigh:18:27
e^1 cool it's done , git is amazing18:29
← e^1 left18:30
← SteenJobs left18:38
→ SteenJobs joined18:39
← nerosnm left18:41
← oxymoron93 left18:41
← fling left18:44
→ fling joined18:44
→ nabil joined18:45
→ Sasazuka__ joined18:46
← magic_ninja_work left18:47
← nabil_ left18:47
← Sasazuka left18:48
→ catbusters joined18:48
→ alystair joined18:49
→ nabil_ joined18:53
← JanC left18:54
← nabil left18:56
← sozuba left18:57
→ ericfreese joined18:58
→ comptroller joined19:00
← fission6 left19:03
← TomTom left19:03
→ fission6 joined19:05
← SteenJobs left19:05
← gloomy left19:05
→ JanC joined19:08
← tufteddeer left19:09
→ tufteddeer joined19:10
→ gloomy joined19:14
← tufteddeer left19:15
→ tufteddeer joined19:15
← mojisun left19:19
→ nerosnm joined19:19
→ mojisun joined19:20
← tufteddeer left19:21
→ tufteddeer joined19:21
← tufteddeer left19:21
← nika left19:21
→ tufteddeer joined19:21
← tufteddeer left19:24
→ tufteddeer joined19:24
→ m0viefreak joined19:24
← esotericnonsense left19:24
← tufteddeer left19:29
→ tufteddeer joined19:29
← tufteddeer left19:29
← xcm left19:33
← john2496 left19:33
→ xcm joined19:33
→ john2496 joined19:34
← emsjessec left19:34
→ freeman42[NixOS] joined19:35
Sasazuka__ → Sasazuka19:36
← pks left19:37
← freeman42[NixOS] left19:38
→ pks joined19:42
← thiago left19:42
→ thiago joined19:43
→ sbeyer joined19:44
← tombusby left19:45
→ Shentino_ joined19:45
→ tombusby joined19:46
← gloomy left19:48
← Shentino left19:49
← vavkamil left19:53
→ n3wborn joined19:54
← fission6 left19:57
→ deanc joined20:01
→ g00s joined20:01
→ fission6 joined20:09
→ SteenJobs joined20:11
← xcm left20:12
→ xcm joined20:14
← wootehfoot left20:18
→ andecy joined20:19
← null1337 left20:21
← StuartMI left20:21
← fission6 left20:21
→ feriman joined20:22
→ enoq joined20:24
→ null1337 joined20:26
← feriman left20:26
→ feriman joined20:28
← nerosnm left20:32
→ gloomy joined20:32
← sborza left20:33
→ sborza joined20:33
→ clime joined20:34
← ChrisLane left20:35
→ ChrisLane joined20:36
← clime left20:40
→ amcclure joined20:43
→ iNs joined20:44
→ rsrx joined20:46
→ greatgatsby joined20:48
← profmac left20:49
← feriman left20:49
← daurnimator left20:49
← greatgatsby left20:54
→ waveclaw joined20:56
← catbusters left20:58
← g00s left21:00
→ Sasazuka__ joined21:01
→ profmac joined21:02
← Jitta left21:04
← Sasazuka left21:04
← xcm left21:06
→ xcm joined21:07
← profmac left21:07
→ profmac joined21:08
→ stnv joined21:10
→ _ikke_ joined21:14
→ AtumT joined21:17
→ roflincopter joined21:23
← roflin left21:23
→ greatgatsby joined21:23
← roflincopter left21:24
→ kfoonamalik joined21:24
← Es0teric left21:25
→ Es0teric joined21:28
→ roflin joined21:29
← igemnace left21:30
← profmac left21:31
← thiago left21:31
→ strongdev joined21:33
← sgn left21:34
→ profmac joined21:34
→ sgn joined21:35
→ nabil__ joined21:43
← dijitol left21:44
→ malina joined21:44
← nabil_ left21:46
← octav1a left21:47
→ daurnimator joined21:47
← john2496 left21:47
← rsrx left21:48
→ bambanx joined21:49
→ Fernando-Basso joined21:50
← greatgatsby left21:50
← Kulrak left21:51
→ Kulrak joined21:51
← SteenJobs left21:53
→ Stoot joined21:54
→ SteenJobs joined21:55
→ Sasazuka joined21:57
← Sasazuka__ left21:58
→ Xeyame joined21:59
→ ferdna joined22:06
← Es0teric left22:06
← gloomy left22:09
← Keytap left22:14
← zamba left22:14
→ Es0teric joined22:15
→ Stoot35 joined22:17
← ExeciN left22:18
← Stoot left22:20
Stoot35 → Stoot22:21
← sbeyer left22:21
→ thiago joined22:21
→ craigo joined22:22
← greggerz left22:27
→ zamba joined22:27
← Es0teric left22:28
← SteenJobs left22:29
← CodeSlingerPaul left22:29
→ SteenJobs joined22:31
jadax I have a daily rebase automated job that simply does rebase on our internal git repo. The problem is that after rebase sometimes code doesn't compile. Do you think I can do some sort of dry rebase first to understand if state of the git repo afterwards is good or not?22:32
and then if something is off - fall back to pre-rebase state?22:32
← leeN left22:37
← enoq left22:37
← stnv left22:38
rafasc jadax: what's stopping you?22:40
jadax I'm thinking of implementation22:41
I could have separate repo or branch for the test rebase22:41
rafasc besides the fact that automating merges/rebases like that are a bad idea™22:41
jadax but maybe git supports some of that?22:41
what's wrong with automated rebases?22:41
I was thinking of 'roll-back' transaction type of thing22:41
rafasc rebases/merges are something that were never meant to be automated. They assume a human reviews the result.22:42
jadax that's fine, we live in world that is dynamic and agile and stuff changes22:43
rafasc even successful rebase/merges can be wrong.22:43
jadax what about continuous integration?22:43
and working on open-source project mixed with non-open-source stuff?22:43
rafasc then rebase, compile, if it failt, reset --hard back.22:43
jadax that's some option, yeah22:43
we also use gerrit for code reviews, I was thinking of going through gerrit for automated rebases22:44
every day it would create code review for rebase22:44
and only after it successfully builds and tests - only then the code review would be approved and patch merged (= successful rebase)22:44
rafasc you could detach, and and try it. If it succeeds, move then branch to point that commit with branch -f.22:45
jadax: a small trick you can use: git rebase master feature-branch@{0};22:48
← tgunr left22:48
rafasc then, if all your criteria succeeds, git branch -f feature-branch HEAD;22:48
or git rebase master HEAD;22:51
if you're already on feature-branch.22:51
→ duderonomy joined22:52
→ nowhere_man joined22:59
→ Newami joined23:04
← lucasb left23:05
← omnireq left23:07
→ dviola joined23:12
→ localhorse joined23:12
← xcm left23:16
→ xcm joined23:16
← duderonomy left23:20
← qqx left23:20
→ qqx joined23:21
← causasui left23:23
→ duderonomy joined23:24
← acercle left23:25
← AtumT left23:30
← rafasc left23:31
→ fphilipe joined23:32
← n3wborn left23:33
← comptroller left23:33
← Fernando-Basso left23:35
← BrianBlaze left23:35
foul_owl How do I revert a previous commit, but keep that commit in history? I tried doing "git checkout <hash>" but that puts me a in a detached head state. I also tried "git reset --hard <hash>" but I can't commit anything.23:36
Let's say the history is: a -> b -> c and I want it to look like: a -> b -> c -> a (reverting to a but keeping b and c in history)23:37
← fphilipe left23:38
← lankanmon left23:39
← ericfreese left23:40
← jstimm left23:41
→ comptroller joined23:44
vishal foul_owl: you use git revert, and give it a list or range of commits23:44
← meLon left23:45
vishal it will create a new commit, which is the opposite of the commit being reverted23:45
so you'll end up with a->b->c->b'->c'23:45
but the state of the tree will be the same as a23:45
→ BrianBlaze joined23:45
vishal b' and c' will be the 'inversion' of b and c23:45
man git-revert23:45
gitinfo the git-revert manpage is available at https://gitirc.eu/git-revert.html23:45
→ magic_ninja_work joined23:49
^ → also_uplime23:50
wwalker I get this message "hint: The 'hooks/update' hook was ignored because it's not set as executable.23:50
hint: You can disable this warning with `git config advice.ignoredHook false`.23:51
I run the git config command and I can see it has added it to the .gitconfig file. But I still get the Hint the next time I push. Any ideas?23:51
→ lankanmon joined23:52
vishal wwalker: is this a hook on the remote side?23:53
wwalker ah. Didn't look thanks23:53
Sure enough. Thanks!23:54
→ jsahlsa joined23:57
← BrianBlaze left23:57
→ nerosnm joined23:58

Logs Search ←Prev date Next date→ Channels Documentation