Permalink
Commits on Apr 27, 2015
  1. Documentation: clarify how "git commit" cleans up the edited log message

    iveqy authored and gitster committed Apr 25, 2015
    The `-v` shows a unified diff in the editor to edit the commit
    message to help the user to describe the change.  The diff is
    stripped and will not become a part of the commit message.
    
    Add a note about this with the `-v` description and slightly modify
    the description for the default `--cleanup` mode.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 3, 2013
  1. Add --depth to submodule update/add

    iveqy authored and gitster committed Jul 2, 2013
    Add the --depth option to the add and update commands of "git submodule",
    which is then passed on to the clone command. This is useful when the
    submodule(s) are huge and you're not really interested in anything but
    the latest commit.
    
    Tests are added and some indention adjustments were made to conform to the
    rest of the testfile on "submodule update can handle symbolic links in pwd".
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 17, 2013
  1. git-submodule.sh: remove duplicate call to set_rev_name

    iveqy authored and gitster committed Jun 17, 2013
    set_rev_name is a possiblly expensive operation. If a submodule has
    changes in it, set_rev_name was called twice.
    
    Move call to set_rev_name so it's only called once, no matter which
    codepath is taken.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 14, 2013
  1. handle multibyte characters in name

    iveqy authored and gitster committed Jun 14, 2013
    Many "git submodule" operations do not work on a submodule at a path whose
    name is not in ASCII.
    
    This is because "git ls-files" is used to find which paths are bound to
    submodules to the current working tree, and the output is C-quoted by default
    for non ASCII pathnames.
    
    Tell "git ls-files" to not C-quote its output, which is easier than unwrapping
    C-quote ourselves.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 9, 2013
  1. Document .git/modules

    iveqy authored and gitster committed Jun 9, 2013
    A note in the beginning of this document describes the behavior already.
    This patch just adds where to find the repositories.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 7, 2013
  1. gitweb/README: remove reference to git.kernel.org

    iveqy authored and gitster committed Mar 7, 2013
    git.kernel.org no longer uses gitweb but has switched to cgit.
    
    Info about this can be found on: https://www.kernel.org/pelican.html
    or simply by looking at http://git.kernel.org . This is change since
    2013-03-01.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 23, 2011
  1. Move git-dir for submodules

    iveqy authored and gitster committed Aug 15, 2011
    Move git-dir for submodules into $GIT_DIR/modules/[name_of_submodule] of
    the superproject. This is a step towards being able to delete submodule
    directories without loosing the information from their .git directory
    as that is now stored outside the submodules work tree.
    
    This is done relying on the already existent .git-file functionality.
    When adding or updating a submodule whose git directory is found under
    $GIT_DIR/modules/[name_of_submodule], don't clone it again but simply
    point the .git-file to it and remove the now stale index file from it.
    The index will be recreated by the following checkout.
    
    This patch will not affect already cloned submodules at all.
    
    Tests that rely on .git being a directory have been fixed.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Mentored-by: Jens Lehmann <Jens.Lehmann@web.de>
    Mentored-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 21, 2011
  1. push: Don't push a repository with unpushed submodules

    iveqy authored and gitster committed Aug 19, 2011
    When working with submodules it is easy to forget to push a
    submodule to the server but pushing a super-project that
    contains a commit for that submodule. The result is that the
    superproject points at a submodule commit that is not available
    on the server.
    
    This adds the option --recurse-submodules=check to push. When
    using this option git will check that all submodule commits that
    are about to be pushed are present on a remote of the submodule.
    
    To be able to use a combined diff, disabling a diff callback has
    been removed from combined-diff.c.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Mentored-by: Jens Lehmann <Jens.Lehmann@web.de>
    Mentored-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 16, 2011
  1. rev-parse: add option --resolve-git-dir <path>

    iveqy authored and gitster committed Aug 15, 2011
    Check if <path> is a valid git-dir or a valid git-file that points
    to a valid git-dir.
    
    We want tests to be independent from the fact that a git-dir may
    be a git-file. Thus we changed tests to use this feature.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Mentored-by: Jens Lehmann <Jens.Lehmann@web.de>
    Mentored-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 13, 2011
  1. submodule update: continue when a checkout fails

    iveqy authored and gitster committed Jun 13, 2011
    "git submodule update" stops at the first error and gives control
    back to the user. Only after the user fixes the problematic
    submodule and runs "git submodule update" again, the second error
    is found. And the user needs to repeat until all the problems are
    found and fixed one by one. This is tedious.
    
    Instead, the command can remember which submodules it had trouble with,
    continue updating the ones it can, and report which ones had errors at
    the end. The user can run "git submodule update", find all the ones that
    need minor fixing (e.g. working tree was dirty) to fix them in a single
    pass. Then another "git submodule update" can be run to update all.
    
    Note that the problematic submodules are skipped only when they are to
    be integrated with a safer value of submodule.<name>.update option,
    namely "checkout". Fixing a failure in a submodule that uses "rebase" or
    "merge" may need an involved conflict resolution by the user, and
    leaving too many submodules in states that need resolution would not
    reduce the mental burden on the user.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Mentored-by: Jens Lehmann <Jens.Lehmann@web.de>
    Mentored-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. git-sh-setup: add die_with_status

    iveqy authored and gitster committed Jun 9, 2011
    This behaves similar to "die" but can exit with status different from the
    usual 1.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Mentored-by: Jens Lehmann <Jens.Lehmann@web.de>
    Mentored-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>