Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: an/vim-utf-8
Commits on Feb 8, 2012
  1. Supersede the older 'an/vim-utf-8' for this newer version

    authored
    This merge supercedes an older version of 'an/vim-utf-8' (6017a8d...)
    which was under github/msysgit and was merged into 'devel' in favour
    of a newer version under github/atnak (ee24d5b...).
    
    This merge was created using `git merge -s ours <older_version>'.
    
    The discussion pertaining to this merge follows:
    
    On Wed, 08 Feb 2012 10:28:36 +0900
    Atsushi Nakagawa <at...@chejz.com> wrote:
    > Oops, I just noticed that the version of "an/vim-utf-8" that was merged
    > is an older version in msysgit/msysgit[1] which I couldn't work out how
    > to push over.
    >
    > The last version that I pushed was to atnak/msysgit[2] and this list[3].
    > The only delta (aside from the commit message) is an addition of
    > "git-rebase-todo" to the file name pattern (for `rebase -i').
    >
    > [...]
    >
    > [1] https://github.com/msysgit/msysgit/tree/an/vim-utf-8
    > [2] https://github.com/atnak/msysgit/commits/an/vim-utf-8
    > [3] http://groups.google.com/group/msysgit/browse_thread/thread/ab5ad659831b0fe0
Commits on Dec 11, 2011
  1. vimrc: Set UTF-8 as vim's default encoding for commit messages

    authored
    We avoid setting `encoding' and `termencoding', and opt to only setting
    `fileencodings' because it's understood that vim sets the former two to
    the user's system's "ANSI" and "OEM" code pages (setting either both if
    they differ or only `encoding' if they're the same) [1].  The setting of
    "OEM" is particularly significant as it is required for native characters
    to be correctly displayed on the user's console [2].
    
    We set "utf-8" as the only value of `fileencodings', there by making it
    the default encoding used to save new commit messages to COMMIT_EDITMSG.
    This is consistent with what git expects in an environment where the
    user has not altered the value of `i18n.commitencoding'.
    
    When loading an existing message, for operations such as 'commit --amend'
    and 'rebase -i', our setting for `fileencodings' means that vim will first
    attempt to load it as UTF-8 and then fallback to the encoding set by
    `encoding' if unable to do so.  This encoding is expected to be "ANSI",
    as mentioned above, and this side-effect is of benefit if the user does
    have an altered value of `i18n.commitencoding'.  (Here, we're assuming
    users not set this, if at all, to anything other than that of "ANSI"
    because that is thought to be the most natural for their location.)
    
    Users SHOULD unset `i18n.commitencoding' after this is released.  However,
    failing to do so may not show any visible regressions.  (See tests for
    case #2 at [3].)
    
    This patch follows the discussion in the [4] link.
    
    [1] http://groups.google.com/group/msysgit/msg/be6218f1cbf5e747
    [2] http://groups.google.com/group/vim_dev/msg/3dd77f3014a60e43
    [3] http://groups.google.com/group/msysgit/msg/508cca8b57f00546
    [4] http://groups.google.com/group/msysgit/msg/55c582fb1b279d08
Commits on Dec 7, 2011
  1. dscho

    Use UTF-8 encoding for commit messages in vim

    authored dscho committed
    Set vim's default and assumed encodings for saving and loading commit
    messages to "utf-8".
    
    Since our vimrc contains no other encoding settings, the outcome is
    expected to be "encoding=ACP termencoding=ACP fileencoding=utf-8".  Where
    ACP is the multibyte codepage that's native to the user's system (for
    example, "ascii" on an English system and "cp932" on a Japanese).
    `encoding' gets its value from vim, `termencoding' implicitly from
    `encoding' and `fileencoding' becomes the only available value in our
    setting of `fileencodings'.
    
    The value of ACP for `termencoding' needs to be retained because that's
    the only encoding that current versions of vim support for displaying
    characters native to the user's system[1].  On the other hand,
    `fileencoding' needs to be "utf-8" because that's the expected encoding
    for git's "COMMIT_EDITMSG" file.
    
    This patch follows the discussion in the [2] link.
    
    [1] http://groups.google.com/group/vim_dev/msg/3dd77f3014a60e43
    [2] http://groups.google.com/group/msysgit/msg/55c582fb1b279d08
Commits on Dec 6, 2011
  1. Pat Thoyts

    Updated to Git v1.7.8

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  2. Christopher Wellons Pat Thoyts

    Make the msysgit icon multi-resolution.

    skeeto authored patthoyts committed
    The current icon is only low-resolution so it looks pixelated as a
    desktop link. This icon has 256x256, 64x64, 48x48, 32x32, 24x24 and
    16x16 resolutions as recommended in the Microsoft Vista icon guidelines.
    
    [PT: rebuilt with 256x256 PNG resource and re-ordered the layers]
    
    Signed-off-by: Chris Wellons <mosquitopsu@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  3. pro-logic Sebastian Schuberth

    Add a textconv filter for docx files

    pro-logic authored sschuberth committed
    Signed-off-by: Albert Krawczyk <pro-logic@optusnet.com.au>
    Improved-by: Sebastian Schuberth <sschuberth@gmail.com>
Commits on Nov 23, 2011
  1. Sebastian Schuberth

    Git submodule: Use a state that has OLD_ICONV removed from Makefile

    sschuberth authored
    Due to the changes how libiconv is built, we must not use OLD_ICONV
    anymore.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
  2. Sebastian Schuberth

    Install libiconv-1.14.tar.gz

    sschuberth authored
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
  3. Sebastian Schuberth

    libiconv: Update to version 1.14

    sschuberth authored
    This is to match the version that currently comes with mingwGitDevEnv.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
  4. Sebastian Schuberth

    libiconv: Use the new-style signature for iconv() to match upstream M…

    sschuberth authored
    …inGW
    
    If mingw32-libiconv is installed via minigw-get, iconv() as declared in
    iconv.h uses the new-style non-const inbuf as second argument. This is
    achieved by exporting some automake variables in libiconv-*.mgwport. Do it
    the same way here, too, so that we can have OLD_ICONV turned off when
    compiling Git either in msysGit or mingwGitDevEnv.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Commits on Nov 9, 2011
  1. Sebastian Schuberth

    msysGit: Use a more generic way to change to the working tree root

    sschuberth authored
    When not using the msys.bat environment but another git installation to do
    a rebase, the absolute "cd /" would not change to the working tree root
    and cause git diff to fail with a usage information like
    
        usage: git diff [--no-index] <path> <path>
    
    So use a more generic way to determine the working tree root within the
    hook code that will work with another git installations, too. Note that
    "git rev-parse --show-cdup" will return an empty string (not ".") if the
    current directory is the working tree root, so we need to prefix the
    resulting string with "./" in order for "cd" to work as expected.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
  2. Sebastian Schuberth

    Installer: Move environment helper functions to a separate file

    sschuberth authored
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
  3. Sebastian Schuberth

    Update the git documentation submodule url, part 2

    sschuberth authored
    More changes are necessary to account for the new HTML docs repository.
    There no longer is a "html" branch in git.git, we need to use "master"
    from git-htmldocs.git instead.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  4. Pat Thoyts

    Update tk to version 8.5.11

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Nov 8, 2011
  1. Pat Thoyts

    Update tcl to version 8.5.11

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  2. Pat Thoyts

    tcltk: update release.sh script for tcl/tk 8.5.11

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Nov 7, 2011
  1. Stefan Näwe Pat Thoyts

    Update the git documentation submodule url.

    snaewe authored patthoyts committed
    In his latest "What's cooking in git.git" message (Nov 2011, #2; Sun, 6)
    J.C.Hamano announced the availability of the documentation
    branches (html, doc) in dedicated repositories at github.com.
    Change .gitmodules to point 'doc/git/html' to the new repository.
    
    Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Nov 4, 2011
  1. Sebastian Schuberth

    Installer: Do not install git_shell_ext.dll.new if git-cheetah is des…

    sschuberth authored
    …elected
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Commits on Nov 2, 2011
  1. dscho

    run-tests: remove MSVC-leftovers which would make the tests fail

    dscho authored
    When launching "/path/to/git" and there exists both a directory "git" as
    well as an executable "git.exe", under Windows the directory is preferred.
    Since the MSVC stuff is written into directories of the basename of the
    generated executable, we have to remove these directories before running
    the tests.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commits on Nov 1, 2011
  1. dscho

    msvc-build: add 'clean' subcommand

    dscho authored
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  2. dscho

    msvc-build: optionally start the Visual Studio

    dscho authored
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  3. dscho

    msvc-build: use compat.mak to add the includes/libs

    dscho authored
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  4. dscho

    Add a script to make the MSVC build more convenient

    dscho authored
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  5. Sebastian Schuberth

    Installer: Make SetEnvironmentVariable also available during uninstall

    sschuberth authored
    This fixes the "Runtime Error (at 18:1292): Could not call proc." as
    reported by Pau Garcia i Quiles <pgquiles@elpauer.org> on the mailing
    list.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Commits on Oct 27, 2011
  1. Pat Thoyts

    Updated to Git v1.7.7.1

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  2. Pat Thoyts

    rebasing-merge: Added --cherry and --dry-run options

    patthoyts authored
    Added a comment to describe the options and added a --cherry option to
    show commits suitable for passing upstream.
    
    Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Oct 26, 2011
  1. dscho

    apply-from-gmane: also handle thread.gmane.org URLs

    dscho authored
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  2. dscho

    Mark shell scripts executable

    dscho authored
    While at it, also convert to Unix line endings.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commits on Oct 20, 2011
  1. Sebastian Schuberth

    Installer: Make SetEnvStrings update the environment of the current p…

    sschuberth authored
    …rocess
    
    This is required if the installer would spawn another process that relies
    on newly added environment variables.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
  2. Sebastian Schuberth

    Installer: Add a fallback for built-in environment variables

    sschuberth authored
    Those are not stored in the Registry (e.g. HOMEDRIVE, HOMEPATH).
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Commits on Oct 17, 2011
  1. Sebastian Schuberth

    Installer: Add a missing default wizard image

    sschuberth authored
    Although we do not require the default image as we ship our own custom
    ones, adding this image makes our stripped-down version of Inno Setup more
    usable when building other installers than the one for Git for Windows.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Commits on Oct 14, 2011
  1. Pat Thoyts

    Patched Git v1.7.7

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  2. Stefan Näwe Pat Thoyts

    etc/profile: set MAGIC only if the magic file exists

    snaewe authored patthoyts committed
    commit 006d11d (Help 'file' find its magic file) added the MAGIC
    variable to /etc/profile. That makes sense in the msysgit development
    envronment but not for the installed version (because 'file' doesn't
    get installed).
    This checks for the existence of the magic file before setting MAGIC.
    That way it's possible to use another 'file', e.g. from Cygwin inside
    the git bash.
    
    Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Oct 13, 2011
  1. Pat Thoyts

    copy-files: include the mergetools subdirectory under git-core

    patthoyts authored
    The mergetool and difftool utilities now use a directory to locate
    scripts that specify how to handle each tool.
    
    Reported-by: eckes <meliundeckes@googlemail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  2. Pat Thoyts

    Fix fetching the temporary folder to use the correct enumeration value.

    patthoyts authored
    The TemporaryFolder variable is actually uninitialized which results in
    its value being treated as 0 which means the GetSpecialFolder call returns
    the Windows directory and this is not usually writable.
    Fixed by declaring the cirrect value as per the documentation example.
    
    Reported-by: Andrew Rollins <andrew@andrewrollins.com>
    Reported-by: Fabio Vitale fabio.vitale@envisioning.it>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Something went wrong with that request. Please try again.