Граф коммитов

1155 Коммитов

Автор SHA1 Сообщение Дата
Sebastian Schuberth b6ce102b01 Explain why we need the THIS_IS_MSYSGIT file
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-10-03 17:48:45 +02:00
Pat Thoyts 206019cae3 Source git-prompt.sh if present.
In git commit af31a456 the git prompt code was moved out into another
file to permit lazy loading of bash functions. To maintain our git
prompt we must source both files now.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-09-28 11:26:35 +01:00
Sebastian Schuberth 96f0c0f9e6 Installer: Early check whether the installation directory is writable
This avoids the user from going through all the settings again in case
a directory was chosen that cannot be written to in setup's very last
copy step.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-09-12 09:52:52 +02:00
Sebastian Schuberth d93c69c3a5 Remove 7-Zip's vanilla 7zS.sfx as it is unused
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-08-03 17:14:34 +02:00
Sebastian Schuberth e3f6fd6868 Use version 1.50 beta (build 2478) of the modified 7-Zip SFX module
This version is based on the 7-Zip version 9.22 source code and was taken
from

http://7zsfx.info/en/download.html
2012-08-03 15:07:53 +02:00
Sebastian Schuberth 344fcb731b Update 7-Zip to version 9.22 (beta)
Note that the version numbering is inconsistent between the history and
readme files. The files were taken as-is from

http://sourceforge.net/projects/sevenzip/files/7-Zip/9.22/
2012-08-03 15:02:21 +02:00
Sebastian Schuberth ffb13af63d Merge pull request #51 from XhmikosR/devel
Installer: Fix UninstallDisplayIcon path
2012-07-31 23:43:26 -07:00
xhmikosr 76b4a3a3e6 Installer: Fix UninstallDisplayIcon path
Signed-off-by: xhmikosr <xhmikosr@users.sourceforge.net>
2012-07-31 23:58:47 +03:00
Sebastian Schuberth 3bb3488dc7 Slightly reduce the installer's file size
Sort files by extension before compressing them which in conjunction with
solid compression reduces the installer's file size by about 200 KiB. Also
sorting by file name does not result in any further improvement.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-07-29 22:15:54 +02:00
Sebastian Schuberth 5c37ada98d Installer: Update Inno Setup to version 5.5.1 (Unicode)
For the revision history, see:
http://www.jrsoftware.org/files/is5-whatsnew.htm

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-07-17 20:57:56 +02:00
Benoit Mortgat 759a59f67b Bash PS1: Correctly enclose nonprintable sections
`\[` and `\]` are used for enclosing nonprinting characters in bash PS1.
Enclosing printable characters inside those bracket pairs results in bad
behaviour when the PWD contains characters from an extended character
set (not strictly in ASCII).

Therefore, instead of enclosing big chunks of PS1 inside `\[`...`\]`
pairs, we only put them around the small, non-printable character parts.

Signed-off-by: Benoit Mortgat <mortgat@gmail.com>
2012-07-16 12:51:51 +02:00
Benoit Mortgat 4e4e3f3fef Bash PS1: Split up PS1 into small components
Signed-off-by: Benoit Mortgat <mortgat@gmail.com>
2012-07-16 12:51:48 +02:00
Benoit Mortgat 707197edb5 Bash PS1: refactor code for better readability
Signed-off-by: Benoit Mortgat <mortgat@gmail.com>
2012-07-16 12:51:44 +02:00
Pat Thoyts 3fc06990b1 Update the release script to handle git subtree command from contrib.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-12 20:06:05 +01:00
ciaranj 9a11989926 Add git subtree subcommand to default distribution
The git subtree subcommand is now part of the official git repository.
This tweak ensures that msysgit provides support for the command out
of the box without end-user interaction.

Signed-off-by: ciaranj <ciaranj@gmail.com>
2012-07-12 15:03:27 +01:00
Pat Thoyts 663ecd2944 Update release notes
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-10 10:01:16 +01:00
Pat Thoyts 9d3c9d917f Include the CAcert root certificates in our CA certificate bundle.
This allows us to accept CAcert issued certificates as valid for SSL
connections. CAcert is a chain-of-trust certificate authority using a
model like PGP for authenticating trust and is used by some open source
sites as the CA issues free certificates provided there is sufficient
confirmation of identity using the web of trust.

The CAcert license requires mentioning in the documentation and it is
polite to list other packages that Git for Windows depends upon.

This closes github issue #37.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-10 09:20:25 +01:00
Sebastian Schuberth 22a91678d6 WinGit: Be more precise about what changed regarding TortoisePlink detection
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-07-08 21:08:40 +02:00
Sebastian Schuberth 3b02b33987 WinGit: Equalize the spelling of "Plink" in the release notes
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-07-08 21:06:00 +02:00
Pat Thoyts 7ae0d04920 Updated git wrapper exe
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-06 19:56:38 +01:00
Pat Thoyts 726102c90a git-wrapper: ensure the child process exit code is returned.
The new compiled git wrapper failed to propagate the error code from the
wrapped process which causes problems when scripting git commands.
Also print error messages if something fails when launching the target
process.

This resolves github issue #43.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-06 19:56:19 +01:00
Pat Thoyts d9cd7aec13 Updated git wrapper exe
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-05 20:33:36 +01:00
Theo Niessink 2d8badd723 Fix starting git-gui through git-wrapper.
Starting git-gui from the command line would result in an error because the
internal script variable was not initialized.

Signed-off-by: Theo Niessink <niessink@martinic.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-05 20:31:28 +01:00
Pat Thoyts 47a55b6de4 Update for Git v1.7.11.1 to resolve issues since the v1.7.11 release.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-04 22:53:47 +01:00
Pat Thoyts fdf768fd8c Ensure git-gui uses the same icon as all other Git programs.
Overwrite the stock git-gui icon file with our own resource to provide
some visual consistency in the shipped applications.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-28 10:33:00 +01:00
Pat Thoyts bcb6b06cca Updated git wrapper exe
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-27 23:16:53 +01:00
Pat Thoyts 893b221982 Added a compiled wrapper to replace the git.cmd script.
This addresses github issue #36 which points out problems in handling
git commit notations of the form tag^{commit} and HEAD^. The windows
command shell uses caret as a quote both on the command line and in
batch scripts and this results in requiring double quoting. To be
able to handle both "tag^{commit}" and tag^^{commit} (either style
of command prompt quoting) the script needs replacing. This also makes
it simpler to call git from batch scripts as it will no longer need to be
prefixed with 'call'.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-27 23:16:14 +01:00
Johannes Schindelin cb9836b8a5 Mark scripts and binaries in /bin/ as executable
This helps Cygwin and reusing msysGit scripts on Linux.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-06-26 10:08:34 -05:00
Johannes Schindelin 0c271e94c6 Update the release notes (preliminary)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-06-25 16:09:12 -05:00
Sebastian Schuberth b3c11baae0 WinGit: Use the new logo from git-scm.com
These logos are picked up by the installer. Delete the SVG of the old
logo, an EPS file of the new one can be downloaded from git-scm.com.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2012-06-25 22:23:23 +02:00
Sebastian Schuberth cf20f44428 Merge pull request #33 from csware/installer
Installer
2012-06-25 02:13:01 -07:00
Sven Strickroth 2830b1f411 Installer: Hide Directory and Program Group pages on upgrade
The user normally do not want to change these settings, also this speeds up the upgrade process.

This does not break parallel installs since AppId isn't set and includes no version number (in this case AppId defaults to AppName). Parallel installs were not fully supported before this patch (uninstaller in the Windows control panel always only points to the latest installation, ...).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2012-06-24 21:18:26 +02:00
Sven Strickroth 0d984a6296 Installer: Detect TortoisePLink from TortoiseGit
As TortoiseGit also comes with the improved version of Plink, offer the user to use that version, too.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2012-06-24 21:18:25 +02:00
Johannes Schindelin d82f37a67b merging-rebase: allow 'branch' to be something else than 'devel'
I'd like to use Jenkins in the near future to perform rebasing merges
whenever Junio updates 'next'. In order to do that, I will need the
merging-rebase script to perform on another branch than 'devel'.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-06-23 12:57:02 -05:00
Pat Thoyts 6c27376378 Add new Git::SVN perl module files to the installer file list.
These new files need to be included with Git.pm for git-svn support.
Fixes github issue #32

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-21 09:39:01 +01:00
Pat Thoyts 8b7eb7e08b Updated to Git v1.7.11
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-20 20:38:20 +01:00
Pat Thoyts aaf4a7cc0c Revert "Add an up-to-date test for msys-1.0.dll"
This reverts commit f08322cab3

This check no longer works as since 60527eb binaries may be modified on
installation to speed up loading which changes the MD5 checksum on the
users system.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-20 20:38:16 +01:00
Pat Thoyts 41dd47d622 Fixed the zlib 64 bit release script.
The patch is can be replaced by providing a command line option.
Improved the handling of errors in the script.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-20 11:55:21 +01:00
Pat Thoyts 763d959cd2 Ignore the SVN perl module which is installed since 1fd8f97
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-20 10:48:21 +01:00
Pat Thoyts 2848d300fc Install hexdump-1.7.tar.gz
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-09 23:55:22 +01:00
Pat Thoyts 31801cb537 hexdump: update release script to use version 1.7
Include a patch to avoid printing tabs and distorting the ASCII output.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-09 23:54:36 +01:00
Johannes Schindelin 4c01ae5e57 disable Windows Error Reporting: really disable it
It is fascinating how inconsistent the documentation on this issue is.
Yury V. Zaytsev helped me identify another registry entry we have to set
in order to disable the interactive error reporting which makes so little
sense in a server setting.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-06-07 16:06:18 -05:00
Pat Thoyts f80f5a2644 Install curl-7.26.0.tar.bz2
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-07 19:34:35 +01:00
Pat Thoyts 7caf9e6627 Install zlib-1.2.7.tar.gz
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-07 19:34:34 +01:00
Pat Thoyts fc018a6eed zlib: update zlib release script to 1.2.7
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-07 19:34:33 +01:00
Sebastian Schuberth f9b4a27e84 Merge pull request #26 from mikofski/devel
Use 32-bit cmd.exe to open .sh files even on 64-bit Windows to avoid crashes
2012-06-07 08:05:26 -07:00
Mark Mikofski fb20d3bf53 Use 32-bit cmd.exe to open .sh files on 64-bit Windows to avoid crashes
use %WINDIR%\SysWOW64\cmd /C to run "sh.exe --login %1 %*"
use {syswow64} variable to determine which cmd to use

addresses issue #12

Signed-off-by: Mark Mikofski <mark.mikofski@sunpowercorp.com>
2012-06-07 07:25:37 -07:00
Johannes Schindelin f8f37dd63a Add a Tcl script to disable Windows Error Reporting
For the test suite, we do not want popups blocking the test run...

This script comes in real handy e.g. when running the test suite in
Jenkins, where the Jenkins Windows node has a graphical desktop by
necessity but nobody looks at it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-06-07 00:51:06 -05:00
Pat Thoyts 19288e3798 Install curl-7.26.0.tar.bz2
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-06-06 21:32:51 +01:00
Johannes Schindelin f2caa85f62 Update /src/curl/release.sh to download & install 7.26.0
Previous cURL versions did not try to build .dll files; unfortunately,
support for .dll files is not quite cooked yet: when enabling the shared
library build, libcurl.a contains symbols marked as dllexport, which makes
the link stage fail (as reported by Pat Thoyts).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2012-06-06 21:19:57 +01:00