Re: git on Cygwin: Not a valid object name HEAD

[Steffen Prohaska <prohaska@zib.de>]

On Aug 8, 2007, at 7:20 PM, Johannes Schindelin wrote:

> On Wed, 8 Aug 2007, Mark Levedahl wrote:
>
>> On 8/8/07, Steffen Prohaska <prohaska@zib.de> wrote:
>>>
>>> The bottom line for me is, git does not yet support Windows in a
>>> usable way for the organizations that I need to convince.
>>>
>>>         Steffen
>>>
>>
>> Have you considered jumping in to help on the msys git port Johannes
>> Schindelin is working? He has very generously offered to do
>> essentially everything except find bugs, the latter because he does
>> not actually use Windows so can't, and is clearly putting a great  
>> deal
>> of effort into this. A stable and complete Windows port may be much
>> closer than you think.
>

I'll look into it. However, my situation is similar to Johannes'. I do
not regularly work on Windows. I use my Mac for all office work and
typically code on Linux. However, I do use Windows from time to time
because the majority of the people I work with use Windows.

I have a real Windows running in a Virtual Machine and I consider
switching to it for a while, to see if things run smoothly. Here is
what I plan to do: I will set cygwin to textmode (!), although I know
better. But this is what most of the people I work with have. I'll
uninstall cygwin's git and install msysgit instead. I'll try to do
all the integration work, that is import from cvs on Linux, pull to
Windows and do coding and merges on Windows. I'll push back to Linux
and Mac for testing.

After the basic stuff, like pull, push, merge, commit, gitk, and
git gui, here's my first more difficult task: Will git-mergetool
launch something useful for me on Windows? I heard that WinDiff
would be useful. On Mac I use FileMerge.

> To be fair, we are already a team of five working on it.  The 3rd
> generation of the net installer works as flawlessly as the first, but
> msysgit.git is a superproject now, containing the complete build
> environment you need, and has git/mingw/4msysgit.git as a submodule  
> (yes,
> that is a fork of a fork; they work now on repo.or.cz).
>
> Please find it on
>
> 	http://msysgit.googlecode.com/
>
> (It's a meager 1.4 MB, so the whole rest is git-cloned natively!) It
> already passes all tests, is able to start gitk and git-gui, and  
> more is
> to come!
>
> And no, I did not agree to do _everything_.  I agreed to do things  
> _when I
> get something in return_.

I read this before. At the time you wrote about this on the mailing list
I thought that cygwin would be fine. I wasn't aware of the binmode/ 
textmode
magic and all the problems caused by it.

> For example, we have a functional script sitting in msysgit.git which
> builds a complete WinGit installer (WinGit being the code name for  
> "Git on
> MSys without the whole build environment").
>
> It is incomplete in only a few issues:
>
> 	- it does not install anything in the start menu
>
> 	- it does not install any short cut on the Desktop
>
> 	- it does not install anything in the Quick Launch bar
>
> 	- it does not include a nice WelcomeToGit.html, to be launched
> 	  after a successful install
>
> 	- it does not contain a nice way to start git-gui (you have to
> 	  start it by hand from the command line inside bash)
>
> 	- etc.
>
> So go for it, everybody, or alternatively do not even bother to whine.

I don't care about these things. I typically start the Explorer by  
typing
explorer into the 'Run ...' box of the start meny. So don't expect  
anything
from me that makes git more beautiful.

The only thing I want to achieve is a flawlessly running git that works
out-of-the box in the presence of a cygwin in textmode (!). If possible
git should have the same version number that I have on Linux and Mac,
which means the master branch of Junio's repo on my Mac. Lagging a bit
behind for a while is ok, but in general I'd prefer to have the same
version on Linux, Mac, and Windows. What I described means Windows  
support
for me. Having a nice installer is not important.

> Ciao,
> Dscho
>
> P.S.: I'll be not really available for a few days, starting from  
> tomorrow,
> so do use the mailing list to keep in touch with others working on  
> msysgit
> or 4msysgit, and do use the mob branch (you can bug the project  
> members
> listed on the homepage to cherry-pick, sign off and push if need be).
>

ok. I'll be available for one more week and will then be offline
for three weeks.

	Steffen