Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.5.3-rc4

Aug 03, 2007

  1. Junio C Hamano

    GIT 1.5.3-rc4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 03, 2007
  2. Junio C Hamano

    Fix bogus use of printf in t3700 test

    The hashed contents did not matter in the end result, but it passed
    an uninitialized variable to printf, which caused it to emit empty
    while giving an error/usage message.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 03, 2007
  3. Junio C Hamano

    gitweb: do not choke on recursive symlink

    If somebody used to advertise his repository that physically
    resides at /pub/lic.git/ as:
    
    	git://git.example.com/pub/lic.git/
    
    but now wants to use --base-path to allow:
    
    	git://git.example.com/lic.git/
    
    she can start git-daemon with --base-path option, like this:
    
    	git-daemon --base-path=/pub --export-all
    
    During the transition, however, she would also want to allow
    older URL as well.  One natural way to achieve that is to create
    a symlink:
    
    	ln -s /pub /pub/pub
    
    so that a request to git://git.example.com/pub/lic.git/ is first
    translated by --base-path to a request to /pub/pub/lic.git/
    which goes to /pub/lic.git, thanks to the symlink.
    
    So far so good.
    
    However, gitweb chokes if there is such a symlink (File::Find
    barfs with "/pub/pub is a recursive symbolic link").  Make the
    code ignore such a symlink.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 27, 2007
  4. Junio C Hamano

    Fix work-tree related breakages

    In set_work_tree(), variable rel needs to be reinitialized to
    NULL on every call (it should not be static).
    
    Make sure the incoming dir variable is not too long before
    copying to the temporary buffer, and make sure chdir to the
    resulting directory succeeds.
    
    This was spotted and fixed by Alex and Johannes in a handful
    patch exchanges.  Here is the final version.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    authored August 02, 2007
  5. David Symonds

    Fix documentation for core.gitproxy to reflect code

    The current implementation of core.gitproxy only operates on
    git:// URLs, so the ssh:// examples and custom protocol examples
    have been removed or edited.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 03, 2007 gitster committed August 02, 2007
  6. dscho

    read-tree: remove unnecessary call to setup_git_directory()

    read-tree is already marked with RUN_SETUP in git.c, so there is
    no need to call setup_git_directory() a second time.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 02, 2007 gitster committed August 02, 2007
  7. Thomas Schwinge

    Support building on GNU/Hurd

    GNU/Hurd systems don't have strlcpy.
    
    Signed-off-by: Thomas Schwinge <tschwinge@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 02, 2007 gitster committed August 02, 2007

Aug 02, 2007

  1. Fix style nit in Python slicing.

    Python slices start at 0 by default.
    
    Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
    Signed-off-by: Simon Hausmann <simon@lst.de>
    authored July 23, 2007 tronical committed August 02, 2007
  2. Sort output of "p4 change" in incremental import before further

    processing
    
    P4 change outputs the changes sorted for each directory separately. We
    want the global ordering on the changes, hence we sort.
    
    Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
    Signed-off-by: Simon Hausmann <simon@lst.de>
    authored July 23, 2007 tronical committed August 02, 2007
  3. Junio C Hamano

    RelNotes 1.5.3 updates before -rc4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 02, 2007
  4. When generating manpages, delete outdated targets first.

    This makes "make doc" work even if you made "sudo make doc" previously
    by mistake.  Apparently an oversight: the other targets did this already.
    
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 02, 2007 gitster committed August 01, 2007
  5. dscho

    rebase -i: fix for optional [branch] parameter

    When calling "git rebase -i <upstream> <branch>", git should switch
    to <branch> first.  This worked before, but I broke it by my
    "Shut git rebase -i up" patch.
    
    Fix that, and add a test to make sure that it does not break again.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Acked-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  6. Steve Hoelzer

    Try to be consistent with capitalization in the documentation

    Signed-off-by: Steve Hoelzer <shoelzer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  7. Junio C Hamano

    git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.

    [jc: adjusted t/t7501 as this makes -F and --amend compatible]
    
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007
  8. git-sh-setup.sh: make GIT_EDITOR/core.editor/VISUAL/EDITOR accept com…

    …mands
    
    The previous code only allowed specifying a single executable rather
    than a complete command like "emacsclient --alternate-editor vi" in
    those variables.  Since VISUAL/EDITOR appear to be traditionally
    passed to a shell for interpretation (as corroborated with "less",
    "mail" and "mailx", while the really ancient "more" indeed allows only
    an executable name), the shell function git_editor has been amended
    appropriately.
    
    "eval" is employed to have quotes and similar interpreted _after_
    expansion, so that specifying
    EDITOR='"/home/dak/My Commands/notepad.exe"'
    can be used for actually using commands with blanks.
    
    Instead of passing just the first argument of git_editor on, we pass
    all of them (so that +lineno might be employed at a later point of
    time, or so that multiple files may be edited when appropriate).
    
    Strictly speaking, there is a change in behavior: when
    git config core.editor
    returns a valid but empty string, the fallbacks are still searched.
    This is more consistent, and the old code was problematic with regard
    to multiple blanks.  Putting in additional quotes might have worked,
    but quotes inside of command substitution inside of quotes is nasty
    enough to not reliably work the same across "Bourne shells".
    
    Signed-off-by: David Kastrup <dak@gnu.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  9. Hack git-add--interactive to make it work with ActiveState Perl

    It wont work for arguments with special characters (like ", : or *).
    It is generally not possible on Windows, so I didn't even try.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  10. dscho

    rebase -i: ignore patches that are already in the upstream

    Non-interactive rebase had this from the beginning -- match it by
    using --cherry-pick option to rev-list.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007

Aug 01, 2007

  1. dscho

    get_relative_cwd(): clarify why it handles dir == NULL

    The comment did not make a good case why it makes sense.
    Clarify, and remove stale comment about the caller being lazy.
    The behaviour on NULL input is pretty much intentional.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  2. dscho

    Clean up work-tree handling

    The old version of work-tree support was an unholy mess, barely readable,
    and not to the point.
    
    For example, why do you have to provide a worktree, when it is not used?
    As in "git status".  Now it works.
    
    Another riddle was: if you can have work trees inside the git dir, why
    are some programs complaining that they need a work tree?
    
    IOW it is allowed to call
    
    	$ git --git-dir=../ --work-tree=. bla
    
    when you really want to.  In this case, you are both in the git directory
    and in the working tree.  So, programs have to actually test for the right
    thing, namely if they are inside a working tree, and not if they are
    inside a git directory.
    
    Also, GIT_DIR=../.git should behave the same as if no GIT_DIR was
    specified, unless there is a repository in the current working directory.
    It does now.
    
    The logic to determine if a repository is bare, or has a work tree
    (tertium non datur), is this:
    
    --work-tree=bla overrides GIT_WORK_TREE, which overrides core.bare = true,
    which overrides core.worktree, which overrides GIT_DIR/.. when GIT_DIR
    ends in /.git, which overrides the directory in which .git/ was found.
    
    In related news, a long standing bug was fixed: when in .git/bla/x.git/,
    which is a bare repository, git formerly assumed ../.. to be the
    appropriate git dir.  This problem was reported by Shawn Pearce to have
    caused much pain, where a colleague mistakenly ran "git init" in "/" a
    long time ago, and bare repositories just would not work.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  3. dscho

    Add set_git_dir() function

    With the function set_git_dir() you can reset the path that will
    be used for git_path(), git_dir() and friends.
    
    The responsibility to close files and throw away information from the
    old git_dir lies with the caller.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  4. dscho

    Add functions get_relative_cwd() and is_inside_dir()

    The function get_relative_cwd() works just as getcwd(), only that it
    takes an absolute path as additional parameter, returning the prefix
    of the current working directory relative to the given path.  If the
    cwd is no subdirectory of the given path, it returns NULL.
    
    is_inside_dir() is just a trivial wrapper over get_relative_cwd().
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  5. dscho

    Add is_absolute_path() and make_absolute_path()

    This patch adds convenience functions to work with absolute paths.
    The function is_absolute_path() should help the efforts to integrate
    the MinGW fork.
    
    Note that make_absolute_path() returns a pointer to a static buffer.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed August 01, 2007
  6. --base-path-relaxed option

    I switched git.kernel.dk to --base-path a few minutes ago, to get rid of
    a /data/git postfix in the posted urls. But transitioning is tricky,
    since now all old paths will fail miserably.
    
    So I added this --base-path-relaxed option, that will make git-daemon
    try the absolute path without prefixing --base-path before giving up.
    With this in place and --base-path-relaxed added, both my new url of
    
        git://git.kernel.dk/linux-2.6-block.git
    
    and the old
    
        git://git.kernel.dk/data/git/linux-2.6-block.git
    
    work fine.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 27, 2007 gitster committed August 01, 2007
  7. Add test case for basic commit functionality.

    Signed-off-by: Kristian Høgsberg <krh@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007 gitster committed July 31, 2007
  8. Alexandre Julliard

    git.el: Take into account the core.excludesfile config option.

    Also don't require .git/info/exclude to exist in order to list unknown
    files.
    
    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Acked-by: Karl Hasselström <kha@treskal.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007 gitster committed July 31, 2007
  9. Alexandre Julliard

    git.el: Avoid using ewoc-set-data for compatibility with Emacs 21.

    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
    Acked-by: Karl Hasselström <kha@treskal.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007 gitster committed July 31, 2007
  10. Make verse of git-config manpage more readable

    Also mention '--file' in FILES.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed July 31, 2007
  11. Add a test for git-config --file

    Check for non-0 exit code if the confiog file does not exist and
    if it works exactly like when setting GIT_CONFIG.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007 gitster committed July 31, 2007
  12. Add an option to specify a file to config builtin

    There are (really!) systems where using environment variables is very
    cumbersome (yes, Windows, it has problems unsetting them). Besides this
    form is shorter.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007 gitster committed July 31, 2007
  13. Robert Schiele

    make the name of the library directory a config option

    Introduce new makefile variable lib to hold the name of the lib
    directory ("lib" by default).  Also introduce a switch for configure
    to specify this name with --with-lib=ARG.  This is useful for systems
    that use a different name than "lib" (like "lib64" on some 64 bit
    Linux architectures).
    
    Signed-off-by: Robert Schiele <rschiele@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 01, 2007 gitster committed July 31, 2007
  14. Junio C Hamano

    Merge branch 'maint'

    * maint:
      rev-list --bisect: fix allocation of "int*" instead of "int".
    authored July 31, 2007
  15. Christian Couder

    rev-list --bisect: fix allocation of "int*" instead of "int".

    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007 gitster committed July 31, 2007

Jul 31, 2007

  1. Junio C Hamano

    git.c: execution path

    The comment before executing git subcommands were stale and confusing.
    Noticed by Jeff King.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 31, 2007
  2. Robert Schiele

    add option to find zlib in custom path

    Some systems do not provide zlib development headers and libraries in
    default search path of the compiler.  For these systems we should allow
    specifying the location by --with-zlib=PATH or by setting ZLIB_PATH in
    the makefile.
    
    Signed-off-by: Robert Schiele <rschiele@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 29, 2007 gitster committed July 31, 2007
  3. Junio C Hamano

    Unset GIT_EDITOR while running tests.

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored July 30, 2007
Something went wrong with that request. Please try again.