Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-10

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:05 ploop joined #git
00:08 rchavik joined #git
00:10 thebope joined #git
00:10 FuzzyWuz_ joined #git
00:13 brent__ joined #git
00:15 XenophonF joined #git
00:15 northfurr joined #git
00:15 Cabanossi joined #git
00:16 fstd_ joined #git
00:16 avar 2.13.0 is about to be released!
00:23 schleppel joined #git
00:23 northfurr joined #git
00:24 zealsham_ joined #git
00:24 zealsham_ how is it possible that when i push i nto github my files are present their and i can view them but when i push into my personal remote repo all i see is objects
00:26 kadoban Because github builds things on top to show you the actual contents of files at various commits and etc.
00:26 tyriondwarf joined #git
00:27 Celelibi joined #git
00:27 tyriondwarf hi can someone give me quick overview.  with git say i have a web app, devving locally
00:27 ewitz joined #git
00:27 roelmonnens joined #git
00:28 zealsham_ kadoban:  any framework or any way possible to replicate such effect
00:28 tyriondwarf in order to start version control to make my modifications more efficient I upload my local projects to a repository like github or gitlab first, then upload it to my live production server?
00:28 kadoban zealsham_: Probably gitlab and other such tools
00:28 kadoban Not something I really need myself, I just use gitolite
00:29 zealsham_ kadoban: gitolite can replicate that ?
00:29 kadoban No
00:30 zealsham_ kadoban: tell me what can apart from gitlab. gitlab is too resource intensive
00:30 kadoban *shrug* ask someone else, as I mentioned it's not a feature-set I care about, so I don't know many of them.
00:31 zealsham_ ohh thanks
00:31 malmalmal zealsham_: I may be stumbling into a similar problem at the moment, during my initial dive in into git.
00:31 zealsham_ malmalmal: did you find a way to solve it
00:32 malmalmal zealsham_: let me see if is the same obstacle. If I create a BARE remote repo, then clone it locally, the remote only has the .git folder, not the working tree, so no files. Is this what you meant ?
00:32 cdown joined #git
00:33 zealsham_ malmalmal: yes, but i want the remote to have both the files
00:33 bremner zealsham_: why do you need the files on the remote?
00:34 malmalmal zealsham_: ok, so the thing is that this is not reccomended behaviour, because git assumes the files on your remote repo could have been changed independently, and so pushing from local and updating the files could result in diff problems that you can't resolve, as it is remote. Makes sense ?
00:34 zealsham_ bremner:  cause i was asked to do that at work . so the ceo can see the codes
00:35 zealsham_ malmalmal: yes it does, but i need to do it
00:35 Cabanossi joined #git
00:36 malmalmal zealsham_: I understand, it is possible to be done, as long as you know the files will NOT be modified on remote. Which is, if you are the only person using it. Does that apply ?
00:36 bremner zealsham_: there are some complicated solutions in !deploy
00:36 gitinfo zealsham_: 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.html
00:36 bremner you can just deploy a read only copy for the ceo to browse
00:36 zealsham_ malmalmal: yes it does
00:37 bremner or just get the CEO to pay for machine to run gitlab. Or pay for private github
00:37 malmalmal gimme a sec zealsham_
00:38 tyriondwarf cant you use gitlab through the web site and not use their software
00:38 northfurr joined #git
00:38 transhuman_ is there a reporting system for git capable of dumping the contents of a git to text files and also link between source code in github and bugzilla report data?
00:38 bremner tyriondwarf: sure, but apparently self-hosting is a goal here
00:38 kadoban What interest is a CEO going to have in looking at the code anyway
00:39 bremner kadoban: a "power user", but not enough power to run git clone ;)
00:39 malmalmal zealsham_: the problem is explained here http://bare-vs-nonbare.gitrecipes.de/
00:39 Jitta joined #git
00:40 malmalmal zealsham_: although the solution it gives (but does not reccomend) involves a hook script that is NOT available at the cite link, nor at the git documentation it points to as a source of the info.
00:41 malmalmal zealsham_: So either look or ask for that script around. Or you can do this in a different manner, by separating the remote repo from the place where the files are in the end deployed, say: your live/production server
00:41 malmalmal zealsham_: you follow ?
00:42 zealsham_ malmalmal: i do
00:43 malmalmal zealsham_: to do something like that , check this page: https://www.digitalocean.com/community/tutorials/how-to-set-up-automatic-deployment-with-git-with-a-vps
00:43 malmalmal zealsham_: or this other one, but I find it a little bit more difficult to follow: http://gitolite.com/deploy.html
00:43 malmalmal zealsham_: does that help ?
00:44 cqi joined #git
00:45 Dremo joined #git
00:45 Dremo left #git
00:45 zealsham_ malmalmal: thanks for th links
00:47 malmalmal zealsham_: you're welcome, I'm glad if it helps as it has been today's frustration for me, hehe
00:48 justin2 joined #git
00:50 livingstn joined #git
00:52 tyriondwarf how does one use git to track database changes to a project or is that doable?
00:54 sim642 joined #git
00:54 habbasi joined #git
00:55 AciD` joined #git
00:55 AciD` joined #git
00:58 dstw joined #git
01:00 gunnaro joined #git
01:00 caper joined #git
01:00 ResidentBiscuit joined #git
01:02 ploop joined #git
01:03 zealsham_ joined #git
01:08 dstw left #git
01:11 miha_S7_ joined #git
01:12 mel00010 joined #git
01:16 gugah joined #git
01:17 Wulf4 joined #git
01:24 misosoup joined #git
01:27 finalbeta joined #git
01:28 dviola joined #git
01:30 livingstn joined #git
01:31 habbasi joined #git
01:31 TbobbyZ joined #git
01:31 northfurr joined #git
01:32 strugee_ joined #git
01:33 LTRand joined #git
01:36 sunri5e joined #git
01:36 thiago joined #git
01:40 jameser joined #git
01:47 thib joined #git
01:47 AciD` joined #git
01:47 AciD` joined #git
01:47 tunekey joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 Cabanossi joined #git
01:52 fstd joined #git
01:52 pwnz0r joined #git
01:54 caper joined #git
01:54 TikityTik joined #git
01:55 mizu_no_oto joined #git
01:55 justin2 joined #git
01:58 dsdeiz joined #git
01:58 dsdeiz joined #git
01:58 om_henners joined #git
01:59 aidalgol joined #git
02:01 durham_ joined #git
02:01 netj joined #git
02:02 d^sh joined #git
02:03 Gsham joined #git
02:03 joshszep joined #git
02:04 PettanShoutaKun joined #git
02:04 dsdeiz joined #git
02:04 dsdeiz joined #git
02:05 habbasi joined #git
02:05 rossome joined #git
02:06 PettanShoutaKun So my git password has an @ in it
02:07 PettanShoutaKun how do I escape it so that I can use p@ssword@actuallytheurl.com/whatever.git
02:07 Shock_ joined #git
02:07 Shakeel_ joined #git
02:07 dviola joined #git
02:09 dviola joined #git
02:10 strugee_ joined #git
02:10 jzeus joined #git
02:12 lagothri1 joined #git
02:15 roelmonnens joined #git
02:16 tourdownunder joined #git
02:21 jameser joined #git
02:26 jon-mac joined #git
02:26 SporkWitch PettanShoutaKun: ssh keys are generally preferred, is there a reason that's not an option?
02:27 PettanShoutaKun None other than jenkins seems to have built in support for credentials and I was too lazy to figure out SSH keys since I've never used them before
02:27 SporkWitch also, i've never had a problem with @ or bang in interactive ssh/git-over-ssh sessions
02:28 SporkWitch i'd look into it, it's not particularly daunting, MUCH easier to work with (especially for automation, like jenkins), and much more secure
02:28 njbair joined #git
02:29 StuartMI joined #git
02:30 SporkWitch PettanShoutaKun: from a very cursory search: https://docs.google.com/document/d/1Qq-EkiUnC5x8BuM4AZWo-yRUQTrkberzz8JfdCM6yuc/edit
02:31 jaziz joined #git
02:32 robattila256 joined #git
02:35 perrier-jouet hi all
02:36 perrier-jouet I added one git repo in my dotfiles .zprezto and on github it's not a folder I cant click on it , do I have to remove .gitignore inside .zprezto ?
02:37 hexagoxel joined #git
02:38 SporkWitch perrier-jouet: is there anything IN the .zprezto directory? if not, that's why.  git doesn't add empty dirs
02:38 PettanShoutaKun but how do I do it on cruddy windows
02:39 Vortex34 joined #git
02:40 miha_S7_ joined #git
02:40 LTRand joined #git
02:41 Xenophon1 joined #git
02:41 malmalmal joined #git
02:41 perrier-jouet SporkWitch: I want to add .zprezto to my dotfiles but zprezto is gitclone how do I do that so that onoce pushed it becomes an accesible folder in my github.com ?
02:42 SporkWitch PettanShoutaKun: git-bash should have the tools built in.  if not, you can use bitvise tunnelier to generate and then export the keys (when exporting, make sure to select the "openssh" format option)
02:42 SporkWitch perrier-jouet: meaning you have a repo inside a repo? this is discouraged and problematic.  look into submodules
02:42 SporkWitch !submodule
02:42 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules
02:43 steeze joined #git
02:43 hazelux joined #git
02:43 PettanShoutaKun Okay, I can look into it
02:43 PettanShoutaKun it's probably the way to go honestly
02:44 ttal joined #git
02:44 b0nn joined #git
02:45 northfurr joined #git
02:46 matoro joined #git
02:46 macrover joined #git
02:46 prg3 joined #git
02:47 svm_invictvs joined #git
02:50 perrier-jouet PettanShoutaKun: if I remove .gitignore from .zprezto will it be visible on github.com ?
02:51 bannakaffalatta joined #git
02:51 perrier-jouet PettanShoutaKun: I have mydotfiles/ and I have bunch of configfiles and folders and one of those folders .zprezto is a git clone but once pushed I have everything BESIDE the git clone I cant access
02:54 macrover joined #git
02:56 Celelibi joined #git
02:57 macrover joined #git
02:59 bronson joined #git
03:01 chachasmooth joined #git
03:02 thib joined #git
03:03 Artur_Vieira joined #git
03:03 AciD` joined #git
03:03 AciD` joined #git
03:04 Artur_Vieira I had a question, I recently started submitting PRs still really new at this. Once I submit a PR from a branch, what is recommended I do to master to keep things up to date.
03:04 Artur_Vieira Should I rebase master, will that affect the PRs.
03:05 prg3 joined #git
03:06 dsdeiz joined #git
03:06 Artur_Vieira It's that my fork master is getting behind several commits
03:08 SporkWitch the usual flow i've always been told to use is: fork the upstream, create a branch for your work.  prior to PR, pull upstream master into your master, rebase your branch to your updated master, test to make sure nothing broke, submit PR.  This helps keep things nice and clean for an easy merge at the upstream
03:08 LeBlaaanc joined #git
03:09 SporkWitch but i defer to anyone else with better advice; i've little experience with larger scale git projects, usually just myself and one or two others where it's easy to keep things from conflicting
03:10 LeBlaaanc joined #git
03:10 perrier-jouet SporkWitch: I foundit I had to remove the .git inside the gitclone I want to push so that the folders becomes accesible
03:10 SporkWitch perrier-jouet: like i said, the problem was that you had a repo inside a repo; the proper way to do that is with submodules
03:11 govg joined #git
03:12 Artur_Vieira SporkWitch: thank you
03:12 SporkWitch by deleting the .git, you made it so the inner repo is no longer its own repo
03:15 joshszep joined #git
03:16 joshszep joined #git
03:16 perrier-jouet SporkWitch: how can I add a subdirectory ? my working directory is $/home and I wanted to add .config/mpd to my repo but I think it's adding the whole .config instead of .config/mpd ???
03:17 joshszep joined #git
03:18 perrier-jouet SporkWitch: nevermind it did what it was supposed to do sorry
03:19 SporkWitch perrier-jouet: you'd have to track the individual files you want and ignore the others.  In situations like that, what I do is create my own structure inside the git repo that makes sense to me, and then symlink those to where the relevant programs expect their files to be.  for example, my vimrc is in ~/repos/configs/dotfiles/vimrc and i create a symlink for it:
03:19 SporkWitch ln -s ~/repos/configs/dotfiles/vimrc ~/.vimrc
03:19 joshszep joined #git
03:19 raynold joined #git
03:23 tsuyubo joined #git
03:23 nd joined #git
03:24 aavrug joined #git
03:24 tsuyubo hi, i want to use git send-email to send source instead of a patch,is it possible?
03:24 prg3 joined #git
03:25 tsuyubo git hint me: No subject line in file  ?
03:30 perrier-jouet is this normal writing objects > 100 mib ?
03:30 perrier-jouet what is going on
03:30 om-henners joined #git
03:32 om_henners joined #git
03:35 nivag I thought the current stable version was 2.3.0!!! :-)
03:35 nivag 2.13.0
03:35 moei joined #git
03:35 * nivag blames the Keyboard Gremlins!!!!
03:36 pwnz0r joined #git
03:36 TbobbyZ joined #git
03:37 oaao joined #git
03:38 Cabanossi joined #git
03:39 asedeno joined #git
03:40 northfurr joined #git
03:51 bronson joined #git
03:52 Artur_Vieira left #git
03:53 a_thakur joined #git
03:55 dreiss joined #git
03:56 steeze joined #git
03:56 QwertyDragon joined #git
04:00 oskarkv joined #git
04:07 ryouma joined #git
04:07 ryouma joined #git
04:07 ryouma ok, what am i doing wrong?  "git diff --since master@9d392d2e30d4c67f00ea991901109aadfc61c3e2" returns nothing
04:07 ryouma s/returns/prints/
04:07 ryouma git version 2.1.4
04:10 miha_S7_ joined #git
04:12 danimal2 joined #git
04:15 BackEndCoder joined #git
04:18 govg joined #git
04:19 duderono_ joined #git
04:21 blackwind_123 joined #git
04:29 robotroll joined #git
04:37 telephone joined #git
04:37 telephone joined #git
04:39 Guest61 joined #git
04:41 kadoban joined #git
04:41 a_thakur_ joined #git
04:43 LTRand joined #git
04:44 hazelux joined #git
04:44 mel00010 joined #git
04:46 eehackr joined #git
04:49 eehackr joined #git
04:49 nevodka joined #git
04:52 eehackr joined #git
04:54 tarkus joined #git
04:55 Bock joined #git
04:56 svm_invictvs joined #git
04:57 ppang joined #git
04:59 treaki joined #git
05:00 LordRyan joined #git
05:01 hazelux joined #git
05:03 Mutter joined #git
05:04 LordRyan joined #git
05:04 dre_ joined #git
05:06 MineCoins joined #git
05:06 armyriad joined #git
05:08 prg3 joined #git
05:08 Cabanossi joined #git
05:09 rscata joined #git
05:09 a_thakur joined #git
05:11 thiago joined #git
05:13 overlord_tm joined #git
05:18 dec0n joined #git
05:20 cqi joined #git
05:23 a_thakur_ joined #git
05:23 duderonomy joined #git
05:25 xkr47 joined #git
05:26 qt-x joined #git
05:28 macrover joined #git
05:32 imack joined #git
05:32 D630 joined #git
05:34 arecaceae joined #git
05:36 pwnz0r joined #git
05:36 King_Hual joined #git
05:39 lordjancso joined #git
05:40 miha_S7_ joined #git
05:40 TbobbyZ joined #git
05:41 danimal2 joined #git
05:42 dersand joined #git
05:43 zefferno joined #git
05:45 LTRand joined #git
05:45 ThomasLocke joined #git
05:46 rkazak joined #git
05:49 Raging_Hog joined #git
05:54 Cabanossi joined #git
05:55 blackwind_123 joined #git
05:57 acetakwas joined #git
06:00 v2zz joined #git
06:01 thiago joined #git
06:01 v2zz hi! my pre-commit hook not running on ubuntu ntfs. anybody knows a workaround?
06:02 dreiss joined #git
06:03 dec0n joined #git
06:06 CyberTex joined #git
06:06 MineCoins joined #git
06:07 zeroed joined #git
06:08 sitaram hi all; quick question: does git-credential-cache support passwords for the *proxy* server?  (The documentation does not indicate so... and I've never used it myself at all, since I don't use http.  I'm asking for someone at $DAYJOB)
06:09 CyberTex Guys , I pushed my /.vagrant folder with the project by mistake :( I did revert and now my code is gone. Haven't pushed it yet. How do I fix this mess? :(
06:10 Silmarilion joined #git
06:10 CyberTex My private key is there , I don't own the repo , and now I could possibly remove my work too. LoL such a mess
06:11 Tee_Pee joined #git
06:12 CyberTex I'm thinking clone my branch , create a new branch , and save my day?
06:13 roelmonnens joined #git
06:13 crankslider joined #git
06:14 jameser_ joined #git
06:15 govg joined #git
06:16 weltall joined #git
06:17 visual hello gits
06:17 JeroenT joined #git
06:18 tyriondwarf im OFFENDED omg
06:18 visual :O!
06:18 jaziz joined #git
06:18 xall_ joined #git
06:18 tyriondwarf youre racist sexist and every liberal label
06:18 User458764 joined #git
06:19 User458764 joined #git
06:19 visual tyriondwarf: pls take note of the current year
06:19 visual it's literally impossible not to be racist or sexist
06:19 visual http://i.imgur.com/7t2gMHf.jpg
06:19 tyriondwarf youre an everything phobicphobe
06:20 tyriondwarf lol
06:20 visual also fuck yeah, game of thrones!
06:20 kadoban Really could do without the weird political nonsense.
06:20 visual ready for the last season?
06:20 visual kadoban: we're just joking
06:20 tyriondwarf WHEN does it start?
06:20 tyriondwarf got got got
06:20 visual this summer like always
06:21 visual it's bound to be the greatest thing since the invention of fire
06:21 tyriondwarf got got gits?
06:21 visual all those conflicting interests, the daeneris chick, the dwarf peep, the john snow guy, the white king, the cercei chik, the yellow peeps who want revenge because smirkfu got killed in that church
06:22 kadoban CyberTex: What actual operations did you do? You say you pushed, but then that you didn't push? Was the first one supposed to be that you commited?
06:22 visual right, anyway, when resolving conflicts locally, the <<<<HEAD represents the branch that you're trying to merge, the >>>>> branch is the branch you're merging _into_
06:22 visual what about the =======
06:22 visual is taht the separator between HEAD and branch?
06:23 Andrew_K joined #git
06:23 visual it's left kind of ambigious
06:23 kadoban Yeah, it's just a separator
06:23 Cabanossi joined #git
06:23 Peuc joined #git
06:23 visual hot, thx kadoban
06:24 kadoban Anytime
06:24 qwertyzxcvbn joined #git
06:25 lindenle joined #git
06:26 CyberTex (add --all ,commit,push) which pushed my /.vagrant folder. Then I added /.vagrant to the gitignore file. Then (revert) to revert my pevoius push. My local copy now doesn't have my work on it. The bitbucket copy does have my work and also my /.vagrant folder which I don't want it to be there
06:27 kadoban So I assume this is something you want to remove from history, right? It's a private key or something?
06:27 kadoban The 'git revert' isn't your friend, that's not what that does.
06:29 kadoban This is one of those cases where modifying history is the expected action. First you should remove the revert commit, and then we can figure out how to remove the files from history and push that.
06:30 kadoban Why did you say you don't own the repo, is this someone else's and you have push access, or?
06:30 tarkus joined #git
06:30 CyberTex kadoban: yes I want to remove it from history or at least get back my work from bitbucket and add that folder to the gitignore  again then (add --all , commit,push) and save myself at least the embarrassment
06:31 h12o joined #git
06:31 ronskisika joined #git
06:32 freimatz joined #git
06:32 kadoban The only thing is, if someone else could be using this history already, you really need to communicate with them when stuff like this comes up, if they could already be basing work on the history we're going to modify. Is that a worry here, or is it only you, or?
06:33 CyberTex I have no idea if I'm describing the right thing but yeah , I created that branch , but I don't see any option to control it , so I assumed that my team leader gave me the permission to push and read
06:34 chele joined #git
06:34 kadoban Is this a branch you *just* created that we're talking about? Then usually nobody else will even be looking yet, right? Or might they be?
06:34 CyberTex kadoban:  I just pushed it. and did a pull request , my team leader haven't accepted it yet.
06:34 kadoban I'm getting less and less confident my advice is going to end well xD
06:35 kadoban Oh okay, a pull request. On github, or?
06:35 ronskisika joined #git
06:35 CyberTex kadoban:  bitbucket
06:35 kadoban Okay, should be similar enough. First thing I'd do is put a comment in the PR saying that you screwed it up and not to look at it yet and you'll fix it soon. You can probably remove the note once you fix it.
06:36 v2zz joined #git
06:36 kadoban Then, let's talk about the history. So you did one commit, and then you did 'git revert', right? and that's all you've done on this branch? Just the one commit and then immediately after the revert commit?
06:37 qwertyzxcvbn joined #git
06:39 valhala_22 joined #git
06:39 schleppel joined #git
06:41 elect_ joined #git
06:42 User458764 joined #git
06:42 CyberTex kadoban: actually three. Then reverted. First one when I messed up and uploaded /.vagrant folder along side my work. Second one turned out I did that push under the username vagrant somehow ; and I tried to fix that by removing one line and (add --all , commit,push) so it appear under my name. Third one , I noticed that I messed up in the first commit , I added "/.vagrant" to the gitignore file . Then (add --all , commit,push). After t
06:44 kadoban You got cut off on  "After th"
06:44 JeroenT joined #git
06:45 CyberTex After that I reverted and here I am.
06:45 kadoban Okay so the revert got rid of the .vagrant thing you wanted to get rid of, and also got rid of your actual work, right?
06:46 CyberTex exactly :P
06:46 JeroenT_ joined #git
06:47 kadoban Okay, so first make a !backup   then, the thing to do is get rid of the revert, because it doesn't really help.  If you're on the correct branch, 'git reset --hard HEAD~1' should work fine. (make sure you know what it does). Then make sure both your work and the .vagrant thing is back.
06:47 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
06:47 rebrec joined #git
06:47 bilal joined #git
06:48 kadoban Then, you should probably use a tool like !bfg to get rid of the .vagrant stuff. Or you can use 'git filter-branch', though I think people usually find the other tool easier to use. (personally I like filter-branch. if you want to go that way, look in the manpage for the examples of how to delete stuff from commits, that's what you want)
06:48 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
06:49 M6HZ joined #git
06:49 kadoban Then you can just 'push -f' once history looks good and you should be done. Also, you should really assume that your private key is just compromised and revoke it, and make a new one.
06:49 kadoban Once you share a private key, it ain't so private anymore.
06:49 CyberTex kadoban: Sure . Thanks a lot. I'll work on it <3
06:51 kadoban Welcome. Make sure you check what most of those do, these aren't the safest commands in the world. And feel free to ask questions
06:51 JeroenT joined #git
06:51 tvw joined #git
06:53 Cabanossi joined #git
06:55 aw1 joined #git
06:56 jfr joined #git
06:57 ertes-w joined #git
06:58 netj joined #git
07:00 GT4066 joined #git
07:01 dermoth joined #git
07:03 djb-irc joined #git
07:04 a_thakur joined #git
07:06 rebrec joined #git
07:11 miha_S7_ joined #git
07:12 Tobbi joined #git
07:12 danimal2 joined #git
07:13 valhala_22 joined #git
07:15 murii_ joined #git
07:16 TomyWork joined #git
07:18 fluffystub joined #git
07:21 earnestly joined #git
07:23 Cabanossi joined #git
07:23 ti2 Is there a way to tell git-daemon to use a specific gitnamespace?
07:25 grawity namespaces are handled by git-upload-pack/git-receive-pack, which honor $GIT_NAMESPACE
07:28 zealsham_ joined #git
07:28 Levex joined #git
07:29 Tobbi joined #git
07:31 PHPanos joined #git
07:31 sbulage joined #git
07:33 zulutango joined #git
07:33 Hunter1_ joined #git
07:34 Gurkenglas joined #git
07:35 navidr joined #git
07:37 Gtacer joined #git
07:37 jameser joined #git
07:38 aw1 joined #git
07:39 Gtacer left #git
07:39 tvw joined #git
07:43 xyNNN_ joined #git
07:44 Tobbi joined #git
07:44 zerow joined #git
07:46 ti2 grawity, does that mean that I can only "fix" one git-daemon instance to one gitnamespace by setting GIT_NAMESPACE in git-daemon's env?
07:46 grawity probably
07:46 ti2 ok, thanks.  But quite sad... ;-)
07:47 theoceaniscool joined #git
07:47 varo left #git
07:47 LTRand joined #git
07:52 a3Dman joined #git
07:52 Snugglebash joined #git
07:56 manuelschneid3r joined #git
07:58 ij grawity, Does .git/objects/info/alternates simply list additional object directories?
07:58 grawity yes
07:58 grawity they don't even have to live in a repo
08:01 marcogmonteiro joined #git
08:01 cyphase joined #git
08:01 njbair joined #git
08:03 mikecmpbll joined #git
08:07 a_thakur joined #git
08:07 dre_ joined #git
08:07 bongjovi joined #git
08:11 wrouesnel1 joined #git
08:12 v2zz joined #git
08:14 Gtacer joined #git
08:17 flaviodesousa joined #git
08:18 vs-midi joined #git
08:19 Tobbi joined #git
08:20 Tacer joined #git
08:20 j08nY joined #git
08:20 _ADN_ joined #git
08:21 aidalgol joined #git
08:21 cdown joined #git
08:22 Snugglebash joined #git
08:22 MuffinMedic joined #git
08:23 [ADN] joined #git
08:23 pbandark joined #git
08:23 permalac joined #git
08:23 [ADN] joined #git
08:23 Stace joined #git
08:24 cdown joined #git
08:25 ij Does the -A option of `git repack -d` make GCable objects from the old packs still live on as loose objects? Did I get that right?
08:25 JeroenT joined #git
08:25 zxd joined #git
08:25 grawity ...what's "GCable"?
08:25 grawity ah, as in GC-able
08:26 grawity yes, the manpage seems to say "…unreachable objects become loose objects" and "…will be pruned with the next git gc invocation"
08:26 grawity or `git prune` if you don't want the repacking that gc does
08:27 ij gc = prune + repack?
08:28 Furai Is git core ppa going to get 2.13?
08:28 grawity probably not exactly that
08:28 visual hey, when locally merging conflicts, how does /git/ know which files are merged and which are not?
08:28 visual for instance
08:28 ij Hm, I wonder whether I can make git-gc pass -ad to repack.
08:28 visual http://prntscr.com/f641kz
08:28 Furai visual, if you have unmerged file you'll see some special git lines in it.
08:28 grawity ij: what's the advantage?
08:28 visual it still shows CalendarController, but i resolved that file's conflict, and saved it
08:29 grawity visual: you need to `git add` the file after resolving
08:29 visual right, but when i git add ., it will add all the files, right?
08:29 visual so you just kinda have to manually keep track of which files you resolved, and which you didnt?
08:29 ij Hm, I had added a test for "more than a single pack -> git gc", but I guess this is just lucky that it works for me.
08:30 grawity you can add individual files instead of the whole .
08:30 visual :!O
08:30 visual clever
08:30 ij …because there can be multiple packfiles.
08:30 grawity the . means "current directory"
08:30 visual /thanks grawity/
08:30 visual yeah i know, just didnt occure to me to keep track of the resolved files by adding them 1 by 1
08:31 ij I wanted to know when to git-gc, so the deployments would be faster, but I guess you can generally know when to do it.
08:31 grawity Git runs `git gc --auto` every now and then; usually that's enough
08:34 ij I want my deployment archive to be small always.
08:34 Chuguniy joined #git
08:35 grawity so by "speed up deployment" you're talking about cloning from that archive being slow?
08:35 cdown joined #git
08:35 gunnaro joined #git
08:35 notebox joined #git
08:36 bejeb joined #git
08:36 ij Skipping gc if I know when(that's hard apparently).
08:36 a_thakur joined #git
08:38 Cabanossi joined #git
08:40 joshszep joined #git
08:40 miha_S7_ joined #git
08:41 joshszep joined #git
08:41 nineg joined #git
08:41 joshszep joined #git
08:41 ayogi joined #git
08:42 thiago joined #git
08:42 joshszep joined #git
08:43 joshszep joined #git
08:43 cstratak joined #git
08:44 joshszep joined #git
08:44 joshszep joined #git
08:45 joshszep joined #git
08:46 joshszep joined #git
08:47 sbasso joined #git
08:47 joshszep joined #git
08:48 joshszep joined #git
08:48 cdown joined #git
08:48 danimal2 joined #git
08:48 MattMaker joined #git
08:48 Levex joined #git
08:48 joshszep joined #git
08:49 MattMaker joined #git
08:49 joshszep joined #git
08:50 MattMaker joined #git
08:50 joshszep joined #git
08:50 CyberTex joined #git
08:50 MattMaker joined #git
08:51 joshszep joined #git
08:51 MattMaker joined #git
08:51 YuGiOhJCJ joined #git
08:51 CyberTex kadoban: Thanks a lot dude. It worked like a charm.
08:52 joshszep joined #git
08:52 MattMaker joined #git
08:52 CyberTex I just rewrote history ^O_O^
08:52 joshszep joined #git
08:53 MattMaker joined #git
08:53 joshszep joined #git
08:53 JeroenT joined #git
08:53 Masber joined #git
08:54 MattMaker joined #git
08:54 joshszep joined #git
08:54 MattMaker joined #git
08:55 joshszep joined #git
08:55 MattMaker joined #git
08:56 clmsy joined #git
08:56 joshszep joined #git
08:56 a_thakur_ joined #git
08:56 MattMaker joined #git
08:56 joshszep joined #git
08:57 MattMaker joined #git
08:57 MuffinMedic joined #git
08:58 joshszep joined #git
08:58 MattMaker joined #git
08:58 joshszep joined #git
08:58 MattMaker joined #git
08:59 karols146 joined #git
08:59 Silox| joined #git
08:59 joshszep joined #git
08:59 MattMaker joined #git
09:00 joshszep joined #git
09:00 cdown joined #git
09:00 MattMaker joined #git
09:01 MattMaker joined #git
09:01 tvw joined #git
09:02 MattMaker joined #git
09:02 achadwick joined #git
09:05 nivag joined #git
09:07 chll_ joined #git
09:09 ShapeShifter499 joined #git
09:11 Tobbi joined #git
09:13 cdown joined #git
09:13 p4trix joined #git
09:17 dhollinger joined #git
09:17 kaldoran joined #git
09:18 Tacer left #git
09:18 sim590 joined #git
09:18 cebula joined #git
09:18 mrkake joined #git
09:20 dan2k3k4 joined #git
09:21 jameser joined #git
09:22 Ring0` joined #git
09:22 seni joined #git
09:23 Cabanossi joined #git
09:25 ppang joined #git
09:31 gugah joined #git
09:33 kurkale6ka joined #git
09:34 hussam joined #git
09:38 govg joined #git
09:39 sarri joined #git
09:39 sarri joined #git
09:40 stamina joined #git
09:41 kurkale61 joined #git
09:42 tourdownunder joined #git
09:42 ttal joined #git
09:45 JeroenT joined #git
09:47 valhala_22 joined #git
09:47 aielima joined #git
09:48 ziombelas joined #git
09:49 nadim_ joined #git
09:50 kurkale6ka joined #git
09:51 LTRand joined #git
09:51 nadim_ morning, when doing a squash, it there a way to display, next to the commits, which branches the commits belong to
09:54 theoceaniscool joined #git
09:58 Tobbi joined #git
09:59 xanadu_ joined #git
10:05 ferr joined #git
10:05 scoobert1on joined #git
10:05 borkr joined #git
10:09 fees joined #git
10:09 cdown joined #git
10:09 jidar joined #git
10:10 miha_S7_ joined #git
10:12 dsdeiz joined #git
10:12 dsdeiz joined #git
10:12 _ADN_ joined #git
10:13 marcogmonteiro joined #git
10:15 telephone joined #git
10:15 telephone joined #git
10:19 chrisM_1 joined #git
10:21 _ikke_ A commit does not belong to a branch (it might be reachable from multiple branches)
10:24 Cabanossi joined #git
10:25 _ikke_ .version
10:25 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
10:28 aielima joined #git
10:29 aard joined #git
10:30 freimatz joined #git
10:31 dendazen joined #git
10:34 tymczenko joined #git
10:34 romank joined #git
10:35 danimal2 joined #git
10:36 visual if i have an incomplete merge, can i stash/pause the merge, checkout another branch, do a thing, and come back?
10:36 visual come back and stash apply/unpause, to continue with the /merge/
10:36 Tobbi joined #git
10:37 visual apparently not
10:37 visual fatal: git-write-tree: error building trees
10:37 visual Cannot save the current index state
10:37 visual but what if the info i need for the merge is in another branch that isnt available remotely
10:37 visual reeeeeee
10:37 _ikke_ visual: man git worktree
10:37 gitinfo visual: the git-worktree manpage is available at https://gitirc.eu/git-worktree.html
10:38 visual _ikke_: would that help? i tried "git stash" and it returned the "git-write-tree: error bu..."
10:38 kyan joined #git
10:39 _ikke_ visual: git worktree is a way to checkout a branch in another directory
10:39 visual oh right
10:39 visual :!O
10:39 visual thanks
10:39 markus-k_ left #git
10:39 davimore joined #git
10:47 lowercaseman joined #git
10:47 TbobbyZ joined #git
10:47 jackrandom joined #git
10:49 bernd27 joined #git
10:49 jameser joined #git
10:54 PHPanos joined #git
10:58 User458764 joined #git
10:58 Snugglebash joined #git
10:59 User458764 joined #git
11:03 Ice_Strike joined #git
11:04 Ice_Strike I want to do git pull on the production server but I forgot to put /public/upload/ on the .gitignore file
11:05 Ice_Strike There are some files already uploaded on /public/upload/ and git are tracking this on the producting server
11:05 Ice_Strike How can I ignore  /public/upload/ on the production server before I do git pull?
11:05 QwertyDragon joined #git
11:06 kiwieater joined #git
11:07 canton7 Ice_Strike, first, !deploy
11:07 gitinfo Ice_Strike: 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.html
11:08 mmlb joined #git
11:08 canton7 Ice_Strike, you'll have to add '/public/upload', to your .gitignore, tell git to stop tracking the files it has started tracking with 'git rm --cached public/upload', then commit that deletion
11:08 Ice_Strike canton7 on a producion server?
11:09 canton7 I'd advise against touching git on a production server :P
11:09 Darcidride_ joined #git
11:09 Ice_Strike but i don't wanna do git pull when /public/upload/ is already tracked on the production server
11:09 canton7 so, do what I said on a dev machine, push, *then* update the production server
11:09 Ice_Strike I have added add '/public/upload' on the dev server on the .gitignore
11:09 canton7 actually, wait
11:10 canton7 committing the deletion will cause the production server to remove those files from public/upload
11:10 canton7 so you'll need to back them up before updating the production server
11:10 Ice_Strike Ah ok.
11:10 canton7 ... this is one of the reasons why using 'git pull' to deploy something is a pretty bad idea
11:10 canton7 (afk)
11:10 Ice_Strike canton7 which deploy do you use?
11:11 ndim joined #git
11:12 jeffreylevesque joined #git
11:12 Masber joined #git
11:14 canton7 Ice_Strike, for proper stuff, I've used capistrano (although I think that's been superceded by other tools these days)
11:15 canton7 for little personal stuff, I use 4.2
11:15 canton7 for your case, you'll probably want something more complex which preserves public/upload
11:15 ronator joined #git
11:16 ndim joined #git
11:16 HoierM joined #git
11:17 visual is there a way to search through all commits in a branch?
11:17 visual all commits = all versions of a file
11:18 _ikke_ visual: Do you want to look for changed contents, or for the commit messages?
11:18 visual contents
11:18 Ice_Strike canton7 what about deployer.org ?
11:18 visual >inb4 then no
11:18 _ikke_ git log -S <abc<
11:19 visual log shows only the current branch
11:19 visual and i cant switch the branch, brilliant!
11:19 _ikke_ visual: you can specify a branch
11:19 * visual murder-suicides his whole family
11:19 visual _ikke_: how?
11:19 _ikke_ by specifying a barnch
11:19 _ikke_ branch
11:19 visual _ikke_: how?
11:19 _ikke_ git log -S <text> <branchname>
11:19 visual right, thanks _ikke_
11:21 tyrathect joined #git
11:26 Acerific joined #git
11:26 guardianJ joined #git
11:27 a_thakur joined #git
11:27 canton7 Ice_Strike, never heard of it
11:27 ertes joined #git
11:27 canton7 (not that that's a bad thing - I don't do devops)
11:28 kurkale6ka joined #git
11:30 j08nY joined #git
11:35 simon816 joined #git
11:35 a_thakur joined #git
11:36 sbasso joined #git
11:37 sangy joined #git
11:38 Cabanossi joined #git
11:41 miha_S7_ joined #git
11:42 digidog joined #git
11:47 manjesh joined #git
11:47 jameser joined #git
11:47 PHPanos joined #git
11:47 acetakwas joined #git
11:47 Khisanth joined #git
11:50 Ice_Strike On the gitignore what the difference betwen /public/upload/ and /public/upload ?
11:50 roney-antony joined #git
11:50 telephone joined #git
11:50 telephone joined #git
11:51 bsanford joined #git
11:51 njbair joined #git
11:51 canton7 one has a trailing slash?
11:52 Ice_Strike yes
11:52 canton7 cool, problem solved!
11:53 canton7 (that's a very obtuse way of saying that you need to give some context to your question)
11:53 Saturn812 joined #git
11:54 LTRand joined #git
11:54 Ice_Strike Ok, I remember that from next time :P
11:54 finalbeta joined #git
11:54 ssarah joined #git
11:56 Junior joined #git
11:57 DrSlony joined #git
11:57 DrSlony Hello, how do I use a tab in git log --format?
11:58 DrSlony or even better, how do I find what the default format string is which git uses when I do "git log --graph --source --oneline" ?
11:59 LTRand joined #git
11:59 nowhereman joined #git
12:01 dglambert joined #git
12:01 dglambert yo
12:01 boombatower joined #git
12:06 synthroid joined #git
12:06 fmcgeough joined #git
12:07 synthroi_ joined #git
12:07 ronator_ joined #git
12:08 ti2 joined #git
12:08 Stace if I'm doing a rebase on a a branch ("git rebase master") which is ours and which is theirs?
12:09 Stace is the branch ours or theirs? my brain hurts
12:09 Stace I googled it but still don't know wtf is going on
12:09 canton7 Stace, 'git checkout branch; git rebase master' does this:
12:09 canton7 it checks out master, then it applies successive patches from 'branch'. At the point that each patch is applied, it's sitting on the most-recently-applied patch on master, and applying a new patch from 'branch'
12:10 Stace ooh, so master is ours?
12:10 canton7 so at any point, 'ours' is the top of the most-recently-applied patch, 'theirs' is the patch from 'branch' being applied
12:11 govg joined #git
12:11 brent__ joined #git
12:11 Stace ok. usually I go by ours=whatever I was on before the merge (whatever was checked out) and theirs is what's being merged in
12:11 Stace so in this case, the rebase checks out master first
12:11 canton7 yep. a merge is a single operation, and the whole branch is merged in one go
12:12 Stace huh, so it's counter intuitive
12:12 Stace because I would have thought my branch was ours. just as well I checked
12:12 canton7 a rebase is a patch-by-patch operation, which is why "it's the opposite way around from merge" is a bit confusing :P
12:12 canton7 in a merge, you checkout master, merge branch, as you said. 'ours' is master, 'their's is what's merging in
12:12 canton7 if you checkout master and cherry-pick a commit from branch, then 'ours' is master and 'theirs' is the commit you're cherry-picking
12:13 canton7 a rebase is just a succession of cherry-picks
12:13 Stace I thought I understood rebase but I forgot that it starts with the master
12:14 canton7 yeah, the first thing it does is checkout the commit you're rebasing onto
12:14 Stace sorry, person named forgot. that's an inconvenient nick.
12:15 Stace cool, thanks canton7
12:15 canton7 :)
12:18 Stace so if I go --theirs and then git add, will it make a new commit?
12:18 demonking joined #git
12:18 Stace no, --ours
12:18 esc joined #git
12:18 esc joined #git
12:19 Stace --theirs, git add will not require a new commit, but --ours, git add?
12:21 perrier-jouet joined #git
12:21 Vampire0 Stace, if you resolve with --ours, there is no change left to commit, as you take your own version
12:22 Stace Vampire0: in a rebase?
12:22 mindfart joined #git
12:22 Stace I know it's like that with a merge, a rebase is backwards
12:23 dendazen joined #git
12:23 Stace i suspect in a rebase --theirs means no commit
12:23 _ADN_ joined #git
12:23 Vampire0 Stace, yeah, then the other way around I guess :-)
12:23 Vampire0 Stace, just !try it :-)
12:23 gitinfo Stace: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
12:23 roelmonn_ joined #git
12:23 lxnr joined #git
12:24 kurkale6ka joined #git
12:28 caper joined #git
12:28 davidomanfredo joined #git
12:28 LTRand joined #git
12:31 diphtherial joined #git
12:31 HardlySeen joined #git
12:31 aard joined #git
12:31 diphtherial hey, is it appropriate to use a tag to remember someplace in my commit history?
12:31 diphtherial never mind; i assume that's why they exist
12:31 astrofog joined #git
12:32 _ikke_ right
12:33 gugah joined #git
12:33 kexmex joined #git
12:34 visual what was the git command to show the log with the lines and the colors?
12:34 visual can't figure out what to google :I
12:34 netroxen joined #git
12:34 visual nvm found it
12:37 User458764 joined #git
12:37 ojdo joined #git
12:38 sonOfRa joined #git
12:38 PHPanos joined #git
12:39 acetakwas joined #git
12:41 Snugglebash joined #git
12:41 a_thakur joined #git
12:42 shmup joined #git
12:42 shmup what's the technique for showing diff color in the patch based add view, git add -p
12:42 shmup i had it on old machine and must have failed on dotfile something or another.
12:43 seni joined #git
12:43 plos joined #git
12:44 kiltzman joined #git
12:45 rudrab joined #git
12:45 Ryanar joined #git
12:46 shinnya joined #git
12:47 _ikke_ git config --global color.ui auto ?
12:48 DrSlony left #git
12:48 shmup well, I have color in git diff
12:49 dave0x6d joined #git
12:49 govg joined #git
12:49 shmup oh. wait. my .gitconfig did come over, and I realized a commented url I put in it
12:49 shmup https://raw.githubusercontent.com/git/git/master/contrib/diff-highlight/diff-highlight
12:49 shmup I believe that may be the thing I was forgetting to move over
12:50 shmup indeed it was. ok well while I'm here ^ that is a nice way to put color in your `git add -p`  cheers
12:50 TbobbyZ joined #git
12:50 p4trick joined #git
12:50 livingstn joined #git
12:53 kasual joined #git
12:53 ronator__ joined #git
12:53 jeffreylevesque joined #git
12:54 northfurr joined #git
12:54 kurkale6ka joined #git
12:56 Raedism joined #git
12:56 Ryanar how can I git stash a single file
12:56 fission6 joined #git
12:56 Ryanar oh I just tried git stash push <filename> and it worked
12:57 livingstn joined #git
12:59 lxnr 'stash save -p' should also work
13:00 sbasso joined #git
13:03 danimal2 joined #git
13:03 telephone joined #git
13:03 telephone joined #git
13:04 MattMaker joined #git
13:07 livingstn joined #git
13:08 elect joined #git
13:08 Tobbi joined #git
13:09 demize joined #git
13:10 malmalmal joined #git
13:10 synthroid joined #git
13:11 miha_S7_ joined #git
13:12 guampa joined #git
13:12 wrestledBearOnce joined #git
13:13 TheSimonator joined #git
13:14 mizu_no_oto joined #git
13:14 MattMaker joined #git
13:15 roelmonnens joined #git
13:16 Marquisk2 joined #git
13:16 sonOfRa So, with 2.13, we get conditional includes like this: https://git-scm.com/docs/git-config#_includes
13:17 sonOfRa Can I also just set a single config option conditionally?
13:17 sonOfRa I have 3 different "paths" and they all only differ in my user.email
13:18 nivag joined #git
13:19 AndreasLutro joined #git
13:19 ExoUNX joined #git
13:20 aielima joined #git
13:22 cam27 joined #git
13:24 ayogi joined #git
13:24 Nevik joined #git
13:25 Snugglebash joined #git
13:26 a_thakur joined #git
13:28 diphtherial left #git
13:30 cachemoi joined #git
13:30 Tobbi joined #git
13:30 Ryanar sonOfRa are you in #haskell ?
13:30 Ryanar I remember your name from somewhere
13:30 nadim_ _ikke_: I asked for the possibility to show the branche_s_ in  my question above
13:31 cdown joined #git
13:31 sonOfRa I was in #haskell ~4 years ago, when I did haskell in university
13:31 SporkWitch sonOfRa: that would be handy as all get out; set email to uni / work / personoal based on which subdir the repo was stored in locally.
13:31 sonOfRa SporkWitch: right now I'm just including a gitconfig file which does that
13:31 Ryanar that is a feature that was just released in 2.13 :)
13:32 sonOfRa Which is a new feature in 2.13
13:32 sonOfRa I was just wondering if I could, instead of *including another file*, *set one option* conditionally
13:32 snowalpaca joined #git
13:32 SporkWitch sonOfRa: hadn't even occurred to me to specifically include it, i'd just had to remember to set local repo settings on each relevant repo on each machine
13:32 SporkWitch oh, that would contribute to not thinking of doing that: not being supported before lol
13:33 Ryanar I just followed the docs that github posted sonOfRa https://github.com/blog/2360-git-2-13-has-been-released
13:33 Vampire0 sonOfRa, well, according to the docs I'd say no. You need three config files with that one setting and then conditionally include those
13:33 theoceaniscool joined #git
13:33 sonOfRa Oh well. It works, and I'm happy that I don't have to remember this step every time I clone or git init a new repo
13:34 northfurr joined #git
13:34 Sound joined #git
13:34 kurkale61 joined #git
13:35 BSAlb joined #git
13:36 visual left #git
13:38 Vampire0 sonOfRa, yeah, cool shit, thanks for bringing it to my attention, will definitely also do this for the work / private mail setting :-)
13:39 markus-k_ joined #git
13:39 kexmex joined #git
13:39 kurkale6ka joined #git
13:39 SporkWitch sonOfRa: where's the info on how to set that stuff up? i'm curious
13:40 a_thakur_ joined #git
13:40 sonOfRa https://git-scm.com/docs/git-config#_includes is a good reference
13:40 SporkWitch thanks :)
13:41 ivan_on_trac joined #git
13:41 jackrandom joined #git
13:41 sonOfRa https://gist.github.com/sonOfRa/ff481530c1214408584f846051f53ca7 here's my .gitconfig to see it "in action"
13:42 visual joined #git
13:42 visual henlo gits
13:43 visual nvm
13:44 Es0teric joined #git
13:45 SporkWitch sonOfRa: that's actually looking like the perfect solution, probably preferable to conditionals for any given setting (potential for bloat; by segregating it into specific files it enforces some semblance of organization)
13:49 guampa joined #git
13:50 AaronMT joined #git
13:50 Snugglebash joined #git
13:50 TheCycoONE joined #git
13:51 aca20031 joined #git
13:51 a_thakur joined #git
13:52 SporkWitch grrr, apparently the *buntu ppa is still on 2.11 :'(
13:53 sonOfRa Gentoo just got 2.13.0 in its unstable branch today :)
13:53 Vampire0 SporkWitch, build it yourself, easy as pie :-)
13:53 Cabanossi joined #git
13:54 Vampire0 SporkWitch, I use 2.12.1 on an Ubuntu Quantal (don't ask)
13:54 SporkWitch Vampire0: yeah, but then i'm stuck managing things manually from that point on; it's rare that there's an update with a feature that i REALLY want.  The only reason i'd even bothered adding the git-core PPA in the first place was because the ubuntu default didn't support the setting for always showing commit sigs
13:56 SporkWitch it may just be the yakkety side, since it's non-LTS; might just sit down and throw 17.04 on this thing and see if it's in that one (and see if it fixes some of the asinine stuff they did with 16.04 and 16.10 lol)
13:56 notebox joined #git
13:58 p4trix joined #git
13:58 telephone joined #git
13:58 telephone joined #git
13:59 h12o joined #git
14:01 sunri5e joined #git
14:01 Vampire0 SporkWitch, well, you can return to the pre-packed version anytime after they released the version you want to have
14:01 justin2 joined #git
14:02 SporkWitch yeah, it's just a matter of having to track it all; i use kubuntu because i'm LAZY lol
14:03 SporkWitch i could go back to arch or gentoo any time, i just don't want to put the time and effort in lol
14:03 AndreasLutro joined #git
14:04 xall_ joined #git
14:04 a_thakur joined #git
14:05 synthroi_ joined #git
14:05 livingstn joined #git
14:06 lxnr joined #git
14:07 crose joined #git
14:08 matsaman joined #git
14:09 Jojo joined #git
14:10 ivan_on_trac_ joined #git
14:10 Sound_ joined #git
14:11 xanadu_ joined #git
14:15 _ikke_ yay, @{U} is now working
14:15 _ikke_ (2.13)
14:17 ivan_on_trac joined #git
14:17 northfurr joined #git
14:18 ivan_on_trac What does this '--branches' option mean in this command? git filter-branch --env-filter '   ' --tag-name-filter cat - --branches --tags
14:19 _ADN_ joined #git
14:19 Nilesh___ joined #git
14:19 Murii joined #git
14:21 mdk Hi, I'm trying to draw a separation between a main project and an independent subproject (Just so ansible can detect changes for this particular subproject and not uselessly restart its daemon each time the main project is modified) but I'm struggling to choose between an orphan branch and a whole new repo, any hint to help my choosing? Maybe someone wrote something about this but I didn't found it
14:21 mostlybadfly joined #git
14:21 denisMone joined #git
14:23 jost joined #git
14:24 nedbat mdk: orphan branch sounds horrible.
14:24 mdk nedbat: hi, any argument?
14:25 nedbat mdk: no one will expect that your git repo is really a two-headed beast with completely distinct files. what's the advantage to an orphan branch?
14:26 PHPanos joined #git
14:26 mdk nedbat: The fact that it's in a single repository
14:26 mdk nedbat: I see no argument toward having two repositories
14:26 visual hey, can somebody explain this situation, im losing my mind
14:27 visual http://prntscr.com/f68ash
14:27 visual how can those 2 statements co-exist
14:27 Vampire0 _ikke_, as synonym for u or with a different meaning?
14:27 SporkWitch mdk: !submodule
14:27 gitinfo mdk: git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules
14:28 mdk SporkWitch: Thanks, but my main project have no dependencies to the subproject, so there is no use for a sumbodule here (I think)
14:29 SporkWitch mdk: then there's probably no reason to keep the subproject in the working directory of the main project, and thus should be split off into a separate repo
14:29 Vampire0 ivan_on_trac, man git filter-branch resp. man git rev-list
14:29 gitinfo ivan_on_trac: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
14:29 gitinfo ivan_on_trac: the git-rev-list manpage is available at https://gitirc.eu/git-rev-list.html
14:29 nedbat mdk: what's good about one repo? it's not hard to edit code in two repos.
14:30 livingst_ joined #git
14:30 nedbat mdk: in fact, how would you even use the orphan branch? You'd need two working trees on the same repo, so each could be on a separate branch?
14:30 mdk SporkWitch: I got your point, but why should I tell my dev team to clone a bunch of repo? Cloning a single "company" repository having different non-dependent projects in it looks more "natural"
14:30 nedbat mdk: then why not just make them separate directories in the same repo? Why an orphan branch?
14:30 SporkWitch mdk: why would they want to clone anything other than what they need to work on?
14:31 mdk SporkWitch: good point again as I think they won't need to work on every sub-projects
14:31 mdk And a good point I just though: fine-tuning permissions
14:31 SporkWitch mdk: you should have some central system for managing this stuff, whether it's bitbucket, gitlab, etc.  The devs just pull down the repos they're assigned to work on
14:31 SporkWitch which is where stuff like bitbucket and gitlab come in
14:31 nadim_ left #git
14:31 kurkale61 joined #git
14:31 SporkWitch i really like bitbucket, but it's pricey if your team is larger than 10 people
14:32 mdk nedbat: Yep I'd typically work on two distinct directories to avoid "git checkout" having a huge amout of work to switch between orphan branches
14:32 mdk nedbat: so I got your argument
14:32 Vampire0 mdk, you should never follow the SVN ridiculousness of having multiple repos in one root. Every indiviual project should be one individual git repository
14:32 mdk SporkWitch: (we're using gitlab)
14:32 SporkWitch ^
14:33 SporkWitch mdk: there you go, then.  you've already got what you need.  break it into logical repos, assign permissions by project team, devs pull (and only can pull) those they need to.  problem solved
14:33 ahrs joined #git
14:33 Vampire0 mdk,  if you need multiple ones of them that depend on each other, you can always use one of !subr
14:33 gitinfo mdk: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
14:33 leeN joined #git
14:33 iLembus joined #git
14:33 govg joined #git
14:33 netj joined #git
14:34 Vampire0 visual, pretty normal
14:34 mdk nedbat, SporkWitch, Vampire0: Thanks for sharing your point of view, I'll mature them in my mind but I think I'm convinced to split it in multiple repositories.
14:34 ablackack joined #git
14:34 mdk Thanks for the feeback! Highly appreciated, have a good day everyone
14:34 Vampire0 visual, there are 5 commits that are in master that are not in repair, but there are no commits in repair that are not in master. Hence repair is 5 commits behind, but there is nothing to merge from repari to master
14:35 Vampire0 cu mdk
14:35 d10n-work joined #git
14:35 ableto joined #git
14:35 visual Vampire0: i see, thank you
14:36 TbobbyZ joined #git
14:37 LionsMane joined #git
14:37 Vampire0 visual, yw
14:37 Gsham joined #git
14:38 lindenle joined #git
14:38 tlaugier joined #git
14:39 alffonsse joined #git
14:39 alffonsse left #git
14:40 sbrandner_wyton joined #git
14:40 zivester joined #git
14:41 rkazak joined #git
14:41 miha_S7_ joined #git
14:41 northfurr joined #git
14:45 MDA2 joined #git
14:47 ablackack joined #git
14:47 nivag joined #git
14:48 ivan_on_trac Vampire0: I could not find a clear answer in the manual. Will this command change in all branches or just in the current branch?
14:50 gusnan joined #git
14:50 gusnan joined #git
14:50 Dougie187 joined #git
14:51 manuelschneid3r joined #git
14:51 osse ivan_on_trac: it will change the branches/commits you give it as argument
14:52 Vampire0 ivan_on_trac, in all branches and tags as you told it to
14:53 xanadu_ joined #git
14:53 Vampire0 ivan_on_trac, pretty clear to me: Pretend as if all the refs in refs/heads are listed on the command line as <commit>. If <pattern> is given, limit branches to ones matching given shell glob. If pattern lacks ?, *, or [, /* at the end is implied.
14:56 xall_ joined #git
14:56 ivan_on_trac Vampire0:I performed as such. However, it only changed the author of the current branch commits. Alias this command is very time consuming. It caused some instabilities after that.
14:56 ivan_on_trac git filter-branch --env-filter '   ' --tag-name-filter cat - --branches --tags https://help.github.com/articles/changing-author-info/
15:00 ronator joined #git
15:01 al-damiri joined #git
15:02 phinxy joined #git
15:03 fatalhalt joined #git
15:04 roelmonn_ joined #git
15:07 ravndal joined #git
15:07 ash_workz joined #git
15:08 Breath_ joined #git
15:11 govg joined #git
15:12 cdg joined #git
15:14 macrover joined #git
15:16 Tobbi joined #git
15:17 Snugglebash joined #git
15:20 fatalhalt joined #git
15:20 MattMaker joined #git
15:21 Breath_ joined #git
15:21 MattMaker joined #git
15:22 MattMaker joined #git
15:23 MattMaker joined #git
15:24 MattMaker joined #git
15:25 TomyLobo joined #git
15:26 kexmex joined #git
15:27 a_thakur joined #git
15:27 jackrandom joined #git
15:28 Breath_ joined #git
15:28 kelvah joined #git
15:29 fatalhalt joined #git
15:29 hobodave joined #git
15:31 brent__ joined #git
15:31 durham_ joined #git
15:31 User458764 joined #git
15:31 bitmod joined #git
15:32 brent___ joined #git
15:33 durham_ joined #git
15:34 orbyt_ joined #git
15:34 livingstn joined #git
15:35 jacob123 joined #git
15:37 Gustavo6046 joined #git
15:39 roelmonnens joined #git
15:40 Introoter joined #git
15:41 snowalpaca joined #git
15:41 aw1 joined #git
15:41 phinxy joined #git
15:41 Stumbler joined #git
15:43 kyan joined #git
15:43 prg3 joined #git
15:43 madewokherd joined #git
15:44 TbobbyZ_ joined #git
15:44 fatalhalt joined #git
15:44 orbyt_ joined #git
15:44 bernd27 joined #git
15:46 j08nY joined #git
15:47 synthroid joined #git
15:48 TbobbyZ joined #git
15:48 Hunter1_ joined #git
15:48 Starky joined #git
15:49 synthroi_ joined #git
15:49 shmup left #git
15:51 jnewt joined #git
15:52 robotroll joined #git
15:53 kiltzman joined #git
15:56 TheSimonator joined #git
15:58 Snugglebash joined #git
15:58 cstratak joined #git
15:58 fatalhalt joined #git
15:59 ash_workz joined #git
16:02 aard joined #git
16:03 phinxy joined #git
16:05 kiltzman joined #git
16:05 kiltzman joined #git
16:06 perlpilot joined #git
16:07 mel00010 joined #git
16:07 kiltzman joined #git
16:07 dreiss joined #git
16:08 kiltzman joined #git
16:08 davimore joined #git
16:10 miha_S7_ joined #git
16:11 sarri joined #git
16:11 sarri joined #git
16:12 Starky joined #git
16:12 bitmod joined #git
16:12 fatalhalt joined #git
16:14 lowercaseman joined #git
16:15 gugah joined #git
16:16 TheSimonator joined #git
16:17 spm_draget So, I found this trick to check if git treats a file as a binary file: git merge-file /dev/null /dev/null file. It will error with 'cannot merge binary file' if git treats it like this.
16:17 kiltzman joined #git
16:17 spm_draget But could it be possible that it ignored the entries from .gitattributes? I set a file to binary in my attributes, and yet somehow lineendings got mangled.
16:18 jagob joined #git
16:22 fatalhalt joined #git
16:23 Cabanossi joined #git
16:27 Hunter1_ joined #git
16:29 Starky joined #git
16:29 rominronin joined #git
16:30 j08nY joined #git
16:30 nitric joined #git
16:30 overlord_tm joined #git
16:31 peepsalot joined #git
16:32 bwn joined #git
16:33 Tobbi joined #git
16:35 cam27 joined #git
16:37 Ryanar joined #git
16:38 pwnz0r joined #git
16:42 [LVK] joined #git
16:43 eehackr joined #git
16:43 orbyt_ joined #git
16:43 cebula joined #git
16:44 lafleurdubien joined #git
16:44 [LVK] I'm having a bit of a problem with my work computer who crashes sh.exe (on Windows) when trying to rebase, with a stack overflow, when using 64-bit or running with tracing off. Anyone experienced this and have some tips about what could be wrong?
16:44 livingstn joined #git
16:45 Hunter1_ joined #git
16:46 Vampire0 ivan_on_trac, it should change it for all local branches and tags. You could maybe try --all instead
16:46 Gustavo6046_ joined #git
16:47 durham_ joined #git
16:47 Es0teric joined #git
16:48 imack joined #git
16:49 nowhereman joined #git
16:50 yqt joined #git
16:50 Gustavo6046_ joined #git
16:50 Gurkenglas joined #git
16:51 kiwieater joined #git
16:51 northfurr joined #git
16:53 SteffanW joined #git
16:57 durham_ joined #git
16:57 eehackr joined #git
16:59 orbyt_ joined #git
17:00 orbyt_ joined #git
17:01 endiruna joined #git
17:02 bitmod joined #git
17:03 Es0teric joined #git
17:04 xall_ joined #git
17:09 thebope joined #git
17:09 imack joined #git
17:10 MonkOfCity joined #git
17:11 kelvah joined #git
17:12 ZexaronS joined #git
17:12 prg3 joined #git
17:13 raspado joined #git
17:15 User458764 joined #git
17:17 TomyLobo2 joined #git
17:18 ash_workz joined #git
17:21 orbyt_ joined #git
17:24 macrover joined #git
17:24 MattMaker joined #git
17:25 jwmann joined #git
17:26 gopar joined #git
17:26 rmesta joined #git
17:26 rmesta left #git
17:27 b1tchcakes joined #git
17:27 Tobbi joined #git
17:28 ssarah joined #git
17:28 sbulage joined #git
17:29 mikecmpbll joined #git
17:29 synthroid joined #git
17:30 notebox joined #git
17:30 rominronin joined #git
17:30 aavrug joined #git
17:31 duderonomy joined #git
17:33 kiltzman joined #git
17:33 macrover left #git
17:34 catsup joined #git
17:37 nixjdm joined #git
17:37 joshszep joined #git
17:38 Cabanossi joined #git
17:39 eehackr joined #git
17:39 jacob123 joined #git
17:39 fission6 joined #git
17:40 cam27 joined #git
17:40 miha_S7_ joined #git
17:41 cliluw joined #git
17:43 blackwell joined #git
17:44 Gsham joined #git
17:44 Tobbi joined #git
17:45 mizu_no_oto joined #git
17:48 TomyLobo joined #git
17:49 orbyt_ joined #git
17:49 LionsMane joined #git
17:53 miczac joined #git
17:54 Gustavo6046_ joined #git
17:54 Dougie187 left #git
17:57 patarr_ joined #git
17:57 livingstn joined #git
17:58 patarr_ How do I address this - let's say I added a commit to my local. But in the meantime, the branch on the remote server has been updated with a new commit as well. How do I make my commit "on top" of the one the origin?
18:00 aavrug_ joined #git
18:00 misosoup joined #git
18:00 ivan_on_trac Vampire0: I spent 03 days running just for the master branch. Running again with "--all" is scaring me. :(
18:00 livingst_ joined #git
18:01 Gsham joined #git
18:01 Gustavo6046 joined #git
18:03 thebird joined #git
18:06 Gustavo6046_ joined #git
18:06 Sasazuka joined #git
18:06 xoge joined #git
18:06 druonysus joined #git
18:09 kadoban patarr_: fetch and then rebase your branch on top of the remote one
18:09 mda1 joined #git
18:09 demonking joined #git
18:09 kadoban (probably obvious warning: changes history, so don't do it if you've already shared your commit with peers)
18:11 paul424 joined #git
18:11 orbyt_ joined #git
18:11 Gustavo6046 joined #git
18:17 Gustavo6046_ joined #git
18:19 miha_S7_ joined #git
18:21 kfoonamalik joined #git
18:21 raspado joined #git
18:21 livingstn joined #git
18:21 Starky joined #git
18:24 Hunter1_ joined #git
18:27 tyreld joined #git
18:27 Atm0spher1c joined #git
18:28 XenophonF joined #git
18:29 ash_workz joined #git
18:32 livingstn joined #git
18:33 mel00010 joined #git
18:36 Altiare joined #git
18:36 orbyt_ joined #git
18:37 Atomic_qTAx7 joined #git
18:40 pratch joined #git
18:41 mjuszczak joined #git
18:41 cdown joined #git
18:41 Atomic_qTAx7 joined #git
18:42 XenophonF joined #git
18:43 synthroi_ joined #git
18:43 PHPanos joined #git
18:44 ertes joined #git
18:45 Jitta joined #git
18:47 User458764 joined #git
18:48 Atomic joined #git
18:49 spm_draget left #git
18:50 tymczenko joined #git
18:52 tymczenko joined #git
18:52 Dougie187 joined #git
18:53 nixjdm joined #git
18:55 cmyers left #git
18:58 fatalhalt joined #git
18:58 hobodave_ joined #git
18:59 livingst_ joined #git
19:02 rominronin joined #git
19:04 notebox joined #git
19:04 mist1231 joined #git
19:04 MattMaker joined #git
19:04 dvaske joined #git
19:04 BackEndCoder joined #git
19:04 mist1231 hey guys, i accidentally committed from somewhere that did not have access to push to git, can i undo a commit?
19:05 demonking git reset --hard <commitid>
19:06 jackrandom joined #git
19:07 mist1231 thanks, that did it demonking
19:08 kadoban mist1231: There's no real reason to undo a commit for that reason. You can transfer git commits just as files essentially by making a copy of the repo on a flash drive or any other way, you can use 'git bundle', etc. Though what you did may be easier.
19:08 Peuc joined #git
19:10 mist1231 you live and you learn kadoban =)
19:10 mist1231 the idea of scp'ing it did occur to me
19:10 pbandark joined #git
19:11 kadoban If you have SSH access, you can just directly fetch from that repo as well
19:12 h12o joined #git
19:13 Es0teric joined #git
19:14 livingstn joined #git
19:14 ssarah joined #git
19:14 Doginal joined #git
19:15 ShekharReddy joined #git
19:16 mkoskar joined #git
19:16 orbyt_ joined #git
19:16 Atomic left #git
19:16 m0viefreak joined #git
19:17 bronson joined #git
19:20 durham_ joined #git
19:20 TheSimonator joined #git
19:23 Snugglebash joined #git
19:25 jas4711 joined #git
19:27 cwre joined #git
19:27 joakimk joined #git
19:27 kyan joined #git
19:28 Sound joined #git
19:28 Sound joined #git
19:29 _ADN_ joined #git
19:29 Doginal joined #git
19:31 tymczenko joined #git
19:33 scoobertron joined #git
19:34 synthroid joined #git
19:34 Acerific joined #git
19:35 vmonteco joined #git
19:35 vmonteco Hello! :)
19:37 vmonteco I've been using git for years and I have no problem using it. (I know most of the usual tasks to do with it, add, commit, branch, push, fetch, pull, etc...) But some things remain obscur to me, since what I know is usually enough to me (so, no real need for me to improve my skills). Yet, I don't like not mastering it and I'd like to know if there are exercices I should try to understand most of it and
19:37 vmonteco practice in a deeper level. :)
19:38 phinxy joined #git
19:38 kadoban Hanging out here and answering weird questions is a good set of exercises :)
19:39 vmonteco kadoban: Haha, I wouldn't like to give bad advices and screw other's work. :D
19:40 kadoban People will usually pipe up if you do, it's not a big worry.
19:40 Logicgate joined #git
19:40 Logicgate well, I screwed up
19:40 Logicgate lost my HEAD
19:40 Logicgate did a force push on last commit
19:40 Logicgate how do I fix this
19:41 vmonteco kadoban: ^^^ I wouldn't risk myself on trying to solve this one for instance. :)
19:41 kadoban Haha
19:41 kadoban Logicgate: Can you be clearer on exactly what you did, and what's wrong?
19:42 cjohnson vmonteco: the bulk of it is just knowing how to ask clarifying questions
19:42 vmonteco kadoban: But if I had to guess, could git reset HEAD~1 be something to try?
19:42 cjohnson and getting more details
19:42 rickumali joined #git
19:42 cjohnson then try to replicate the issue locally if you've never experienced it
19:42 vmonteco cjohnson: That's often an useful skill!
19:42 Logicgate kadoban, I forced pushed a commit and now the repo lost its head.
19:43 kadoban Logicgate: Did you not mean to force push? In what sense has the repo lost its head? What behavior are you seeing that's wrong?
19:43 Logicgate Well now when I'm trying to use it as a composer package it gives me a fatal error
19:44 Hunter1_ joined #git
19:44 kadoban What's a composer package? (and what error?)
19:45 cjohnson php package manager
19:45 cjohnson shouldn't really have any relevance to the underlying git issue
19:45 gugah joined #git
19:46 Logicgate kadoban: http://puu.sh/vLWvJ/be75c622b2.png
19:47 _ikke_ ls .git/refs/HEAD
19:48 fiter joined #git
19:48 jeffreylevesque joined #git
19:48 Logicgate it's there _ikke_
19:49 _ikke_ Well, it shouldn't be
19:49 finalbeta joined #git
19:49 Logicgate actually it's not
19:49 Logicgate you're right
19:49 _ikke_ ok
19:49 _ikke_ and ls -l .git/HEAD
19:49 Doginal joined #git
19:50 Logicgate that's there.
19:50 _ikke_ permissions
19:50 Logicgate -rw-r--r--
19:51 _ikke_ and owner/group?
19:51 _ikke_ is your user the owner?
19:51 cwre joined #git
19:52 Logicgate composer is fetching the package on a vm it's a tough one to answer
19:52 nixjdm joined #git
19:52 cha18 joined #git
19:53 roelmonnens joined #git
19:53 Cabanossi joined #git
19:54 Logicgate Damn it worked
19:54 Logicgate nvm!
19:54 _ikke_ What was it?
19:55 Logicgate I have no idea, just relogged into my vm
19:55 Logicgate and it worked
19:55 Logicgate maybe a perm thing
19:57 eehackr joined #git
19:57 cdown joined #git
19:58 misosoup joined #git
19:59 Logicgate left #git
19:59 mikecmpbll joined #git
20:00 gopar joined #git
20:01 overlord_tm joined #git
20:01 Levex joined #git
20:02 patarr joined #git
20:03 finalbeta joined #git
20:06 de-vri-es joined #git
20:07 Gurkenglas joined #git
20:10 cdg joined #git
20:11 sbasso joined #git
20:13 a_thakur joined #git
20:15 synthroi_ joined #git
20:17 Bennux joined #git
20:17 Kobazz left #git
20:18 bronson joined #git
20:21 orbyt_ joined #git
20:21 dave0x6d joined #git
20:27 f3r70rr35f joined #git
20:28 hahuang65 joined #git
20:29 druonysus joined #git
20:32 AaronMT joined #git
20:32 rominronin joined #git
20:34 Jackneilll joined #git
20:34 schleppel joined #git
20:35 joshszep joined #git
20:35 Jackneillll joined #git
20:35 ryouma joined #git
20:36 ryouma i want a diff from one revision to another in file myfile.  why this not work?  git diff 321013dc786c1ff0a586c63de041afdd34ae7111..9d392d2e30d4c67f00ea991901109aadfc61c3e2 -- myfile
20:36 ryouma hmm, must be user error
20:36 joshszep joined #git
20:37 rickumali that syntax looks good, ryouma
20:37 joshszep joined #git
20:38 ryouma thansk
20:39 synthroid joined #git
20:42 gopar joined #git
20:42 tunekey joined #git
20:43 AlexKvazos joined #git
20:44 PHPanos joined #git
20:48 robertparkerx joined #git
20:49 theoceaniscool joined #git
20:49 Phylock joined #git
20:52 nixjdm joined #git
20:53 Jackneill joined #git
20:56 miczac joined #git
20:56 zf` joined #git
20:58 zf` I ran git pull --rebase, but I was interrupted due to my email/name not being set; now, having set them, what should I do to continue the action?
20:59 ertesx joined #git
21:00 ryouma i have a few revisions of a shell script that work well, but the ones before and after do not.  is git bisect useful?
21:00 ryouma or is bisect only useful for when you have good and then bad?
21:03 kadoban ryouma: Depends, what are you trying to find out exactly?
21:04 git232 joined #git
21:04 aidalgol joined #git
21:05 Es0teric joined #git
21:05 cstratak joined #git
21:05 linux_dr joined #git
21:05 joshszep_ joined #git
21:06 linux_dr How do I push remote branches to a different remote server, without making local tracking versions of each one?
21:06 miha_S7_ joined #git
21:07 git232 Hey all, question about best practices: We maintain Production, QA and Dev branches, and work with feature branches per issue. As a feature makes its way through dev, qa and to production, what is the best way to keep each main branch clean?
21:07 linux_dr i.e., I would like to push all branches from upstream to origin… both are remote bare repos
21:07 git232 Right now, we merge into Dev, and then merge the dev branch into qa, and qa into master. But that is making a mess
21:08 caper joined #git
21:08 aard joined #git
21:10 ryouma kadoban: well, the script takes time to run, and i have an approximate idea of which revisions might be good, and i don't suppose there is an effciient search algorithm, because it is only a few revisions, but thought i'd ask if something could be automated for that
21:10 ryouma i.e. i suppose it is not possible
21:11 perlpilot git232: what makes it a mess?
21:11 alexandre9099 joined #git
21:11 MattMaker joined #git
21:11 zf` ah, I did git checkout master / git pull --rebase and it workded
21:11 zf` left #git
21:11 kadoban ryouma: Well, I don't really follow what you know and are trying to find out. Are you trying to find the edges of an island of "good" commits or something?
21:12 ryouma kadoban: yeah
21:12 ryouma i think
21:12 kadoban ryouma: I think you could do that as two separate bisects
21:13 lafleurdubien If I have an existing directory with multiple files and subdirectories, and I'd like to create a bare repository for it to track the changes, what is the best way to get the existing files into the repo so that they'll be included for any "git clone"s of this repo on local machines?
21:13 peepsalot joined #git
21:14 ryouma kadoban: not sure, all i know is git bisect start and then say whether it's good or bad or something
21:15 bernd27 joined #git
21:16 h12o joined #git
21:16 git232 @perpilot: Master is filled with merge commits, and looking at dev vs master, master is "2 commits ahead" even though those are just merge commits
21:16 kadoban If nothing else, start with "good" in the island a known place, and bad after the island, bisect that. Then reverse the test and start with "good" in the broken part before the island and "bad" at the known place in the island and bisect that.
21:16 LaptopBrain joined #git
21:16 kadoban I don't know if bisect can handle the bad being before the good, I've never used it like that. But it should work that way regardless ^
21:17 git232 But opening PRs into dev, qa and master for the same feature branch also doesn't make sense to me?
21:17 perlpilot git232: then I would suggest you use rebase for qa and master instead of merge.
21:17 livingstn joined #git
21:17 perlpilot git232: it might make sense if the PR is how you indicate "success"
21:18 ryouma kadoban: i have no knowledge of any good revisions
21:18 kadoban "i have a few revisions of a shell script that work well,"
21:18 ryouma maybe i need to automate the goodbad and run on every revision
21:18 ryouma kadoban: yes, i know i h ave them,. but i do not know which ones they are
21:19 kadoban Then yeah it seems hard for there to exist a better algorithm than just trying every one
21:19 git232 @perpilot: Okay. We don't really need PRs for each main branch like that right now, but I could see the usefulness. We use releases to track most of the features going into Master
21:19 inovas joined #git
21:19 git232 So I would do `git rebase qa dev` and then `git rebase master qa`?
21:19 git232 and push my local stuff?
21:21 cdown joined #git
21:21 Celelibi joined #git
21:22 prg3 joined #git
21:22 perlpilot git232: something like that.  Have you read !progit?
21:22 gitinfo git232: [!book] 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 !parable
21:22 ryouma kadoban: i figured, but i heard that you can set up a script to run on each tested revision in bisect, so i thought i could do something like that but for every revision.  dunno if git can do that.
21:22 git232 I haven't, but I will check it out. Currently moving from having managed a project by myself in git for 1.5 years to a team, so all this info is useful =)
21:23 blackwell joined #git
21:23 cdown joined #git
21:24 kadoban ryouma: You can in bisect, but it does a binary search, not a linear one. I think you can trick filter-branch into it, though that's a bit sketchy since it's easy to accidentally change things. You could just do a bash (or other) script based on maybe 'git log' or something lower level, that's probably your best bet
21:24 lafleurdubien If I have an existing directory with multiple files and subdirectories, and I'd like to create a bare repository for it to track the changes, what is the best way to get the existing files into the repo so that they'll be included for any "git clone"s of this repo on local machines?
21:24 Starky joined #git
21:25 perlpilot kadoban: ryouma should be able to use git bisect as you first described, only 3 times instead of 2.   The first one would be to locate a single good commit in the middle of the bad ones.
21:25 ryouma kadoban: sounds like real work.  i might just keep poking around :/.  (i don't even remember the command to check out a version without changing head right now.  git show ... > file or somethign maybe.)
21:26 nod joined #git
21:26 ryouma perlpilot: what if it skips over the good ones?
21:26 kadoban perlpilot: A binary search can't usually do that. It goes based on them being ordered. If there is 1 good commit in a range of 50, you have no guarantee of being able to find it without testing all of them.
21:26 lafleurdubien Would it be better to go to the directory of the existing files/subdirectories, do a git init/git add/git commit and then do a git clone --bare of that repo? Or would it be better to do mkdir repo && cd repo && git init --bare and then manually copy the files to the bare repo and git add/git commit them? Or third option that I'm not aware of?
21:27 kadoban perlpilot: Think about the first test. Say you test the middle commit and get "it's bad". Now which range do you search in? It has to be both, right?
21:27 cjohnson lafleurdubien: well, you want one working copy, and one bare repo
21:27 cjohnson so it seems to me you're already partway toward one of those options
21:27 perlpilot eh, maybe so ... I've been fasting all day, so my brain might be a tad wonky  :)
21:27 cjohnson I would git init the existing WC and add/commit, then clone to a new repo
21:28 kadoban It was a good idea though
21:34 livingstn joined #git
21:34 nod joined #git
21:35 askb joined #git
21:37 TheSimonator joined #git
21:38 Cabanossi joined #git
21:38 rasto joined #git
21:39 lafleurdubien cjohnson: I've tried that and I keep having issues with permissions when it comes time to push changes from local to remote. does it matter what the permissions are for the original files if I'm pushing to the bare repo?
21:39 cjohnson git only tracks certain permissions like +X
21:39 cjohnson +x
21:39 cjohnson you will obviously need permissions to write to the remote if it's on the same filesystem
21:41 caper_ joined #git
21:41 lafleurdubien so it should matter who the owner of the existing files is as long as the user I push with has write access to the repo?
21:41 roelmonnens joined #git
21:41 lxnr joined #git
21:41 lafleurdubien it *shouldn't* matter I meant to say
21:42 kadoban Yes. Git doesn't really care as long as it can read and write the files it needs to.
21:43 lafleurdubien thanks kadoban and cjohnson !
21:44 pijiu joined #git
21:46 Acerific joined #git
21:47 regedit joined #git
21:48 overlord_tm joined #git
21:48 telephone joined #git
21:48 telephone joined #git
21:48 foreal joined #git
21:49 h12o joined #git
21:50 scoobert1on joined #git
21:50 orbyt_ joined #git
21:52 gnixev joined #git
21:57 Dougie187 left #git
21:58 bfig joined #git
21:59 bfig i accidentally removed a directory in git using git rm -r <dir>. I just wanted to remove it from tracking. How can I bring it back?
21:59 bfig (without having it tracked)
22:01 kadoban bfig: 'git checkout HEAD -- <dir>' and then 'git rm -r --cached <dir>' should work I think. There may be some case that doesn't handle well that I'm not thinking about, make sure you know what those do.
22:01 romank joined #git
22:02 bfig kadoban: thanks, I'll try now
22:02 bfig if I do rm -r without cached I remove all files, right?
22:04 ZyX-I joined #git
22:04 ryouma left #git
22:04 domse joined #git
22:04 kadoban Yes, 'git rm' removes the files themselves as well as from the index (without --cached)
22:05 utrack joined #git
22:05 Masber joined #git
22:05 rominronin joined #git
22:05 orbyt_ I have some changed files in branch1. I'd like to save those changes without commiting, and checkout another branch called branch2. When I come back to branch1, I want to restore the previously mentioned changes.
22:05 orbyt_ I'm pretty sure this is done via git stash, but I dont know exactly how to use it in this case
22:06 orbyt_ Do I just git stash save on branch1, then when I come back to it execute git stash apply?
22:07 robertparkerx joined #git
22:07 YuGiOhJCJ joined #git
22:07 dsdeiz joined #git
22:08 kadoban orbyt_: Sounds right. 'git stash save' is the default, so you can just say 'git stash'
22:08 orbyt_ Right. Will give it a go
22:08 kadoban By the way, you can also just !float changes usually, if that's easier. But it can get confusing or complicated to avoid commiting the wrong things.
22:08 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
22:09 Masber_080 joined #git
22:10 orbyt_ Alright, thank you.
22:11 Karazhan joined #git
22:12 h12o joined #git
22:13 Masber_080 joined #git
22:13 fission6 accidentally pushed one commit to master, how do i undo this?
22:13 druonysus joined #git
22:13 leeN joined #git
22:14 a_thakur joined #git
22:14 kadoban Do you want to modify the published history to remove it, or revert and push the new commit, or?
22:14 cbreak joined #git
22:17 shinnya joined #git
22:17 Levex joined #git
22:18 fission6 i want to do the right thing in the sense it was pushed to master and someone else may have grabbed it
22:18 fission6 lucky its just one commit
22:18 fission6 so i want to undo it in master
22:19 bronson joined #git
22:19 kadoban fission6: It sounds like you want to create a new commit that undoes the accidental one and then push that then? That's simple, that's 'git revert <thecommit>' and then push
22:19 fission6 ya
22:20 fission6 gonna do just that, thanks kadoban
22:20 kadoban Both commits will be visible in history, but the changes will be undone
22:20 kadoban 'welcome. Good luck
22:21 romank joined #git
22:23 h12o joined #git
22:27 regedit if i have 'foo-fix-branch' and i merged it back into 'dev' branch only locally (did not push yet) can i drop this merge commit and put both branches back to the state they were before merging?
22:28 kadoban regedit: Sure. Note that 'foo-fix-branch' didn't change at all when you merged it into dev
22:29 regedit oh right come to think of it
22:29 regedit so how do i just move 'dev' back to before the local merge?
22:29 miha_S7_ joined #git
22:30 thebope joined #git
22:30 kadoban regedit: Was it the last thing you did (on the dev branch anyway) ?
22:30 regedit yes
22:30 regedit well....actually...
22:30 regedit i already attempted a git revert -m 1
22:30 kadoban And it was actually a merge commit, not a fast-forward, right?
22:31 kadoban Ah. Did it work, or is it in progress or anything?
22:31 regedit hang on what if i drop my local 'dev' and just pull it again from origin? problem solved?
22:32 kadoban Depending on what you mean by "drop", that'll probably work. But you don't have to. You can use 'git reset --hard' to specify what commit you want a branch to point to, for example
22:33 kadoban 'git checkout dev && git reset --hard @{u}' would change to it exactly match the upstream branch, if that sounds correct.
22:33 regedit sounds good, shall i try that? worst case i can still delete the local branch & re-pull as i suggested afterwards (right?)
22:34 kadoban Yes, assuming you have no local uncommited work and nothing in that branch except what you want to nuke, except the upstream stuff, that should be safe enough
22:34 kadoban !backup is never a bad idea either
22:34 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
22:35 Tobbi joined #git
22:36 regedit lol didn't backup
22:36 regedit but i think it looks good now
22:36 kadoban 's all good. reset --hard is fairly dangerous in general, but in your case there should be little risk
22:36 regedit gitk appears to be in the state that i'm imagining it would be if i dropped my local branches and pulled them again
22:37 kadoban Cool
22:37 regedit thanks muchly ????
22:37 manuelschneid3r joined #git
22:37 kadoban Anytime
22:42 tourdownunder joined #git
22:43 nod joined #git
22:43 h12o joined #git
22:48 Zialus joined #git
22:48 tourdownunder joined #git
22:49 romank joined #git
22:51 ojacobson joined #git
22:51 gopar joined #git
22:51 basdb joined #git
22:51 gopar joined #git
22:53 Cabanossi joined #git
22:59 druonysus joined #git
23:02 dsdeiz joined #git
23:04 h12o joined #git
23:04 dendazen joined #git
23:11 romank joined #git
23:13 joshszep_ joined #git
23:14 cam27 joined #git
23:14 joshszep_ joined #git
23:16 pks joined #git
23:17 tmg joined #git
23:20 njbair joined #git
23:22 Levex joined #git
23:25 Kaisyu joined #git
23:25 sword joined #git
23:26 romank joined #git
23:26 linux_dr How do I push all remote branches from one remote to another?
23:26 acln joined #git
23:27 dirtyroshi joined #git
23:29 roelmonnens joined #git
23:29 rewt the way i did it was check out all branches from A and push them all to B
23:30 xpk joined #git
23:30 xpk joined #git
23:31 lafleurdubien I have a git "post-receive" hook thats failing with the message "remote: error: unable to unlink old 'filenamehere' (Permission Denied)" for every single file - what am I doing wrong here??
23:31 gopar joined #git
23:33 gopar joined #git
23:36 rominronin joined #git
23:36 gopar joined #git
23:40 Noldorin joined #git
23:40 gopar joined #git
23:40 kadoban lafleurdubien: The permissions aren't correct for the user the hook is running as, probably.
23:40 kadoban lafleurdubien: What is the hook doing? Why is it deleting files?
23:41 MattMaker joined #git
23:41 dsdeiz joined #git
23:41 dsdeiz joined #git
23:41 aw1 joined #git
23:43 TbobbyZ_ joined #git
23:50 bronson joined #git
23:53 gopar joined #git
23:54 sunri5e joined #git
23:57 miha_S7_ joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary