Recovering Folder from Git Restored Repo
I am in a bit of a pickle. I deleted a remote repo that had a folder that I belatedly realized I need. The deleted repo exists on a backup which I restored. How do I extract the needed folder from that restored repo. Not being a git expert I'm not sure what to do but I cannot find any recognizable sources. This is an 'ls' of the restored repo: branches config description HEAD hooks info objects ref TIA. signature.asc Description: OpenPGP digital signature
Re: merge vs. rebase question
Thanks for the reply. I'm afraid this question has become moot. I can no longer reproduce the problem as it is now working as expected. I did find an incorrect ownership on one of the 'objects' sub-directories but I would think that should have given me an error. Perhaps I used root at the wrong time to do something and that changed the ownership. In any case there is not much I can do at this point since the problem no longer exists. On 1/18/2013 1:38 PM, Phil Hord wrote: On Thu, Jan 17, 2013 at 9:14 AM, Dennis Putnam d...@bellsouth.net wrote: As a git noob I am having trouble understanding when to use which commands. I have a repository (bare) on my Linux server. I also created a build directory as a local repository. In my build script I do a 'git pull' to make sure the build directory is up to date. No changes are made to my source so this repository never does an 'add' or 'commit'. When I run my script with 'pull', the output indicates that changes were found and seems to have pulled them into the local directory. However, when I look at the resulting source, none of the expected changes show up. I then tried a 'fetch' and 'rebase'. That worked but I don't understand why. I thought 'pull' did a 'fetch' and a 'merge' so I don't understand why a 'fetch' and 'rebase' worked but 'fetch' and 'merge' did not. Unless my understanding of what 'pull' does is wrong. In my case, what should I be using in my script to assure that the build directory is current? If your build directory never has any source changes or new commits, then pull is the right thing to do. You might want to use 'git pull --ff-only' to guarantee that your build directory is not creating merges unexpectedly. You did not provide enough information to help figure out why your pull is failing to achieve the results you expect. I suggest you perform the pull manually in your build directory. If it fails, git should tell you why. If it reports success but actually fails, you can post a detailed explanation of the problem here so someone can suggest the cause. Phil signature.asc Description: OpenPGP digital signature
merge vs. rebase question
As a git noob I am having trouble understanding when to use which commands. I have a repository (bare) on my Linux server. I also created a build directory as a local repository. In my build script I do a 'git pull' to make sure the build directory is up to date. No changes are made to my source so this repository never does an 'add' or 'commit'. When I run my script with 'pull', the output indicates that changes were found and seems to have pulled them into the local directory. However, when I look at the resulting source, none of the expected changes show up. I then tried a 'fetch' and 'rebase'. That worked but I don't understand why. I thought 'pull' did a 'fetch' and a 'merge' so I don't understand why a 'fetch' and 'rebase' worked but 'fetch' and 'merge' did not. Unless my understanding of what 'pull' does is wrong. In my case, what should I be using in my script to assure that the build directory is current? Thanks. signature.asc Description: OpenPGP digital signature
Re: Push Windows to Linux Repository Problem
Hi Andreas, Thanks for the reply and no, I could not. However, you put me on the right track. Since I was only pushing/pulling from Windows to/from my Linux repository, I did not realize that an SSH session from the Linux back to Windows would ever be necessary. I don't really understand why but apparently it is. I never set up that backwards connection. Once I did, everything started working. On 12/23/2012 4:06 AM, Andreas Schwab wrote: Dennis Putnam d...@bellsouth.net writes: I keep getting fatal: Could not read from remote repository. Can you git ls-remote the repository? Andreas. signature.asc Description: OpenPGP digital signature
Using Eclipse git plugin
This may be more of an Eclipse question than a git question but hopefully someone on this list knows both. I now have a working git central repository (on Linux) and a local repository clone (on Windows). I can see and edit my files in Eclipse, commit them and push them to the remote repository. The problem I am having now is developing my code in Eclipse. It seems I can no longer run the code as the 'Run as Application' menu item is missing. How do I test my code now? TIA. signature.asc Description: OpenPGP digital signature
Installation Plan
After re-reading the git documentation and with Andrew's input I have changed my thinking on how to set this up and want a central repository. If I understand correctly, I am doing builds while I am developing new code so I need to clone my repository for Eclipse (I'm assuming the git plugin supports all this). Before I go to the trouble of setting it up please correct where my thinking is flawed or where I may run into gotchas. 1) Install git on Linux. 2) Copy existing Eclipse project to a new directory to become the central repository. 3) git init in that new directory (I think I then do a git add and git commit). 4) Modify build scripts to build from that directory (I am guessing I need to git ignore the javac generated binary directory). 5) Install git plugin on Windows version of Eclipse. (Do I need git on Windows or is the plugin sufficient?) 6) Configure plugin for remote git, if necessary? 7) Clone new repository for development and testing on Windows. (Do I need the shared drive any more?) 8) When a new version is ready for release, push commit to remote repository after which builds will use new code (I'm assuming the file copies happen automagically). Am I over simplifying things? I also think that this will open the door for collaborators in the event I need them with no changes to the way I work. I should note that builds are done on demand so is there a way to detect when a push is occurring and have the build script wait for completion and I suppose vise-versa? Thanks. signature.asc Description: OpenPGP digital signature
