Skip to content
Commits on Dec 28, 2010
  1. @gitster

    Git 1.7.4-rc0

    gitster committed Dec 28, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster committed Dec 28, 2010
    * maint:
      Prepare for 1.7.3.5
      Fix false positives in t3404 due to SHELL=/bin/false
      close file on error in read_mmfile()
    
    Conflicts:
    	RelNotes
  3. @gitster

    Prepare for 1.7.3.5

    gitster committed Dec 28, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jk/commit-die-on-bogus-ident' into maint

    gitster committed Dec 28, 2010
    * jk/commit-die-on-bogus-ident:
      commit: die before asking to edit the log message
      ident: die on bogus date format
  5. @gitster

    Merge branch 'ks/blame-worktree-textconv-cached' into maint

    gitster committed Dec 28, 2010
    * ks/blame-worktree-textconv-cached:
      fill_textconv(): Don't get/put cache if sha1 is not valid
      t/t8006: Demonstrate blame is broken when cachetextconv is on
  6. @gitster

    Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

    gitster committed Dec 28, 2010
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  7. @gitster

    Merge branch 'jc/maint-am-abort-safely' into maint

    gitster committed Dec 28, 2010
    * jc/maint-am-abort-safely:
      am --abort: keep unrelated commits since the last failure and warn
  8. @gitster

    Merge branch 'kb/maint-status-cquote' into maint

    gitster committed Dec 28, 2010
    * kb/maint-status-cquote:
      status: Quote paths with spaces in short format
  9. @drafnel @gitster

    t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

    drafnel committed with gitster Dec 22, 2010
    The '--no-chain-reply-to' option is a Getopt::Long boolean option. The
    '--no-' prefix (as in --no-chain-reply-to) for boolean options is not
    supported in Getopt::Long version 2.32 which was released with Perl 5.8.0.
    This version only supports '--no' as in '--nochain-reply-to'.  More recent
    versions of Getopt::Long, such as version 2.34, support either prefix. So
    use the older form in the tests.
    
    See also:
    
    907a0b1
    84eeb68
    3fee1fe
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @gitster

    Merge branch 'jc/maint-rebase-rewrite-last-skip'

    gitster committed Dec 28, 2010
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  11. @gitster

    Merge branch 'nd/setup'

    gitster committed Dec 28, 2010
    * nd/setup: (47 commits)
      setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
      git.txt: correct where --work-tree path is relative to
      Revert "Documentation: always respect core.worktree if set"
      t0001: test git init when run via an alias
      Remove all logic from get_git_work_tree()
      setup: rework setup_explicit_git_dir()
      setup: clean up setup_discovered_git_dir()
      t1020-subdirectory: test alias expansion in a subdirectory
      setup: clean up setup_bare_git_dir()
      setup: limit get_git_work_tree()'s to explicit setup case only
      Use git_config_early() instead of git_config() during repo setup
      Add git_config_early()
      git-rev-parse.txt: clarify --git-dir
      t1510: setup case #31
      t1510: setup case #30
      t1510: setup case #29
      t1510: setup case #28
      t1510: setup case #27
      t1510: setup case #26
      t1510: setup case #25
      ...
  12. @robbat2 @gitster

    Fix false positives in t3404 due to SHELL=/bin/false

    robbat2 committed with gitster Dec 27, 2010
    If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
    package building), the git-rebase exec tests will fail, because they call
    $SHELL around the command, and in the existing testcase, $SHELL was not being
    cleared sufficently.
    
    This lead to false positive failures of t3404 on systems where the package
    build user was locked down as noted above.
    
    Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org>
    X-Gentoo-Bug: 349083
    X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 27, 2010
  1. @pclouds @gitster

    setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd

    pclouds committed with gitster Dec 27, 2010
    When setup_work_tree() is called, it moves cwd to $GIT_WORK_TREE and
    makes internal copy of $GIT_WORK_TREE absolute. The environt variable,
    if set by user, remains unchanged. If the variable is relative, it is
    no longer correct because its base dir has changed.
    
    Instead of making $GIT_WORK_TREE absolute too, we just say "." and let
    subsequent git processes handle it.
    
    Reported-by: Michel Briand <michelbriand@free.fr>
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 26, 2010
  1. @gitster

    Merge branch 'rs/maint-diff-fd-leak' into maint

    gitster committed Dec 26, 2010
    * rs/maint-diff-fd-leak:
      close file on error in read_mmfile()
  2. @gitster

    close file on error in read_mmfile()

    René Scharfe committed with gitster Dec 25, 2010
    Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html
    and in http://thread.gmane.org/gmane.comp.version-control.git/123042.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 23, 2010
  1. @gitster

    Merge branch 'rj/maint-difftool-cygwin-workaround'

    gitster committed Dec 23, 2010
    * rj/maint-difftool-cygwin-workaround:
      difftool: Fix failure on Cygwin
  2. @gitster

    Merge branch 'maint'

    gitster committed Dec 22, 2010
    * maint:
      test-lib.sh/test_decode_color(): use octal not hex in awk script
  3. @drafnel @gitster

    Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections

    drafnel committed with gitster Dec 22, 2010
    IRIX's fnmatch() does not support the GNU FNM_CASEFOLD extension, so set
    NO_FNMATCH_CASEFOLD so that the internal fnmatch implementation will be
    used.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @drafnel @gitster

    test-lib.sh/test_decode_color(): use octal not hex in awk script

    drafnel committed with gitster Dec 22, 2010
    POSIX awk seems to explicitly not support hexadecimal escape sequences.
    
    From http://pubs.opengroup.org/onlinepubs/009695399/:
    
       Regular expressions in awk have been extended somewhat...
       One sequence that is not supported is hexadecimal value escapes
       beginning with '\x'.
    
    This affects the awk on IRIX 6.5, and causes t4015.56 to fail.
    Use octal instead.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    rebase --skip: correctly wrap-up when skipping the last patch

    gitster committed Dec 22, 2010
    When "rebase --skip" is used to skip the last patch in the series, the
    code to wrap up the rewrite by copying the notes from old to new commits
    and also by running the post-rewrite hook was bypassed.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 22, 2010
  1. @gitster

    Merge branch 'rj/maint-test-fixes'

    gitster committed Dec 22, 2010
    * rj/maint-test-fixes:
      t9501-*.sh: Fix a test failure on Cygwin
      lib-git-svn.sh: Add check for mis-configured web server variables
      lib-git-svn.sh: Avoid setting web server variables unnecessarily
      t9142: Move call to start_httpd into the setup test
      t3600-rm.sh: Don't pass a non-existent prereq to test #15
  2. @gitster

    Merge branch 'jc/maint-am-abort-safely'

    gitster committed Dec 22, 2010
    * jc/maint-am-abort-safely:
      am --abort: keep unrelated commits since the last failure and warn
  3. @gitster

    Merge branch 'jk/commit-die-on-bogus-ident'

    gitster committed Dec 22, 2010
    * jk/commit-die-on-bogus-ident:
      commit: die before asking to edit the log message
      ident: die on bogus date format
    
    Conflicts:
    	builtin/commit.c
  4. @gitster

    Merge branch 'pd/bash-4-completion'

    gitster committed Dec 22, 2010
    * pd/bash-4-completion:
      bash: simple reimplementation of _get_comp_words_by_ref
      bash: get --pretty=m<tab> completion to work with bash v4
    
    Conflicts:
    	contrib/completion/git-completion.bash
  5. @gitster

    Merge branch 'nd/maint-fix-add-typo-detection'

    gitster committed Dec 22, 2010
    * nd/maint-fix-add-typo-detection:
      Revert "excluded_1(): support exclude files in index"
      unpack-trees: fix sparse checkout's "unable to match directories"
      unpack-trees: move all skip-worktree checks back to unpack_trees()
      dir.c: add free_excludes()
      cache.h: realign and use (1 << x) form for CE_* constants
  6. @gitster

    Merge branch 'tf/commit-list-prefix'

    gitster committed Dec 22, 2010
    * tf/commit-list-prefix:
      commit: Add commit_list prefix in two function names.
    
    Conflicts:
    	sha1_name.c
  7. @pclouds @gitster

    git.txt: correct where --work-tree path is relative to

    pclouds committed with gitster Nov 26, 2010
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @pclouds @gitster

    Revert "Documentation: always respect core.worktree if set"

    pclouds committed with gitster Nov 26, 2010
    This reverts commit f5e025a.
    
    The commit reflected what the code did. But the code did that because
    it had bugs.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @jrn @gitster

    t0001: test git init when run via an alias

    jrn committed with gitster Nov 26, 2010
    Add some tests to document the correct behavior of (possibly aliased)
    init when run within and outside a git directory.
    
    If I set up a simple git alias “quietinit = init --quiet”, usually it
    will work just like ‘git init --quiet’.
    
    There are some differences, unfortunately, since in the process of
    checking for aliases, git has to look for a .git/config file.  If ‘git
    quietinit’ is run from a subdirectory of an existing git repository,
    that repository’s configuration will affect the configuration of the
    new repository.  In particular, the new repository can inherit
    bogus values for core.bare and core.worktree.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @pclouds @gitster

    Remove all logic from get_git_work_tree()

    pclouds committed with gitster Nov 26, 2010
    This logic is now only used by cmd_init_db(). setup_* functions do not
    rely on it any more. Move all the logic to cmd_init_db() and turn
    get_git_work_tree() into a simple function.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @pclouds @gitster

    setup: rework setup_explicit_git_dir()

    pclouds committed with gitster Nov 26, 2010
    This function is the most complex one among the three setup_*
    functions because all GIT_DIR, GIT_WORK_TREE, core.worktree and
    core.bare are involved.
    
    Because core.worktree is only effective inside
    setup_explicit_git_dir() and the extra code in setup_git_directory()
    is to handle that. The extra code can now be retired.
    
    Also note that setup_explicit assignment is removed, worktree setting
    is no longer decided by get_git_work_tree(). get_git_work_tree() will
    be simplified in the next commit.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @pclouds @gitster

    setup: clean up setup_discovered_git_dir()

    pclouds committed with gitster Nov 26, 2010
    If core.bare is true, discard the discovered worktree, move back to
    original cwd.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @mjg @gitster

    t1020-subdirectory: test alias expansion in a subdirectory

    mjg committed with gitster Nov 26, 2010
    Add a test for alias expansion in a subdirectory of the worktree.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. @pclouds @gitster

    setup: clean up setup_bare_git_dir()

    pclouds committed with gitster Nov 26, 2010
    work_tree_env argument is removed because this function does not need
    it. GIT_WORK_TREE is only effective inside setup_explicit_git_dir.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @pclouds @gitster

    setup: limit get_git_work_tree()'s to explicit setup case only

    pclouds committed with gitster Nov 26, 2010
    get_git_work_tree() takes input as core.worktree, core.bare,
    GIT_WORK_TREE and decides correct worktree setting.
    
    Unfortunately it does not do its job well. core.worktree and
    GIT_WORK_TREE should only be taken into account, if GIT_DIR is set
    (which is handled by setup_explicit_git_dir). For other setup cases,
    only core.bare matters.
    
    Add a temporary variable setup_explicit to adjust get_git_work_tree()
    behavior as such. This variable will be gone once setup_* rework is
    done.
    
    Also remove is_bare_repository_cfg check in set_git_work_tree() to
    ease the rework. We are going to check for core.bare and core.worktree
    early before setting worktree. For example, if core.bare is true, no
    need to set worktree.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.