Skip to content
Commits on Sep 23, 2009
  1. @gitster

    pull: Clarify "helpful" message for another corner case

    When the remote branch we asked for merging did not exist in the set of
    fetched refs, we unconditionally hinted that it was because of lack of
    configuration.  It is not necessarily so, and risks sending users for a
    wild goose chase.
    
    Make sure to check if that is indeed the case before telling a wild guess
    to the user.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 13, 2009
  2. @gitster

    Update "describe" documentation to match reality

    A sample "git describe -h" did not match what the program actually says.
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Thiago Farina committed with gitster Sep 22, 2009
Commits on Sep 22, 2009
  1. @szeder @gitster

    bash: teach 'git reset --patch'

    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Sep 15, 2009
  2. @szeder @gitster

    bash: update 'git stash' completion

    This update adds 'git stash (apply|pop) --quiet' and all options known
    to 'git stash save', and handles the DWIMery from 3c2eb80 (stash:
    simplify defaulting to "save" and reject unknown options, 2009-08-18).
    Care is taken to avoid offering subcommands in the DWIM case.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Sep 15, 2009
  3. @szeder @gitster

    bash: rename __git_find_subcommand() to __git_find_on_cmdline()

    __git_find_subcommand() was originally meant to check whether
    subcommands are already present on the command line.  But the code is
    general enough to be used for checking the presence of command line
    options as well, and the next commit will use it for that purpose, so
    let's give it a more general name.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder committed with gitster Sep 15, 2009
  4. @gitster

    pay attention to DESTDIR when building with NO_PERL_MAKEMAKER

    Building with prefix=/some/where and temporarily installing it to
    elsewhere for tar'ing up is done with:
    
        make prefix=/some/where
        make prefix=/some/where DESTDIR=/else/where install
    
    Make handcrafted perl/perl.mak without NO_PERL_MAKEMAKER honour DESTDIR.
    
    Ancient ExtUtils::MakeMaker (pre 6.11?) has the same issue, but recent
    versions of Perl ships with at leat 6.17; this patch does not address that
    issue.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 21, 2009
  5. @gitster

    pre-commit.sample: add comment re tr portability; fix grammar

    Add a comment explaining why square brackets around a tr range
    are not only ok, but actually required in this case.
    Correct spelling and grammar.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Jim Meyering committed with gitster Sep 21, 2009
  6. @gitster

    Update Release Notes to 1.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 21, 2009
Commits on Sep 21, 2009
  1. @j6t @gitster

    test-genrandom: ensure stdout is set to _O_BINARY on Windows

    Commit a6ca8c6 (Set _O_BINARY as default fmode for both MinGW and MSVC)
    removed the definition of _CRT_fmode from mingw.c. Before this commit,
    since test-genrandom is linked against libgit.a, the MinGW process
    initialization code would pick up that definition of _CRT_fmode, which was
    initialized to _O_BINARY. After this commit, however, text mode is used
    for std(in|out|err) because it is the default in absence of _CRT_fmode.
    In order to fix that, we must use git-compat-util.h, which overrides
    main() to set the mode to binary.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Sep 21, 2009
  2. @gitster

    Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Work around leftover temporary save file
      gitk: Show diff of commits at end of compare-commits output
      gitk: Update Swedish translation (280t0f0u)
    gitster committed Sep 20, 2009
  3. @patthoyts @paulusmack

    gitk: Work around leftover temporary save file

    If a file exists and is hidden on Windows the Tcl open command will
    fail as the attributes provided in the CREAT call fail to match those
    of the existing file.  Forcing removal of the temporary file before we
    begin solves any problems caused by previous failures to save the
    application settings.  An alternative would be to remove the hidden
    attribute before calling 'open'.
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    patthoyts committed with paulusmack Sep 15, 2009
Commits on Sep 20, 2009
  1. @gitster

    Merge branch 'maint'

    * maint:
      push: Correctly initialize nonfastforward in transport_push.
    gitster committed Sep 20, 2009
  2. @moy @gitster

    push: Correctly initialize nonfastforward in transport_push.

    The variable is assigned unconditionally in print_push_status, but
    print_push_status is not reached by all codepaths. In particular, this
    fixes a bug where "git push ... nonexisting-branch" was complaining about
    non-fast forward.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Sep 20, 2009
Commits on Sep 19, 2009
  1. @mstormo @gitster

    Tag GIT_VERSION when Git is built with MSVC

    This may help us debug issues on Windows, as we now can build Git
    natively on Windows with both MinGW and MSVC.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  2. @mstormo @gitster

    Add scripts to generate projects for other buildsystems (MSVC vcproj,…

    … QMake)
    
    These scripts generate projects for the MSVC IDE (.vcproj files) or
    QMake (.pro files), based on the output of a 'make -n MSVC=1 V=1' run.
    
    This enables us to simply do the necesarry changes in the Makefile, and you
    can update the other buildsystems by regenerating the files. Keeping the
    other buildsystems up-to-date with main development.
    
    The generator system is designed to easily drop in pm's for other
    buildsystems as well, if someone has an itch. However, the focus has been
    Windows development, so the 'engine' might need patches to support any
    platform.
    
    Also add some .gitignore entries for MSVC files.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  3. @mstormo @gitster

    Add README for MSVC build

    Based on original README patch from Frank Li, describe the steps
    to build git with VS2008 (aka MSVC).
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  4. @mstormo @gitster

    Add MSVC to Makefile

    Enable MSVC builds with GNU Make by simply calling
        make MSVC=1
    (Debug build possible by adding DEBUG=1 as well)
    
    Two scripts, clink.pl and lib.pl, are used to convert certain GCC
    specific command line options into something MSVC understands.
    By building for MSVC with GNU Make, we can ensure that the MSVC
    port always follows the latest code, and does not lag behind due
    to unmaintained NMake Makefile or IDE projects.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  5. @mstormo @gitster

    Define strncasecmp and ftruncate for MSVC

    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  6. @mstormo @gitster

    Make usage of windows.h lean and mean

    Centralize the include of windows.h in git-compat-util.h, turn on
    WIN32_LEAN_AND_MEAN to avoid including plenty of other header files
    which is not needed in Git. Also ensure we load winsock2.h first,
    so we don't load the older winsock definitions at a later stage,
    since they contain duplicate definitions.
    
    When moving windows.h into git-compat-util.h, we need to protect
    the definition of struct pollfd in mingw.h, since this file is used
    by both MinGW and MSVC, and the latter defines this struct in
    winsock2.h.
    
    We need to keep the windows.h include in compat/win32.h, since its
    shared by both MinGW and Cygwin, and we're not touching Cygwin in
    this commit. The include in git-compat-util.h is protected with an
    ifdef WIN32, which is not the case when compiling for Cygwin.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  7. @lznuaa @gitster

    Add platform files for porting to MSVC

    Add msvc.c and msvc.h to build git under MSVC.
    
    Signed-off-by: Frank Li <lznuaa@gmail.com>
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lznuaa committed with gitster Sep 16, 2009
  8. @lznuaa @gitster

    Add MinGW header files to build git with MSVC

    Added the header files dirent.h, unistd.h and utime.h
    Add alloca.h, which simply includes malloc.h, which defines alloca().
    
    Signed-off-by: Frank Li <lznuaa@gmail.com>
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lznuaa committed with gitster Sep 16, 2009
  9. @mstormo @gitster

    Add empty header files for MSVC port

    MSVC lacks many of the header files included by git-compat-util.h; add
    blank header files for these instead of going ifdef crazy.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  10. @lznuaa @gitster

    Test for WIN32 instead of __MINGW32_

    The code which is conditional on MinGW32 is actually conditional on Windows.
    Use the WIN32 symbol, which is defined by the MINGW32 and MSVC environments,
    but not by Cygwin.
    
    Define SNPRINTF_SIZE_CORR=1 for MSVC too, as its vsnprintf function does
    not add NUL at the end of the buffer if the result fits the buffer size
    exactly.
    
    Signed-off-by: Frank Li <lznuaa@gmail.com>
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lznuaa committed with gitster Sep 16, 2009
  11. @lznuaa @gitster

    Fix __stdcall placement and function prototype

    MSVC requires __stdcall to be between the functions return value and the
    function name, and that the function pointer type is in the form of
    
        return_type (WINAPI *function_name)(arguments...)
    
    Signed-off-by: Frank Li <lznuaa@gmail.com>
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lznuaa committed with gitster Sep 16, 2009
  12. @gitster

    Set _O_BINARY as default fmode for both MinGW and MSVC

    MinGW set the _CRT_fmode to set both the default fmode and _O_BINARY on
    stdin/stdout/stderr. Rather use the main() define in mingw.h to set this
    for both MinGW and MSVC.
    
    This will ensure that a MinGW and MSVC build will handle input and output
    identically.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Marius Storm-Olsen committed with gitster Sep 16, 2009
  13. @lznuaa @gitster

    Change regerror() declaration from K&R style to ANSI C (C89)

    The MSVC headers typedef errcode as int, and thus confused the compiler in
    the K&R style definition. ANSI style deconfuses it.
    
    Signed-off-by: Frank Li <lznuaa@gmail.com>
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lznuaa committed with gitster Sep 16, 2009
  14. @mstormo @gitster

    Add include guards to compat/win32.h

    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mstormo committed with gitster Sep 16, 2009
  15. @lznuaa @gitster

    Avoid declaration after statement

    MSVC does not understand this C99 style.
    
    Signed-off-by: Frank Li <lznuaa@gmail.com>
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lznuaa committed with gitster Sep 16, 2009
  16. @gitster

    pack-objects: remove SP at the end of usage string

    These spaces immediately before the end of lines are unnecessary.
    
    While at it, instead of using a single string literal with backslashes
    at end of each line, split the lines into individual string literals
    and tell the compiler to concatenate them.
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Thiago Farina committed with gitster Sep 18, 2009
  17. @gitster

    Update the usage bundle string.

    "git bundle -h" gives a single long line that is hard to read.  Rewrite it
    into a multi-line format similar to the one used by other commands, e.g
    "git stash -h".
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Thiago Farina committed with gitster Sep 17, 2009
Commits on Sep 17, 2009
  1. @drizzd @gitster

    cvs: initialize empty password

    If we do not read a password from the command line, and there are no
    passwords stored in .cvspass, we have to initialize the password with
    just "A".
    
    This fixes a regression introduced by 3fb9d58 (Do not scramble
    password read from .cvspass).
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drizzd committed with gitster Sep 17, 2009
Commits on Sep 16, 2009
  1. @gitster

    Merge 1.6.4.4 in

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 16, 2009
  2. @gitster

    GIT 1.6.4.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 16, 2009
  3. @gitster

    Merge branch 'jc/maint-unpack-objects-strict' into maint

    * jc/maint-unpack-objects-strict:
      Fix "unpack-objects --strict"
    
    Conflicts:
    	builtin-unpack-objects.c
    gitster committed Sep 16, 2009
  4. @gitster

    Merge branch 'tf/diff-whitespace-incomplete-line' into maint

    * tf/diff-whitespace-incomplete-line:
      xutils: Fix xdl_recmatch() on incomplete lines
      xutils: Fix hashing an incomplete line with whitespaces at the end
    gitster committed Sep 16, 2009
Something went wrong with that request. Please try again.