Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-29

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

All times shown according to UTC.

Time Nick Message
00:00 Es0teric so @~5 or @~10 wouldnt work because this merge merges everyting
00:01 otiose joined #git
00:02 dsdeiz joined #git
00:02 dsdeiz joined #git
00:05 dre__ joined #git
00:05 snthsnth joined #git
00:05 ajpiano_ joined #git
00:05 cads joined #git
00:05 mutex_ joined #git
00:06 CustosLimen joined #git
00:07 vamiry joined #git
00:09 roelmonnens joined #git
00:09 druonysus_ joined #git
00:10 Vampire0 Es0teric, I'm sorry, I still don't understand your problem really. Maybe you can just cherry-pick the commits you want in the other branch?
00:10 m0viefreak joined #git
00:12 bannakaffalatta joined #git
00:12 CountryNerd joined #git
00:12 Es0teric joined #git
00:13 Es0teric Vampire0 man... i am just gonna start from scratch again
00:13 Es0teric seriously
00:14 Es0teric joined #git
00:16 duderonomy joined #git
00:22 druonysus_ joined #git
00:23 Cabanossi joined #git
00:24 User458764 joined #git
00:28 digidog joined #git
00:29 netj joined #git
00:31 otiose joined #git
00:38 fstd_ joined #git
00:38 sammyo joined #git
00:40 bilal_ joined #git
00:41 TikityTik joined #git
00:48 noceq joined #git
00:55 raynold joined #git
00:58 NeXTSUN joined #git
01:00 raspado joined #git
01:02 HoierM joined #git
01:02 ojdo joined #git
01:08 Cabanossi joined #git
01:09 SwiftMatt joined #git
01:09 rwb joined #git
01:16 ertes joined #git
01:16 d^sh joined #git
01:19 raijin joined #git
01:20 Rodya_ joined #git
01:20 peterbecich joined #git
01:20 todd_dsm joined #git
01:21 Masber_080 joined #git
01:22 finalbeta joined #git
01:26 peterbecich joined #git
01:27 peterbec` joined #git
01:29 Lacy joined #git
01:30 Lacy left #git
01:39 cdg joined #git
01:39 guampa joined #git
01:40 peepsalot joined #git
01:41 sunri5e joined #git
01:47 mjuszczak joined #git
01:47 ShapeShifter499 joined #git
01:47 Dougie187 joined #git
01:50 ilbot3 joined #git
01:50 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 matt|home so.. first you make changes to a file, then you put it in the 'staging area', then you commit it basically ?
01:50 Kyros joined #git
01:51 Kyros joined #git
01:51 bremner you are not as think as you confused you are.
01:52 matt|home ?????
01:52 bremner what you said sounds about right.
01:52 matt|home what i don't understand is "local database" and staged
01:52 matt|home so like.. when you make a change to a file without telling git, that's "modified" .. i get that
01:52 bremner roughly, local database = .git
01:53 Dougie187 left #git
01:53 Cabanossi joined #git
01:53 matt|home and then when you put it into your staging area that does what exactly , tell git that "hey there's a file or files here that i've changed and now i want you to keep track of them" ?
01:53 bremner matt|home: that's part of it, but the main point is you don't have to commit all of your changes at once
01:54 matt|home okay.. so commit means update basically ?
01:54 Dougie187 joined #git
01:57 roelmonnens joined #git
02:00 astrofog joined #git
02:04 rewt`` joined #git
02:04 pks joined #git
02:04 Kerwin joined #git
02:05 ojacobson matt|home: as background, each Git commit is a complete snapshot of your project
02:05 ojacobson When you run git-commit, the staging area is turned, verbatim, into a snapshot. (The staging area, also, is a complete snapshot, but one that's a little easier to modify)
02:06 ojacobson git-add and friends copy things from the work tree into the staging area
02:06 ojacobson git-checkout and friends copy things from commits into the staging area
02:06 ojacobson (and, sometimes, from the staging area into the work tree)
02:06 matt|home mkay
02:06 matt|home so you're making a record of file info basically
02:07 dreiss joined #git
02:07 ojacobson contents, directory structure and filenames, and +x/-x permission
02:08 telephone joined #git
02:08 telephone joined #git
02:08 matt|home mkay
02:08 matt|home thanks ojacobson
02:12 mjuszczak joined #git
02:13 matt|home The working tree is a single checkout of one version of the project. These files are pulled out of the compressed database in the Git directory and placed on disk for you to use or modify.
02:13 matt|home okay .. brain no workey
02:14 matt|home so.. the 'working tree' is a "checkout", whatever that means, of a project version. i assume by project they mean repo?
02:15 [Kid] complete git n00b here. wanted to see what the best way to dev against a repo is for something like FreeNAS that has to be built from source to test. seems like a lot of work to build everytime for just small changes and to test. i feel like i am missing something.
02:15 ojacobson From the perspective of a developer working on the project, the work tree is the directory full of files you work on (hence the name) and that you use to stage content frmo
02:16 ojacobson [Kid]: not really a Git question, but most built systems do incremental builds and skip unchanged files
02:16 ojacobson if theirs doesn't, complain to the FreeNAS folks
02:16 Vortex34 joined #git
02:16 ojacobson for release and integration testing builds, though, yes, common practice is to always do a clean build, to ensure reproducibility
02:16 [Kid] yeah, i didn't realize if it was a Git questioon
02:16 ojacobson It's fine :)
02:16 matt|home okay .. so if i create a directory on my local computer, "GitProjects", and i assign each repo their own directory within GitProjects, GitProjects is the 'working tree' ?
02:17 ojacobson So long as you don't delete the build output (.o files etc) you should be able to re-run their build tool much faster the second time
02:17 ojacobson matt|home: one work tree per project. Generally, when you run `git init` the current directory becomes the work tree of a newly-created repo, and when you run `git clone` the newly-created clone gets a work tree, with the git repo stored inside it in .git
02:17 ojacobson There's no global work tree, intentionally
02:17 matt|home ..
02:18 matt|home one sec..
02:18 mel00010 joined #git
02:18 matt|home okay .. git init creates a "work tree" in the current directory you're in. i get that part
02:19 matt|home before i ask about clones..
02:19 [Kid] ojacobson, so if i understand correctly, the first build will take a while, but then if i am just making changes it will build faster by building with the changed files.
02:19 matt|home can you have multiple repos within one work tree?
02:19 telephone joined #git
02:19 telephone joined #git
02:20 ojacobson For the purposes of this conversation, no
02:20 Rodya_ joined #git
02:21 ojacobson there's a 1:1 relationship between repos (which store git data, such as commits and branches) and work trees (which hold the project files for the current revision)
02:21 matt|home okay
02:21 ojacobson I qualify that because submodules complicate the situation, and because of bare repos, but _you can ignore those for now_.
02:22 mehwork left #git
02:23 Cabanossi joined #git
02:28 Kerwin joined #git
02:28 raijin joined #git
02:31 onlyanegg joined #git
02:32 otiose joined #git
02:35 Vampire0 ojacobson, but even then saying it is 1:1 is wrong
02:36 Vampire0 ojacobson, you can easily have multiple worktrees for one repository, e. g. to have different branches in different directories at the same time with man git worktree
02:36 gitinfo ojacobson: the git-worktree manpage is available at https://gitirc.eu/git-worktree.html
02:38 cads joined #git
02:39 ojacobson Vampire0: yes
02:39 ojacobson I'm simplifying to avoid overwhelming matt|home with information he has no way to contextualize
02:39 ojacobson Hence the qualifier :)
02:40 matt|home it's okay, i've long since come to accept the fact that im just retarded
02:40 matt|home so treat me however you want i don't mind
02:41 ojacobson You're not retarded (unless you are)
02:41 ojacobson git's internally simple, which means it demands a lot of sophistication from its users
02:41 ojacobson not automatically knowing how to use it is no sin :)
02:42 ojacobson I hope my info is helping, but if it's not, please, say so!
02:42 matt|home okay .. so a repository/repo is created when you run 'git init' and it creates a .git/ subdir right
02:42 ojacobson yep
02:42 matt|home on my computer, i haven't initialized anything, but i've created a directory: /home/matt/GitProjects/
02:43 matt|home for each repo that i create, i'll be adding a subdir to that. so GitProjects/1/ /2/ etc
02:43 ojacobson I mean, I'd be inclined to give them more meaningful names, but sure
02:43 matt|home do i run git init inside each of those subdirs, or would i run it in the GitProjects folder ?
02:43 ojacobson looking at my development directory, I have work trees like "hatch-timer" and "heroku-repo-api"
02:44 ojacobson each of which has its own .git directory, containing its own repository
02:44 matt|home yeah im going to give then more meaningful names, just using those as examples
02:44 ojacobson sure
02:44 ojacobson you'd run `git init 1` or cd into 1 and run `git init`, to directly answer
02:44 matt|home okay. im still extremely unclear at what the difference between a work tree and a repo is
02:44 chachasmooth joined #git
02:45 matt|home and trees/branches/whatever but i haven't even got to that chapter yet
02:45 bannakaffalatta joined #git
02:46 ojacobson well, there's one easy way to see the difference that might help you build an understanding
02:46 ojacobson run `ls` in the work tree of a project
02:46 ojacobson then cd into .git and run `ls` again
02:46 ojacobson the .git contents are the repository
02:48 matt|home mkay. oh i think i get it, so .git is the revision history or repo itself, but the work tree is the current version you're working on?
02:48 pwnz0r joined #git
02:48 ojacobson sure, that's a good way of looking at it
02:48 matt|home okay
02:48 cdown joined #git
02:49 matt|home so, i assume this is more of a github question, but i saw some words like master/origin/branches etc, are those tangentially related to what we're talking about or something completely different
02:49 hexagoxel joined #git
02:49 matt|home oh and ojacobson seriously thanks for taking the time to help me out
02:49 ojacobson structurally, a repository is a collection of branches, tags, and remotes (and some other stuff, yes, hello Vampire0)
02:50 ojacobson each repository is independent of all others - when you clone, you get a new repo, with the original as a remote
02:50 ojacobson (don't worry about what "a remote" is just yet, just take me at my word)
02:50 matt|home okay, now i literally have to take notes..
02:51 ojacobson when you're working with files in your project's work tree, you're generally working on creating new commits on some branch in the repository associated with that work tree (in the .git dir)
02:51 matt|home "branch" being the current version?
02:51 ojacobson the `git fetch` and `git push` commands copy branches (and other things) between repositories, so that you can share them with others or store them on github
02:51 ojacobson or any other repo service
02:52 ojacobson sorry, I'll come in at the top again. I have a longer bit for this (and also !gcs !parable)
02:52 gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
02:52 gitinfo 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2009/05/19/the-git-parable.html
02:52 Vampire0 :-P
02:52 ojacobson :)
02:52 ojacobson a repository is a collection of branches, tags, and remotes; we're going to ignore remotes for a moment
02:52 ojacobson a branch or a tag is a label for a commit
02:52 ojacobson a commit is a snapshot of your project plus a list of prior commits
02:52 ojacobson ("parents")
02:53 * matt|home writes down
02:53 matt|home if im slow responding forgive me
02:53 ojacobson git works with these structures and builds all of its higher-level behaviours out of either these parts or supporting structures that operate on these parts
02:53 Kerwin joined #git
02:54 ojacobson git uses branches (labels, see above) to organize work and to allow you to work on more than one idea at a time
02:54 ojacobson every* repo eventually has at least one branch in it; a newly-created repo gets a branch named master
02:55 telephone joined #git
02:55 telephone joined #git
02:55 ojacobson * it's actually possible to have a repo with zero branches, but you really have to work at it
02:55 ayogi joined #git
02:55 ojacobson if you're only doing one thing at a time, working "on master" (with the branch named master checked out at all times) is fine
02:56 ojacobson most projects use more sophisticated workflows but starting with just one branch is completely fine
02:57 lagothrix joined #git
03:01 raspado joined #git
03:05 matt|home mkay
03:05 matt|home and those branches just exist to keep better track of who's working on what i assume?
03:07 jeffreylevesque joined #git
03:07 ojacobson Often.
03:07 ojacobson Or if you have two ideas, to allow you to work on either without needing to work on both at the same time
03:07 matt|home mkay
03:07 ojacobson Lots of use cases beyond that, too
03:07 kbeflo joined #git
03:07 tymczenko joined #git
03:08 matt|home ojacobson - i have to learn this for my work, and everyone is using github.. so i assume i'll have to create a copy of the repo everyone is working on and modify it directly on my computer?
03:08 ojacobson yep
03:08 matt|home is that called forking?
03:08 Cabanossi joined #git
03:08 ojacobson that "copy" is a clone (`git clone git@github.com:your-org/your-repo`), generally
03:09 ojacobson a fork in the github sense of the term is a clone that lives on the github servers and allows you to have your own published branches and your own independent copy of the history there
03:09 matt|home mkay. but still fully independent of the original, it's literally like i copied the entire thing to my computer
03:09 ojacobson yeeeeep
03:10 matt|home i see. i gotcha
03:10 ojacobson (useful context: github is a business entity created by some SF investors and tech folks to host git repos for proft, git is a source control system invented by a Finn)
03:10 telephone joined #git
03:11 telephone joined #git
03:11 ojacobson (git and github are independent, and github introduces a bunch of its own ideas and terms that git doesn't actually include)
03:11 ojacobson (many of them are useful, but sometimes the answer's going to be "that's a github thing" :)
03:12 matt|home no sweat. this is the first time im using version control , and my opinion here might be invalid but
03:13 matt|home it seems to me that this is really only useful if you're one person working on a very large project, or you have multiple people working on one or several projects
03:13 ojacobson ehhhh
03:13 matt|home otherwise i see little point
03:13 ojacobson at the extremely small level, you can model git as an infinite, persistent undo buffer
03:13 ojacobson I tend to use source control for everything, no matter how small, because even that's kinda useful
03:13 ojacobson for anything i plan on releasing to the public it's also a good way to communicate changes to the users of my code :)
03:13 matt|home so even if you delete all your files there's still records of them at some point
03:14 ojacobson yeah, so long as you don't also delete the repo
03:14 matt|home i suppose i'll have to familiarize myself with this extensively
03:14 ojacobson personal opinion: git's user interface gets in the way of effectively using git
03:14 ojacobson but it is what it is and if you want help here the git UI is what you'll end up using
03:16 kbeflo_ joined #git
03:17 fahadash joined #git
03:26 telephone joined #git
03:26 telephone joined #git
03:30 mjuszczak joined #git
03:30 dreiss joined #git
03:31 theoceaniscool joined #git
03:31 DistantStar joined #git
03:37 Cabanossi joined #git
03:41 DolphinDream joined #git
03:50 Goplat joined #git
03:55 mjuszczak joined #git
03:56 f3r70rr36f joined #git
04:00 f3r70rr36f left #git
04:02 druonysus_ joined #git
04:13 kbeflo joined #git
04:14 TbobbyZ joined #git
04:17 aidalgol joined #git
04:18 Khisanth joined #git
04:19 kent\n joined #git
04:21 FuzzyWuzzyPanda joined #git
04:22 Cabanossi joined #git
04:22 Rodya_ joined #git
04:23 SwiftMatt joined #git
04:25 zulutango joined #git
04:25 telephone joined #git
04:25 telephone joined #git
04:26 dyyno joined #git
04:26 khfeng joined #git
04:33 otiose joined #git
04:33 MattMaker joined #git
04:38 tnecniv joined #git
04:41 theology joined #git
04:41 theology is it possible to have a git config with no email/username set?
04:42 Bock joined #git
04:42 dwts joined #git
04:43 Milos_ joined #git
04:44 pfloyd left #git
04:44 kbeflo_ joined #git
04:47 dwts joined #git
04:49 phase2 joined #git
04:50 navidr joined #git
04:54 Masber_080 joined #git
04:54 hhee joined #git
04:55 theology left #git
05:02 texasmynsted joined #git
05:06 Puffball joined #git
05:09 gradleh8 joined #git
05:09 SwiftMatt joined #git
05:16 dabullss joined #git
05:19 rwp thesquib, It wlil assume one. If you don't want that then you will need to set something generic such as root@localhost or some such.
05:20 menip joined #git
05:20 rwp thesquib, Oops. Nick completion picked the wrong nick.
05:20 rwp theology, It wlil assume one. If you don't want that then you will need to set something generic such as root@localhost or some such.
05:23 Rodya_ joined #git
05:27 MattMaker joined #git
05:28 jaziz joined #git
05:34 MineCoins joined #git
05:36 SR3ject joined #git
05:37 Cabanossi joined #git
05:39 blipz joined #git
05:44 hustl44 joined #git
05:44 TbobbyZ joined #git
05:44 _ng joined #git
05:45 dermoth joined #git
05:50 hustl4 joined #git
05:50 freimatz joined #git
05:50 fakenerd joined #git
05:54 choki joined #git
05:58 cagomez joined #git
06:00 dermoth joined #git
06:11 SwiftMatt joined #git
06:14 movesi joined #git
06:18 cagomez joined #git
06:18 johnflux joined #git
06:18 johnflux Can I do git grep, but match over mutliple lines?
06:22 Cabanossi joined #git
06:23 Rodya_ joined #git
06:24 wget joined #git
06:24 wget joined #git
06:25 _ikke_ Not sure
06:25 ayogi joined #git
06:31 TbobbyZ joined #git
06:34 otiose joined #git
06:37 stduolc joined #git
06:37 glebihan_ joined #git
06:37 stduolc hi, I try to show the diff files in first commit?
06:38 wget_ joined #git
06:38 cagomez joined #git
06:41 stduolc ok, I found it from this link: http://stackoverflow.com/questions/40883798/how-to-get-git-diff-of-the-first-commit
06:42 preyalone joined #git
06:44 _ikke_ right, that magic hash is an empty tree (and hardcoded into git)
06:46 rokups joined #git
06:49 wget joined #git
06:49 wget joined #git
06:50 Endarked joined #git
06:52 tvw joined #git
06:53 MrMojit0 joined #git
06:55 rwp stduolc, I think you can also "git show hashish" of the first commit. The show is effectively the first diff too. Might be easier to remember than the empty hash id.
06:58 cagomez joined #git
06:58 nickel_dime_look joined #git
06:58 brent__ joined #git
06:59 SteffanW joined #git
07:00 stduolc rwp: ok, what I really need is found out all delta file names between every neighbor commits, and write the diff log to mysql.
07:01 rwp stduolc, Are you aware of "git whatchanged" ??
07:01 stduolc now, I use git diff pre_hash cur_hash --name-status to show that
07:01 stduolc rwp: yes
07:01 rwp Okay.
07:01 stduolc rwp: that's what I want
07:02 diogenese joined #git
07:02 schleppel joined #git
07:03 stduolc rwp:ok, I googled it, that's what I really want. and It will save me a lot of code.
07:04 royal_screwup21 joined #git
07:04 rwp Just a little confused. You know about git whatchanged? Or that is what you needed to know?
07:04 rwp I am often using "git whatchanged -p" to show the contents of the changes and then pattern searching through it.
07:05 sbulage joined #git
07:06 stduolc rwp: https://git-scm.com/docs/git-whatchanged the document recommend use git log.
07:07 stduolc I need to know the change files between two commits.
07:08 stduolc and I just need the files name.
07:12 royal_screwup21 I'm new to git and I have a question about "branches". From what I understand, branches are made to experiment with the code in a repository in a way that does *not* affect its contents.  Let's say I have a branch named "test", and I've added files to it, and I'd like these changes to be reflected on the original repo (master). What steps should I
07:12 royal_screwup21 take to accomplish this?
07:12 King_Hual joined #git
07:13 groton joined #git
07:14 groton when doing a git merge and a file tracked by lfs has any conflict, if while merging I run ‘git diff’ i see the pointers file diff. When i commit, the content of the original binary file *is* the pointer file :/ how to troubleshoot this?
07:18 cagomez joined #git
07:18 peacememories joined #git
07:22 Cabanossi joined #git
07:23 ToBeCloud joined #git
07:25 groton it seems the steps should be: modify the pointer file, git add pointerfile, git commit pointerfile, git lfs pull. At this point the pointer file is repalced by the actual content. I expected the last ‘git lfs pull’ to not be useful
07:30 zeroed joined #git
07:30 zeroed joined #git
07:30 jarnos joined #git
07:32 royal_screwup21 Let's say I'd like to contribute to a repo. Conventionally, I would have to create a branch where I'd make my contributions (git add *, followed by git commit -m"<meaningful message>"), then I'd push it to the master, and ask the admin to accept my pull request. Is this right way to think about it?
07:34 ok91 joined #git
07:35 Saturn812 joined #git
07:36 jarnos _ikke_, I tried to cancel the merge by "git reset --merge ORIG_HEAD". Still I see duplicate commits: https://pastebin.ubuntu.com/24477635/ Why is this and can you get rid of the extra entries?
07:37 jarnos_ joined #git
07:38 cagomez joined #git
07:45 kbeflo__ joined #git
07:50 ayogi joined #git
07:54 johnflux how can I get git grep to ignore windows line endings
07:54 johnflux I'm trying to match:    foo$
07:54 johnflux but it fails when the line is foo\r\n
07:58 cagomez joined #git
08:00 jagob joined #git
08:07 kbeflo_ joined #git
08:09 oprypin johnflux, well there are several bad options
08:09 oprypin searching for $'\r'  or piping that file through dos2unix before grep
08:10 telephone joined #git
08:10 telephone joined #git
08:11 mkoskar joined #git
08:17 cagomez joined #git
08:18 rudrab joined #git
08:18 circ-user-G9qYS joined #git
08:19 MattMaker joined #git
08:19 SReject joined #git
08:19 SReject joined #git
08:20 MattMaker joined #git
08:24 _ikke_ jarard: git reset --hard HEAD~1 would undo a merge
08:28 cagomez joined #git
08:30 chubek_ joined #git
08:31 telephone joined #git
08:31 telephone joined #git
08:33 Acerific joined #git
08:35 otiose joined #git
08:36 theoceaniscool joined #git
08:47 cagomez joined #git
08:48 Paraxial joined #git
08:49 Wulf joined #git
08:49 Paraxial joined #git
08:50 Wulf Good Morning! I would like to have a backup of a git repository on AWS S3. It should be encrypted and should still be reasonable small. Do any solutions exist already?
08:50 rudrab joined #git
08:51 choki joined #git
08:52 manuelschneid3r joined #git
08:52 thinkpad joined #git
08:57 zeroed joined #git
08:57 cagomez joined #git
08:58 _ikke_ Wulf: either an encrypted volume or an encrypted archive
08:59 groton joined #git
08:59 cads joined #git
09:00 Wulf _ikke_: what's that exactly?
09:00 SReject joined #git
09:05 sarri joined #git
09:05 sarri joined #git
09:06 lordjancso joined #git
09:06 sbulage joined #git
09:07 kbeflo_ joined #git
09:07 ryxai joined #git
09:11 snthsnth joined #git
09:11 ryxai_ joined #git
09:12 ryxai joined #git
09:13 chipotle joined #git
09:14 brent__ joined #git
09:16 acetakwas joined #git
09:18 TSS_ joined #git
09:18 Levex joined #git
09:22 Tobbi joined #git
09:24 ayogi joined #git
09:26 Snugglebash joined #git
09:27 cagomez joined #git
09:30 acetakwas joined #git
09:36 grayjoc joined #git
09:37 Cabanossi joined #git
09:37 cagomez joined #git
09:38 chipotle joined #git
09:40 netj joined #git
09:42 Vampire0 Wulf, that means either create an encrypted and password secured archive like a ZIP file, or create an encrypted volume for example with TrueCrypt which is an encrypted file that - after giving the right password - is added as a virtual drive to your computer
09:44 hhee joined #git
09:47 tymczenko joined #git
09:49 TbobbyZ joined #git
09:49 TbobbyZ joined #git
09:51 TbobbyZ joined #git
09:53 chabuki_ joined #git
09:54 jackrandom joined #git
09:54 Snugglebash joined #git
09:55 Snugglebash joined #git
09:56 Snugglebash joined #git
09:57 Snugglebash joined #git
09:57 Snugglebash joined #git
09:58 King_Hual joined #git
09:58 Snugglebash joined #git
09:59 Snugglebash joined #git
10:00 Snugglebash joined #git
10:01 Snugglebash joined #git
10:01 acetakwas joined #git
10:01 Snugglebash joined #git
10:01 dre_ joined #git
10:02 Snugglebash joined #git
10:02 TbobbyZ joined #git
10:03 Snugglebash joined #git
10:03 telephone joined #git
10:03 telephone joined #git
10:03 TheSimonator joined #git
10:04 Snugglebash joined #git
10:05 Snugglebash joined #git
10:05 xaa joined #git
10:05 chubek_ joined #git
10:05 Snugglebash joined #git
10:08 leeN joined #git
10:09 chipotle joined #git
10:10 Bhootrk_ joined #git
10:11 telephone joined #git
10:11 telephone joined #git
10:12 Introoter joined #git
10:12 Snugglebash joined #git
10:12 jarnos joined #git
10:13 rideh joined #git
10:14 jarnos _ikke_, oh the cause was I had done rebase in development branch.
10:14 _ikke_ jarnos: right, that makes sense
10:18 rastos2 joined #git
10:31 TbobbyZ joined #git
10:31 telephone joined #git
10:31 telephone joined #git
10:36 otiose joined #git
10:40 ok91 joined #git
10:41 Pursuit joined #git
10:45 conrad_ joined #git
10:45 conrad_ hello!
10:45 gitinfo conrad_: 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.
10:46 bomb-on joined #git
10:48 conrad_ Anyone read Git Pro/
10:48 conrad_ ?
10:52 Cabanossi joined #git
10:54 Es0teric joined #git
10:54 satifant joined #git
10:55 HElephant joined #git
10:56 _ikke_ conrad_: I read some chapters, yes
10:59 conrad_ good for learning git? I know the basics but im making some silly mistakes in work so need a refresher
11:00 earnestly joined #git
11:01 raijin joined #git
11:01 aard joined #git
11:01 j416 just read it; it'll save you time in the long run
11:01 j416 if you use git frequently.
11:01 Endarked joined #git
11:02 Es0teric joined #git
11:04 ferr joined #git
11:12 SantaClauze joined #git
11:12 jameser joined #git
11:12 anuxivm joined #git
11:14 StephenS left #git
11:16 telephone joined #git
11:16 telephone joined #git
11:23 Snugglebash joined #git
11:29 jnavila joined #git
11:29 johnflux how do I do negative lookahead in git grep?
11:29 mostlybadfly joined #git
11:30 rudi_s johnflux: git grep -P '/foo(?!bar)/'
11:31 rudi_s (Minus the / ...)
11:31 johnflux ah!
11:31 johnflux thanks :)
11:33 rudi_s np
11:35 tlaxkit joined #git
11:36 MarioBranco joined #git
11:38 Snugglebash joined #git
11:42 jameser joined #git
11:47 kexmex joined #git
11:49 User458764 joined #git
11:52 fragMental joined #git
11:56 Ryanar joined #git
11:56 jameser joined #git
11:57 johnflux left #git
12:00 romancer joined #git
12:00 tribly joined #git
12:01 beaky joined #git
12:05 YuGiOhJCJ joined #git
12:06 rivarun joined #git
12:07 Cabanossi joined #git
12:13 User458764 joined #git
12:18 circ-user-G9qYS_ joined #git
12:20 robin_sz joined #git
12:21 psylentvoid joined #git
12:22 m0viefreak joined #git
12:22 Murii joined #git
12:22 robin_sz git is doing my head in today.  I am trying to clone a git repo over https. "git clone--verbose <url> <dir>" and it just sits there like a lemon  "cloing  into <dir>..."    .. nothing happens, it just sits and waits
12:22 jackrandom joined #git
12:23 robin_sz git is doing my head in today.  I am trying to clone a git repo over https.
12:23 robin_sz git is doing my head in today.  I am try"git clone--verbose <url> <dir>" and it just sits there like a lemon  "cloing  into <dir>..."    .. nothing happens, it just sits and waits
12:23 robin_sz any clues?
12:23 robin_sz is there a "really really verbose" switch?
12:23 grawity export GIT_TRACE=1 GIT_CURL_VERBOSE=1
12:23 robin_sz ta
12:23 kbeflo__ joined #git
12:24 grawity usually, if it stays quiet while cloning over HTTP, that means you're dealing with a 'dumb' HTTP server
12:24 grawity i.e. the client doesn't have any status info, all it does is fetch blobs and packfiles until it's over
12:25 robin_sz ooh "gnutls_handshake() failed: The specified session has been invalidated for some reason."
12:25 robin_sz its an empty repo at the moment, not much to clone, just trying to push some stuff off an old production server and migrate
12:26 Ryanar joined #git
12:29 raijin joined #git
12:32 TbobbyZ joined #git
12:32 jameser joined #git
12:35 Levex joined #git
12:35 Mogget joined #git
12:37 otiose joined #git
12:37 Mogget joined #git
12:39 ayogi joined #git
12:39 dsdeiz joined #git
12:39 dsdeiz joined #git
12:46 groton joined #git
12:46 HoierM joined #git
12:47 Levex joined #git
12:47 HoierM joined #git
12:48 HoierM joined #git
12:48 HoierM joined #git
12:50 Kerwin joined #git
12:52 snowkidind joined #git
12:52 imack joined #git
12:55 raijin joined #git
12:55 dsdeiz joined #git
12:56 finalbeta joined #git
12:57 johnflux joined #git
12:57 kexmex joined #git
12:57 johnflux What would be the git equivalent of:
12:57 johnflux find src/ -name "*.tw" -exec ./check.py '{}' ';'
12:58 johnflux i.e. I want to run check.py   against each file in git called *.tw
12:59 metalraiden34 joined #git
13:00 grawity git ls-files "src/*.tw" | xargs -n 1 -d '\n' ./check.py
13:00 johnflux grawity: nice :-)
13:09 D4R5C0D3 joined #git
13:10 Acerific joined #git
13:12 ToBeCloud joined #git
13:13 sturner joined #git
13:14 treehug88 joined #git
13:14 User458764 joined #git
13:14 dsdeiz joined #git
13:14 nowhereman joined #git
13:14 johnny56_ joined #git
13:21 chipotle joined #git
13:22 mikecmpbll joined #git
13:22 Kerwincsc_chen joined #git
13:22 mda1 joined #git
13:23 Kerwincsc_chen joined #git
13:25 dedicated joined #git
13:25 Kerwincsc_chen joined #git
13:26 jnavila joined #git
13:27 cqi joined #git
13:28 TomyLobo joined #git
13:30 _Vi joined #git
13:31 vrach joined #git
13:32 Shock_ joined #git
13:33 Levex joined #git
13:33 raijin joined #git
13:38 n-st joined #git
13:40 ok91 joined #git
13:40 freimatz joined #git
13:45 mkoskar joined #git
13:46 oskarkv joined #git
13:52 Cabanossi joined #git
13:53 dave0x6d joined #git
13:54 tsetair joined #git
13:58 mda1 joined #git
13:58 Rodya_ joined #git
13:59 chipotle joined #git
14:01 solution_ joined #git
14:02 Puffball joined #git
14:07 courrier joined #git
14:16 Gustavo6046 joined #git
14:20 BenderRodriguez joined #git
14:21 Anja__ joined #git
14:23 choki joined #git
14:27 mda1 joined #git
14:27 dsdeiz joined #git
14:28 choki left #git
14:28 jstein_ joined #git
14:29 User458764 joined #git
14:30 User458764 joined #git
14:33 kbeflo_ joined #git
14:35 manuelschneid3r joined #git
14:37 otiose joined #git
14:38 TikityTik joined #git
14:40 SwiftMatt joined #git
14:43 cads joined #git
14:43 MrMojit0 joined #git
14:43 Vasya666 joined #git
14:45 Spacew00t joined #git
14:46 rudrab joined #git
14:50 HoierM joined #git
14:51 kbeflo_ joined #git
14:51 unbalancedparen joined #git
14:51 cstratak joined #git
14:52 cstratak joined #git
14:52 Cabanossi joined #git
14:52 otiose joined #git
14:52 finalbeta joined #git
14:54 cstratak joined #git
14:54 romank joined #git
14:55 thiago joined #git
14:55 cstratak joined #git
14:58 romank joined #git
14:58 publio joined #git
14:58 cstratak joined #git
14:58 kbeflo__ joined #git
15:00 sandyalexgfan95 joined #git
15:00 dsdeiz joined #git
15:01 kbeflo joined #git
15:03 Kerwin joined #git
15:03 ok91 joined #git
15:05 otiose joined #git
15:07 NeXTSUN joined #git
15:07 robotroll joined #git
15:07 romank joined #git
15:08 Kerwin_chain joined #git
15:10 zivester joined #git
15:10 _ikke_ grawity: isn't -d '\n' default for xargs?
15:10 grawity no
15:11 grawity by default, it uses shell-like word splitting
15:11 BenderRodriguez joined #git
15:11 ojacobson IFS explicitly, or an approximation?
15:11 ojacobson (I've managed to never need to care, first by being too ignorant, and then by using -0)
15:12 grawity something halfway
15:13 grawity I think it switches to \n if you use -I or -i
15:14 dermoth joined #git
15:14 wcstok joined #git
15:14 dreiss joined #git
15:15 fahadash joined #git
15:15 m1dnight_ joined #git
15:16 bdonnahue joined #git
15:25 Murii joined #git
15:25 Vivekananda joined #git
15:27 Rodya_ joined #git
15:28 Goplat joined #git
15:28 Kyros joined #git
15:32 madewokherd joined #git
15:33 dsdeiz joined #git
15:35 rudrab joined #git
15:35 circ-user-dfkWJ joined #git
15:37 Cabanossi joined #git
15:37 circ-user-dfkWJ Does git log -S unzip all commits?
15:38 _ikke_ yes, it has to uncompress all objects in order to see their contents
15:40 xiongmao86 joined #git
15:40 tnecniv joined #git
15:41 bitmod joined #git
15:42 xiongmao86 Hi, everyone, I am a newbie, and I need some advise on how to which commit is the blob file belongs to, I got this repo, and a script to find big file sha1 in the repo. How can I do that?
15:42 xiongmao86 how to find
15:42 _ikke_ a blob can belong to many commits
15:43 xiongmao86 _ikke_: yes, finding any one is ok. but git log -- filename doesn't work
15:44 _ikke_ git has no built-in way to map blob hashes to trees or commits
15:44 _ikke_ you'd have to traverse each commit yourself
15:45 _ikke_ but if git log -- filename does not return anything, it does not like that filename is part of the history
15:45 _ikke_ (try git log --all)
15:46 SwiftMatt joined #git
15:46 johnflux If I do something like "git grep"
15:46 frew joined #git
15:47 johnflux it seems to be faster than doing a regular grep
15:47 johnflux is that right?
15:47 xiongmao86 _ikke_:  Oh. right . It works. Thank you. The big file does come from master so when I searched before , it doesn't show up.
15:47 j416 xiongmao86: loop all commits (git rev-list) and run something like "git ls-files -s" for each, search for the blob, if you find it you have a commit that references that blob.
15:48 j416 johnflux: that's likely faster, yes
15:48 xiongmao86 _ikke_: but can I also find out where it come from?
15:48 __kerwincsc__ joined #git
15:48 _ikke_ xiongmao86: where what comes from?
15:48 xiongmao86 _ikke_:  which branch or anything reference to it?
15:49 _ikke_ xiongmao86: use --oneline --graph --decorate
15:49 _ikke_ or perhaps
15:49 johnflux j416: so, I'm guess it's because it can use the compressed version, right?
15:49 User458764 joined #git
15:49 j416 johnflux: it searches its own object database, yes
15:49 johnflux is there any way to use this speed up for my own tools?
15:49 j416 johnflux: tools?
15:49 johnflux I made a python script to check a file to make sure its tags match, and I run it like:
15:50 frew when git produces a diff it includes a little bit of context in the @@ line; is there a plubming tool to get this context for a given line without needing a diff
15:50 johnflux git ls-files "src/*.tw" | xargs -n 1 -d '\n' ./check.py
15:50 johnflux but this takes about 5 seconds to run
15:50 _ikke_ xiongmao86: git log --oneline --source --all -- <file>
15:50 johnflux compared to git grep  which is pretty much instant
15:50 j416 johnflux: ah. I'm not sure there is anything easier, no.
15:51 j416 johnflux: but I may be mistaken.
15:51 j416 s/easier/faster/
15:52 j416 johnflux: you're running check.py once for every file, though
15:52 cdg joined #git
15:52 j416 johnflux: that's probably your bottleneck
15:53 j416 johnflux: make it accept multiple files at once and remove the -n 1
15:53 MineCoins joined #git
15:53 xiongmao86 j416, _ikke_:  I tried git log -- filename, and it's not successful, and when I try git log --all -- filename it works, that suggest there are some ref that I didn't search without --all?
15:54 xiongmao86 j416, _ikke_: and I want to find that ref that I didn't search the first time.
15:55 j416 xiongmao86: did you try what I said?
15:55 j416 just because the blob is the same it doesn't necessarily mean the filename is the same
15:55 j416 the file could have been renamed, or it may more more than one file with the same contents
15:55 xiongmao86 j416: Oh, no, I thought you were talking about finding the bigfile.
15:55 j416 I was.
15:56 j416 that's what you're doing isn't it
15:56 johnflux j416: ...  oh WOW!  That was really easy to do in python  (I didn't even have to do anything - fileinput  does everything correctly by default)
15:56 johnflux and now it's completely instant
15:56 j416 good good
15:56 _ikke_ xiongmao86: see the last command I gave
15:56 johnflux j416: thank you :)
15:56 j416 you're welcome o/
15:56 xiongmao86 j416: Oh, I might be to vague. I found it using git log --all -- filename.
15:56 j416 aha
15:57 _ikke_ git log --oneline --source --all -- <file>
15:57 xiongmao86 j416: but I didn't find it the  firsttime
15:57 _ikke_ --source adds the source ref for each commit
15:57 metalraiden34 joined #git
15:57 _ikke_ xiongmao86: ^^
15:57 xiongmao86 _ikke_: oh yes. thank you , thank you.
15:57 johnflux j416: should I actually be using  -print0   or something?
15:58 MDA2 joined #git
15:58 xiongmao86 j416, _ikke_: thanks folks. it is very kind of you to help. thanks.
15:58 JanC_ joined #git
15:58 j416 johnflux: that is probably a good idea.
15:58 j416 johnflux: but your script then needs to handle that
15:59 ZexaronS joined #git
16:00 zeroed joined #git
16:01 johnflux j416: won't xargs handle that for me?
16:01 sweatsuit joined #git
16:02 johnflux if I use -0  or something
16:02 _ikke_ yes
16:02 _ikke_ if you pipe the output into xargs it will take care of it (with -0)
16:03 FuzzyWuzzyPanda joined #git
16:04 j416 but then xargs needs to pass the args on
16:04 j416 does xargs clean them up somehow?
16:04 j416 or am I just not using my brain properly here
16:05 j416 my "brain"
16:05 juvenal joined #git
16:06 menip joined #git
16:06 ok92 joined #git
16:06 dsdeiz joined #git
16:06 dsdeiz joined #git
16:07 Naan joined #git
16:07 ter0 joined #git
16:09 imaginary joined #git
16:10 _ikke_ j416: xargs splits the output on \0
16:10 peterbecich joined #git
16:11 _ikke_ and passes them on as separate arguments to the next command (with -n 1 at most one argument per invocation)
16:11 j416 right; so it handles the case when..?
16:11 _ikke_ it handles what case?
16:11 j416 yes what case
16:12 _ikke_ the command executed with xargs never sees the \0
16:12 j416 I know this
16:13 j416 I'm trying to remember what case makes -print0 and -0 useful
16:13 ojacobson filenames with whitespace, newlines, or control characters in them
16:13 j416 a filename can have a newline? o_O
16:13 _ikke_ j416: the shell by default splits arguments on IFS
16:13 xiongmao86 left #git
16:13 ojacobson "foo bar\nbaz" is a perfectly legal filename: the only bytes that may not appear in a unix filename are \0 and the directory separator, '/'
16:14 _ikke_ j416: only / and \0 are prohibited on most linux FS
16:14 Random832 j416, a filename can have anything in it but / or \0
16:14 j416 ojacobson: til, ty
16:14 Random832 OSX limits it to valid NFD UTF-8, but still allows newlines
16:14 ojacobson (and, irritatingly, they're bytes, not characters)
16:14 ojacobson yeah
16:14 ojacobson you can turn that off and get classic unix rules even on OS X, but don't
16:14 Random832 i thought you could only turn off case insensitivity, not unicode normalization
16:14 dsdeiz joined #git
16:15 j416 ah, right, spaces messes it up
16:15 j416 thanks
16:16 smurfendrek123 joined #git
16:16 garyserj how do I keep the Working Directory as it is,  move to the tip of the branch , and add a commit?
16:16 smurfendrek123 Hey, i have a .gitignore with just *.class on the first line, but it doesn't seem to work, how come?
16:17 ojacobson define "doesn't seem to work"
16:17 smurfendrek123 ojacobson, it still commits and pushes .class files
16:17 ojacobson are they tracked?
16:17 smurfendrek123 ojacobson, how do i check?
16:18 ojacobson git log path/to/a/class/file
16:18 ojacobson or make a change to one and look at `git status` output
16:18 rudrab joined #git
16:19 smurfendrek123 ojacobson, i ran the command from this stackoverflow question, and they seem to be tracked :http://stackoverflow.com/questions/32826960/git-list-all-tracked-files
16:19 ojacobson then they cannot be ignored
16:19 ojacobson git never ignores tracked files
16:19 smurfendrek123 so do i git rm them in each location there are .class files or is there a recursive approach or something?
16:20 ojacobson find . -name '*.class' -exec git rm --cached -- {} +
16:20 ojacobson would be my approach
16:20 ojacobson or if you're using zsh: git rm --cached -- **/*.class
16:21 _ikke_ garyserj: git reset <branchname>; git add <files>; git commit
16:21 smurfendrek123 I like _ikke_ 's approach
16:21 smurfendrek123 but ojacobson's is more elegant
16:21 _ikke_ smurfendrek123: I'm talking to garyserj
16:22 smurfendrek123 oh,
16:22 smurfendrek123 thanks for telling me
16:23 smurfendrek123 ojacobson, what does the . do in the find command?
16:23 dirtyroshi_ joined #git
16:23 ojacobson roots find in the current directory
16:23 _ikke_ current directory
16:23 smurfendrek123 ah yes
16:23 ojacobson find always (per posix, anyways) requires a directory argument
16:23 ojacobson gnu find relaxes this and assumes . but I regularly deal with bsd machines so
16:24 osse git rm --cached '**/*.class'
16:24 osse ez win for osse
16:25 smurfendrek123 ojacobson, if they were all in 1 directory could i git rm that directory?
16:25 ojacobson yes
16:25 Snugglebash joined #git
16:26 smurfendrek123 Thanks
16:29 ascarter joined #git
16:34 thiago joined #git
16:37 Cabanossi joined #git
16:37 tnecniv joined #git
16:39 cdg joined #git
16:41 BSaboia joined #git
16:41 ayogi joined #git
16:48 dsdeiz joined #git
16:48 dsdeiz joined #git
16:49 metalraiden34 joined #git
16:51 ndim joined #git
16:53 garyserj _ikke_: is git reset <branch>  a soft reset?
16:53 ojacobson mixed, as described in man git-reset
16:53 gitinfo the git-reset manpage is available at https://gitirc.eu/git-reset.html
16:54 garyserj is a mixed reset exactly the same as a soft reset followed by git add -A?
16:55 _ikke_ no
16:55 Taikibansei joined #git
16:55 _ikke_ if you had unstaged changed in your work tree, those would not be staged
16:56 Rodya_ joined #git
16:57 garyserj ok thanks
16:58 circ-user-dfkWJ joined #git
16:59 _ikke_ A soft reset just does not touch the index at all
17:00 Sound joined #git
17:00 Sound joined #git
17:02 Endarked joined #git
17:03 dsdeiz joined #git
17:03 dsdeiz joined #git
17:05 otiose joined #git
17:06 cdown joined #git
17:15 giampaolo joined #git
17:17 smurfendrek123 joined #git
17:22 DJd34d1 joined #git
17:23 Emperor_Earth joined #git
17:25 Levex joined #git
17:28 peacememories joined #git
17:29 thiago joined #git
17:30 dermoth joined #git
17:32 aspiers joined #git
17:34 romank joined #git
17:34 dsdeiz joined #git
17:34 dsdeiz joined #git
17:39 durham joined #git
17:39 ayogi joined #git
17:40 manuelschneid3r joined #git
17:41 rudrab joined #git
17:42 shgysk8zer0 joined #git
17:42 felixsanz1 joined #git
17:42 borkr joined #git
17:43 bdonnahue left #git
17:46 ryxai joined #git
17:47 ryxai joined #git
17:48 ryxai joined #git
17:49 gugah joined #git
17:49 cdown_ joined #git
17:50 durham joined #git
17:50 dsdeiz joined #git
17:50 dsdeiz joined #git
17:50 ryxai joined #git
17:50 peacememories joined #git
17:51 ryxai joined #git
17:53 ryxai joined #git
17:53 ascarter joined #git
17:53 smurfendrek123 joined #git
17:57 Rodya_ joined #git
18:02 netj joined #git
18:03 smurfendrek123 joined #git
18:03 aspiers joined #git
18:05 grayjoc joined #git
18:08 durham joined #git
18:09 ozcanesen joined #git
18:10 joki- joined #git
18:11 ertes joined #git
18:13 felixsanz1 joined #git
18:13 bannakaffalatta joined #git
18:18 hust921 joined #git
18:18 hust921 joined #git
18:18 AlkindiX joined #git
18:18 mjuszczak joined #git
18:19 d^sh joined #git
18:20 YuGiOhJCJ joined #git
18:20 dsdeiz joined #git
18:21 kexmex joined #git
18:22 hust921 joined #git
18:24 oleksiyp joined #git
18:25 zerow joined #git
18:30 RandalSchwartz joined #git
18:31 * RandalSchwartz waves at the channel
18:31 RandalSchwartz I have a config entry url.git@git.ziprecruiter.com:.insteadof https://git.ziprecruiter.com/
18:32 RandalSchwartz and a submodule that wants to be updated with a url of http://git.ziprecruiter.com/[...]
18:32 RandalSchwartz but it's still asking me for username/password for https
18:32 RandalSchwartz oops... never http. alwayys https
18:32 RandalSchwartz what am I doing wrong?
18:34 hust921 joined #git
18:34 RandalSchwartz (crickets)
18:34 DolphinDream joined #git
18:35 RandalSchwartz I could manually rewrite all my remote URLs that are currently live, but I thought this insteadOf was supposed to do the job.
18:35 User458764 joined #git
18:36 dsdeiz joined #git
18:37 hust921 joined #git
18:37 RandalSchwartz anyone?  anyone with insteadOf expertise?
18:40 livingstn joined #git
18:41 cdg joined #git
18:41 * RandalSchwartz sighs
18:41 RandalSchwartz not a lot of help here.  Not like the old days. :(
18:42 rwp RandalSchwartz, I don't know the answer but apparently no one else is around...
18:42 raijin joined #git
18:42 rwp I think when pulling git only asks you for a password if the remote asks you for a password.
18:42 RandalSchwartz Well, then again, I'm not idling here helping give out answers either.
18:42 RandalSchwartz Right... it's using the URL that should have been replaced.
18:42 RandalSchwartz I want to move from https to git:
18:42 peterbecich joined #git
18:43 RandalSchwartz [url "git@git.ziprecruiter.com:"]
18:43 RandalSchwartz insteadOf = https://git.ziprecruiter.com/
18:43 RandalSchwartz that's what I have, and it's still trying to touch https://
18:43 rwp The problem with git:// that you will always hear is that it is not encrypted and so is always a MITM danger.
18:43 routingsparks joined #git
18:44 rwp Hmm...  What command did you use to try to switch?  Let me look at my notes...
18:44 RandalSchwartz well - I added ssh:// too
18:44 RandalSchwartz I'm trying to do a git submodule update
18:44 metalraiden34 joined #git
18:45 mda1 joined #git
18:45 RandalSchwartz git submodule update --init --recursive --remote
18:45 rwp git remote set-url origin git://blah.example.com/blah should change the origin okay. Replace origin with any other remote to use a different one.
18:45 nebodka joined #git
18:45 RandalSchwartz the origin is already correct
18:45 rwp And of course I personally only rarely work with submodules so have no useful help there.
18:45 RandalSchwartz the submodules have varying URLs
18:47 rwp Having no better advice... I suggest you browse the .git/config file and look at what is stored there. Personally I would edit that (with emacs of course) and set it to what I wanted.
18:48 imack joined #git
18:48 _Vi joined #git
18:48 imack joined #git
18:49 hust921 joined #git
18:49 imack joined #git
18:49 hotpancakes joined #git
18:50 rwp RandalSchwartz, Should also browse !submodule documentation too. Probably the info you need is there.
18:50 gitinfo RandalSchwartz: 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
18:50 imack joined #git
18:51 rwp Which describes the .submodules file. I am thinking that hacking that file directly may yield the results you want.
18:51 imack joined #git
18:53 jackrandom joined #git
18:53 jimmyrcom joined #git
18:53 garyserj If I do git show-branch, and it shows me "[master] abc" and I do git log --oneline and the last commit is def, and the one before that is abc.. Then am I not checked out at the tip?
18:54 netj joined #git
18:54 D4R5C0D3 joined #git
18:55 jozwior joined #git
18:55 nioncode joined #git
18:56 jackrandom joined #git
18:56 raijin joined #git
18:56 felixsanz1 joined #git
18:59 Rodya_ joined #git
19:01 mjuszczak joined #git
19:02 dviola joined #git
19:05 livingstn joined #git
19:05 Gustavo6046 joined #git
19:06 cagomez joined #git
19:06 otiose joined #git
19:06 ryxai_ joined #git
19:07 dsdeiz joined #git
19:08 hotpancakes joined #git
19:08 hotpancakes joined #git
19:10 livingstn joined #git
19:12 MattMaker joined #git
19:13 Vampire0 garyserj, look at man git show-branch under the heading Output, there is described how to interpret the output
19:13 gitinfo garyserj: the git-show-branch manpage is available at https://gitirc.eu/git-show-branch.html
19:13 Vampire0 garyserj, if there is no asterisk at the left of the branch name, then you don't have the branch checked out
19:14 Vampire0 garyserj, show-branch does not show the current branch, but all branches
19:14 Vampire0 and more
19:14 _ng joined #git
19:15 Vampire0 garyserj, if you want to know your state, you should use `git status`, amongst the modified, deleted and untracked files it also tells you on which branch you are or if you are on a detached head
19:15 ntfwc joined #git
19:16 groton joined #git
19:17 bilal joined #git
19:18 btree joined #git
19:18 boombatower joined #git
19:18 pwnz0r joined #git
19:18 bilal__ joined #git
19:19 livingstn joined #git
19:19 _ikke_ joined #git
19:22 durham joined #git
19:22 darkmist_ joined #git
19:22 ntfwc hello
19:22 gitinfo ntfwc: 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.
19:22 dsdeiz joined #git
19:23 zerow joined #git
19:25 ascarter joined #git
19:25 ntfwc Does anyone know if there is a way to directly checkout files from a local read-only repository, without trying to obtain a lock?
19:25 durham joined #git
19:27 _ikke_ DO you just need the files?
19:28 ntfwc just the files
19:29 hotpancakes joined #git
19:29 _ikke_ try git archive
19:29 TheSimonator joined #git
19:29 bilal joined #git
19:30 btree left #git
19:31 ntfwc I do have that working. I was hoping I could do it directly though, so I can switch revisions more efficiently.
19:31 TbobbyZ joined #git
19:32 _ikke_ not without being able to write to the index
19:34 bilal joined #git
19:34 ntfwc Does it need to write to the index if you checkout files without moving the HEAD?
19:35 durham joined #git
19:39 ezio left #git
19:39 alexandre9099 joined #git
19:39 Vgr joined #git
19:40 _ikke_ yes, because it needs to write stat info
19:41 TbobbyZ joined #git
19:41 ntfwc ok, I guess archive is the way to go then
19:42 tristanp joined #git
19:44 pop_ joined #git
19:44 bilal joined #git
19:45 Acerific joined #git
19:45 rwp ntfwc, Why not just make a file copy (cp -a foo.read-only foo.writable) and then check out normally in the writable copy?
19:46 robattila256 joined #git
19:49 bilal_ joined #git
19:50 jeffreylevesque joined #git
19:51 ntfwc Well my idea was that I would store just one copy of the repository, and I could checkout anything from it as other users.
19:51 bilal joined #git
19:51 ntfwc Mostly just to save disk space
19:52 _ikke_ You know that git can share objects between repos?
19:52 Cabanossi joined #git
19:53 ntfwc like symlinks?
19:53 _ikke_ hardlinks
19:53 _ikke_ or reference repos
19:53 ntfwc I'll look into that
19:53 ntfwc Thanks
19:53 dsdeiz joined #git
19:55 bilal_ joined #git
19:56 TheSimonator joined #git
19:56 _ikke_ happen automatically if you clone with a path
19:56 _ikke_ (not starting with file://(
19:59 bilal joined #git
20:00 Rodya_ joined #git
20:01 rkazak joined #git
20:02 hamdy joined #git
20:03 RandalSchwartz aha.  my insteadOf needed to be in my global config so that all the recursive submodules accessed it.
20:03 RandalSchwartz left #git
20:03 ntfwc Yes, I think this will be better than using archive, thanks again
20:05 durham joined #git
20:08 thiago joined #git
20:08 jarnos joined #git
20:09 dsdeiz joined #git
20:09 dsdeiz joined #git
20:13 Levex joined #git
20:13 SwiftMatt joined #git
20:18 Vasya666 joined #git
20:19 apotry joined #git
20:22 ozcanesen joined #git
20:22 Cabanossi joined #git
20:22 vuoto joined #git
20:23 ryxai joined #git
20:23 MineCoins joined #git
20:24 dirtyroshi joined #git
20:33 bilal_ joined #git
20:33 netj joined #git
20:33 metalraiden34 joined #git
20:35 tohuw_ joined #git
20:35 jozwior joined #git
20:39 dogarrhea joined #git
20:40 SwiftMatt joined #git
20:40 dogarrhea git push heroku master shows as successful
20:40 tohuw_ joined #git
20:40 dsdeiz joined #git
20:40 dsdeiz joined #git
20:40 dogarrhea git status shows "you're ahead by 3 commits"
20:40 dogarrhea this seems wrong
20:40 dogarrhea Your branch is ahead of 'origin/master' by 3 commits.
20:40 _ikke_ dogarrhea: On what branch are you now?
20:40 netroxen joined #git
20:41 dogarrhea *master
20:41 _ikke_ you push to heroku, not origin
20:41 dogarrhea so i just live with this message forever right?
20:41 tohuw joined #git
20:41 _ikke_ so origin/master is not updated
20:41 _ikke_ well, what is origin?
20:41 tohuw_ joined #git
20:42 _ikke_ You can always change the tracking branch
20:42 dogarrhea https://github.com/heroku/python-getting-started.git is origin apparently
20:42 dogarrhea i don't have a login for this
20:42 _ikke_ git branch --set-upstream-to heroku/master master
20:43 bilal joined #git
20:43 dogarrhea hrm.
20:43 dogarrhea that fixed it.  I guess some heroku cli command forgot to set origin to the one i'm supposed to be looking at
20:44 groton_ joined #git
20:44 vuoto joined #git
20:45 _ikke_ it's not required for git to function
20:45 _ikke_ dogarrhea: you can always fix it by doing git push -u heroku master
20:47 _ikke_ s/always/also
20:47 Forlorn joined #git
20:55 brent__ joined #git
20:55 darkmist_ joined #git
20:55 dsdeiz joined #git
20:55 dsdeiz joined #git
20:58 cdg joined #git
20:59 MDA2 joined #git
21:00 brent__ joined #git
21:01 Rodya_ joined #git
21:03 Random832 joined #git
21:04 bilal joined #git
21:07 Cabanossi joined #git
21:07 otiose_ joined #git
21:11 raijin joined #git
21:12 tristanp joined #git
21:13 tristanp joined #git
21:18 bilal joined #git
21:20 Atm0spher1c joined #git
21:21 askb joined #git
21:21 tymczenko joined #git
21:24 Discovery joined #git
21:24 Eimu joined #git
21:25 duderonomy joined #git
21:26 dsdeiz joined #git
21:26 dsdeiz joined #git
21:32 gradleh8 joined #git
21:33 btree_ joined #git
21:33 btree_ left #git
21:36 alexandre9099 joined #git
21:39 NeXTSUN joined #git
21:42 dsdeiz joined #git
21:46 raijin joined #git
21:47 wcpan joined #git
21:48 SwiftMatt joined #git
21:50 acetakwas joined #git
21:52 nd joined #git
21:52 Cabanossi joined #git
21:53 nyuszika7h joined #git
21:54 bilelmoussaoui joined #git
21:57 aidalgol joined #git
21:58 apotry joined #git
21:59 shgysk8zer0 joined #git
22:00 salamanderrake joined #git
22:02 Rodya_ joined #git
22:03 bilal joined #git
22:03 Rodya_ joined #git
22:05 ok91 joined #git
22:07 wintrytbs joined #git
22:11 davimore joined #git
22:12 tnecniv joined #git
22:13 rxc joined #git
22:15 D4R5C0D3 joined #git
22:18 cdown joined #git
22:19 tnecniv joined #git
22:20 rxc left #git
22:21 watabou joined #git
22:24 prg3 joined #git
22:30 msm joined #git
22:31 tristanp joined #git
22:32 cads joined #git
22:34 maroloccio joined #git
22:40 atomi joined #git
22:47 borkr joined #git
22:48 peacememories joined #git
22:50 rxc joined #git
22:52 felixsanz1 joined #git
22:54 NumberStation08 joined #git
22:55 Lunatrius` joined #git
22:55 valize joined #git
22:56 lf94 joined #git
22:56 mar77i_ joined #git
22:56 lf94 left #git
22:56 lf94 joined #git
22:57 lf94 For "deleted by us" during a rebase, how do I automatically select to "use ours" ?
22:57 mda1 joined #git
22:57 lf94 I keep getting "does not have our version" when using, say: checkout --ours <file/path>
22:58 thiago joined #git
22:59 AlHafoudh joined #git
22:59 bilal joined #git
22:59 Renter joined #git
23:00 uranellus joined #git
23:00 uranellus joined #git
23:00 _ikke_ lf94: if it's deleted by us, it's indeed correct that their is not an --ours version
23:00 bauruine joined #git
23:00 _ikke_ lf94: Do you want --theirs?
23:00 lf94 Oh
23:00 _ikke_ or what do you want to happen?
23:00 lf94 Deleted by us, but added by them...?
23:00 musca joined #git
23:00 lf94 or maybe just modified by them
23:00 _ikke_ the latter
23:00 markus-k joined #git
23:01 _ikke_ most likely a modified/delete conflict
23:01 lf94 So how do I...choose to keep deleted?
23:01 _ikke_ git rm <file>
23:01 lf94 Pffft right.
23:01 lf94 Thanks ikke :)
23:02 lf94 Hm, does checkout not recurse?
23:02 lf94 Does -s recursive -X theirs work for checkout
23:02 jast that's a different kind of recursion specific to merging
23:03 _ikke_ -s is the merge strategy
23:03 lf94 I'm trying to do: git checkout --theirs path/to/a/bunch/*
23:03 JanC joined #git
23:03 _ikke_ And what happens if you do that?
23:04 bilal joined #git
23:04 lf94 It doesn't add them to be merged
23:04 lf94 Remains as an "unmerged path"
23:04 lf94 Still says "deleted by us"
23:04 lf94 (I know earlier I wanted to keep it deleted but I realize now I dont - I want to keep theirs)
23:05 peacememories joined #git
23:05 _ikke_ Does it give an error or some kind of message?
23:05 jast this is normal for 'git checkout --theirs' -- it updates the working tree but not the index
23:06 jast you need to do a 'git add' on the same file(s) afterwards
23:06 lf94 I'm in the middle of a rebase
23:06 jast so? :)
23:07 lf94 How will it add "theirs" changes if the file is non existent?
23:07 jast well, you said you did do the 'git checkout --theirs', right? that *should* restore the files, but without changing their status in 'git status'
23:08 YuGiOhJCJ joined #git
23:08 otiose_ joined #git
23:08 lf94 Oh good point
23:09 jast so, this is a two-step process
23:09 jast you can do it in a single step but it's a little trickier, especially when rebasing
23:09 lf94 So now I do git add <glob> ?
23:09 jast yep
23:09 lf94 Two steps is fine
23:10 lf94 The issue is I'm dealing with a bunch of garbage build files, that are removed upstream, but not at this moment in the rebase
23:10 lf94 So doing them all 1-by-1 would take forever
23:10 jast do your other local commits keep updating them?
23:11 jast because if not, I'd get rid of them now and the remaining commits should be fine
23:11 lf94 I think they do, yes.
23:11 jast basically if you keep them around for now, it'll look as if your commit re-adds the garbage files, not sure you want that :)
23:12 lf94 The guy I was working with wasn't aware there was such thing as .gitignore and he was just git add -a all the time lol
23:12 gableroux joined #git
23:12 jast fun
23:12 lf94 It's fine. This repo is totally trashed anyway heh.
23:12 lf94 In terms of history
23:12 jast oh well :)
23:13 netroxen joined #git
23:13 BSAlb joined #git
23:15 peacememories joined #git
23:15 justanotheruser joined #git
23:16 mozzarella joined #git
23:16 NeXTSUN joined #git
23:19 sammyo joined #git
23:19 acetakwas joined #git
23:21 Cabanossi joined #git
23:25 ispn joined #git
23:27 Soni joined #git
23:29 romank joined #git
23:32 Grievre joined #git
23:32 Grievre Is there any way to have multiple checked-out trees at once without having multiple repos? Just trying to save a little bit of space
23:33 bremner ,worktree
23:34 bremner man git worktree
23:34 gitinfo the git-worktree manpage is available at https://gitirc.eu/git-worktree.html
23:34 bremner there we go.
23:34 bremner Grievre: ^
23:35 thiago joined #git
23:38 snowalpaca joined #git
23:38 snowalpa_ joined #git
23:38 feodoran joined #git
23:41 FuzzyWuzzyPanda joined #git
23:46 mel00010 joined #git
23:47 XenophonF joined #git
23:48 Burgerz joined #git
23:49 anuxivm joined #git
23:50 a3Dman joined #git
23:50 madewokherd joined #git
23:50 romank joined #git
23:53 tlaxkit joined #git
23:57 gableroux joined #git

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