Fix zlib 1.2.6 not available from serve anymore

Only the current version, 1.2.7, is available,

	curl http://zlib.net/zlib-1.2.6.tar.gz

returns a 404 Not Found.

[jes: clarified commit message, as pointed out by Sebastian Schuberth.]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
run-tests: use /usr/git/ instead of /git/ to please t9700

The test script t9700 uses Perl's own cwd() call which reports
/usr/git/t/<...> even when bash would report /git/t/<...>. Go the easy
route by forcing the bash to believe we're in /usr/git/t/<...> (which is
correct, as /usr/ points to / due to an internal MSys mechanism).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a new script to perform a 'merging rebase'

We introduced the concept of a 'rebasing merge' earlier, which simply
meant that in addition to rebasing all of our commits on top of
git.git's 'next' branch, we also performed a merge with the previous
state of the current branch using the 'ours' strategy, so that things
still would fast-forward.

This approach has quite a few shortcomings, not the least of which are:
it is hard to find the commits that need to be rebased (because of the
merge, all previous versions of the commits are part of the history),
and we could not take advantage of rebase's --autosquash option.

Instead, let's perform the merge with the 'ours' strategy _before_
applying all the patches.

That way, the commits to be rebased in the future can be obtained using
the commit range <merge>.. where <merge> is simply the most recent start
of a merging rebase.

Since the introduction of the 'exec' command (thanks Matthieu Moy), the
implementation is very easy: we only have to inject two commands at the
start of the edit script to initialize the merging rebase.

There is a cunning hack in the script to make use of previous rebasing
merges (as opposed to merging rebases): we now require a single commit
as base for use by 'git rebase -i'. Since the rebasing merges only
provide a pair of bases, not a single base, we make a throw-away merge
commit combining those two bases into a single one.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
merging-rebase: fix a couple of obsolete comments

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Attempted fix for issue with context-menu entries on XPx64/Server2003x64

See http://stackoverflow.com/questions/10450550/msysgit-fork-cant-reserve-memory-for-stack/10639268#10639268

Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Added CGI.pm (3.15) to the default perl install

The instaweb script requires this perl module to be present in order to
launch.

This version of the CGI module was retrieved from the 'msys' branch of
msysgit using the command:

	git checkout origin/msys -- lib/perl5/5.8.8/CGI*

This also included an 'eg' (or examples) folder that we pruned to save
space in the resulting packed WinGit (and msysgit.)

Signed-off-by: Ciaran Jessup <ciaranj@gmail.com>
msysGit/post-install: ignore submodules

This script is really only meant for installing files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Installer: Update Inno Setup to version 5.5.0 (Unicode)

For the revision history, see:
http://www.jrsoftware.org/files/is5-whatsnew.htm

Most notably, the Inno Setup now natively supports Vista's Restart Manager
API:
http://msdn.microsoft.com/en-us/library/windows/desktop/aa373524.aspx

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Installer: Do not try to create Symbolic Links anymore (GitHub issue #16)

This manually reverts 7fdd58ffe2bc08a956ea791461fe421f3acc440a partly as
some third-party software, like CopSSH, does not work correctly with
Symbolic Links. Making CopSSH work is more important than making Windows
Explorer display the correct directory size, which was the main original
reason to use Symbolic Links.

The confusion about the directory size when using Hardlinks can be
reduced in a future commit that only creates Hardlinks for
git-receive-pack and git-upload-pack, but no other built-ins.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Make `NO_SFX=1 portable-release.sh` work

NO_SFX support was added in cd84195120bb660bf1291502c5b6e5d9982508e1,
and, as far as I can tell, seems to have been broken from the start.

Signed-off-by: Adam Roben <adam@roben.org>
Merge branch 'fix-nosfx' of git://github.com/aroben/msysgit into devel
Teach OpenSSL to work with Unicode cert file paths

This makes specifying a Unicode path for http.sslcainfo work.

Signed-off-by: Adam Roben <adam@roben.org>
Install OpenSSL 0.9.8r

Signed-off-by: Adam Roben <adam@roben.org>
Install OpenSSL 0.9.8r import libs

Signed-off-by: Adam Roben <adam@roben.org>
Merge branch 'unicode-cert-path' of git://github.com/aroben/msysgit into devel

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge branch 'devel' of https://github.com/msysgit/msysgit into devel
Merge pull request #2 from github/update-to-upstream

Update to upstream