Permalink
Commits on Jan 28, 2013
  1. Git 1.8.1.2

    gitster committed Jan 28, 2013
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'ss/help-htmlpath-config-doc' into maint

    gitster committed Jan 28, 2013
    * ss/help-htmlpath-config-doc:
      config.txt: Document help.htmlpath config parameter
  3. Merge branch 'nd/attr-debug-fix' into maint

    gitster committed Jan 28, 2013
    * nd/attr-debug-fix:
      attr: make it build with DEBUG_ATTR again
  4. Merge branch 'ds/completion-silence-in-tree-path-probe' into maint

    gitster committed Jan 28, 2013
    * ds/completion-silence-in-tree-path-probe:
      git-completion.bash: silence "not a valid object" errors
  5. Merge branch 'jn/maint-trim-vim-contrib' into maint

    gitster committed Jan 28, 2013
    * jn/maint-trim-vim-contrib:
      contrib/vim: simplify instructions for old vim support
  6. Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint

    gitster committed Jan 28, 2013
    * pe/doc-email-env-is-trumped-by-config:
      git-commit-tree(1): correct description of defaults
  7. Merge branch 'mk/complete-tcsh' into maint

    gitster committed Jan 28, 2013
    Command line completion for "tcsh" emitted an unwanted space
    after completing a single directory name.
    
    * mk/complete-tcsh:
      Prevent space after directories in tcsh completion
  8. Merge branch 'ap/status-ignored-in-ignored-directory' into maint

    gitster committed Jan 28, 2013
    Output from "git status --ignored" did not work well when used with
    "--untracked".
    
    * ap/status-ignored-in-ignored-directory:
      status: always report ignored tracked directories
      git-status: Test --ignored behavior
      dir.c: Make git-status --ignored more consistent
  9. Merge branch 'er/stop-recommending-parsecvs' into maint

    gitster committed Jan 28, 2013
    * er/stop-recommending-parsecvs:
      Remove the suggestion to use parsecvs, which is currently broken.
  10. Merge branch 'mh/ceiling' into maint

    gitster committed Jan 28, 2013
    An element on GIT_CEILING_DIRECTORIES list that does not name the
    real path to a directory (i.e. a symbolic link) could have caused
    the GIT_DIR discovery logic to escape the ceiling.
    
    * mh/ceiling:
      string_list_longest_prefix(): remove function
      setup_git_directory_gently_1(): resolve symlinks in ceiling paths
      longest_ancestor_length(): require prefix list entries to be normalized
      longest_ancestor_length(): take a string_list argument for prefixes
      longest_ancestor_length(): use string_list_split()
      Introduce new function real_path_if_valid()
      real_path_internal(): add comment explaining use of cwd
      Introduce new static function real_path_internal()
Commits on Jan 22, 2013
  1. git-for-each-ref.txt: 'raw' is a supported date format

    johnkeeping committed with gitster Jan 21, 2013
    Commit 7dff9b3 (Support 'raw' date format) added a raw date format.
    Update the git-for-each-ref documentation to include this.
    
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 21, 2013
  1. Start preparing for 1.8.1.2

    gitster committed Jan 21, 2013
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'nz/send-email-headers-are-case-insensitive' into maint

    gitster committed Jan 21, 2013
    When users spell "cc:" in lowercase in the fake "header" in the
    trailer part, "git send-email" failed to pick up the addresses from
    there. As e-mail headers field names are case insensitive, this
    script should follow suit and treat "cc:" and "Cc:" the same way.
    
    * nz/send-email-headers-are-case-insensitive:
      git-send-email: treat field names as case-insensitively
  3. Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint

    gitster committed Jan 21, 2013
    "git archive" did not record uncompressed size in the header when
    streaming a zip archive, which confused some implementations of
    unzip.
    
    * rs/zip-with-uncompressed-size-in-the-header:
      archive-zip: write uncompressed size into header even with streaming
  4. Merge branch 'rs/zip-tests' into maint

    gitster committed Jan 21, 2013
    * rs/zip-tests:
      t5003: check if unzip supports symlinks
      t5000, t5003: move ZIP tests into their own script
      t0024, t5000: use test_lazy_prereq for UNZIP
      t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
Commits on Jan 15, 2013
  1. config.txt: Document help.htmlpath config parameter

    koraktor committed with gitster Jan 15, 2013
    Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. attr: make it build with DEBUG_ATTR again

    pclouds committed with gitster Jan 15, 2013
    Commit 82dce99 (attr: more matching optimizations from .gitignore -
    2012-10-15) changed match_attr structure but it did not update
    DEBUG_ATTR-specific code. This fixes it.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 14, 2013
  1. Git 1.8.1.1

    gitster committed Jan 14, 2013
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jk/complete-commit-c' into maint

    gitster committed Jan 14, 2013
    * jk/complete-commit-c:
      completion: complete refs for "git commit -c"
  3. Merge branch 'jk/unify-exit-code-by-receiving-signal' into maint

    gitster committed Jan 14, 2013
    * jk/unify-exit-code-by-receiving-signal:
      run-command: encode signal death as a positive integer
  4. Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint

    gitster committed Jan 14, 2013
    * jn/xml-depends-on-asciidoc-conf:
      docs: manpage XML depends on asciidoc.conf
  5. Merge branch 'jk/maint-fast-import-doc-reorder' into maint

    gitster committed Jan 14, 2013
    * jk/maint-fast-import-doc-reorder:
      git-fast-import(1): reorganise options
      git-fast-import(1): combine documentation of --[no-]relative-marks
  6. Merge branch 'jk/shortlog-no-wrap-doc' into maint

    gitster committed Jan 14, 2013
    * jk/shortlog-no-wrap-doc:
      git-shortlog(1): document behaviour of zero-width wrap
  7. Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint

    gitster committed Jan 14, 2013
    * jk/maint-fast-import-doc-dedup-done:
      git-fast-import(1): remove duplicate '--done' option
  8. Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maint

    gitster committed Jan 14, 2013
    * jc/comment-cygwin-win32api-in-makefile:
      Makefile: add comment on CYGWIN_V15_WIN32API
  9. Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maint

    gitster committed Jan 14, 2013
    A tar archive created by "git archive" recorded a directory in a
    way that made NetBSD's implementation of "tar" sometimes unhappy.
    
    * rs/leave-base-name-in-name-field-of-tar:
      archive-tar: split long paths more carefully
  10. Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maint

    gitster committed Jan 14, 2013
    When "git clone --separate-git-dir=$over_there" is interrupted, it
    failed to remove the real location of the $GIT_DIR it created.  This
    was most visible when interrupting a submodule update.
    
    * jl/interrupt-clone-remove-separate-git-dir:
      clone: support atomic operation with --separate-git-dir
  11. Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maint

    gitster committed Jan 14, 2013
    "git merge --no-edit" computed who were involved in the work done
    on the side branch, even though that information is to be discarded
    without getting seen in the editor.
    
    * jc/maint-fmt-merge-msg-no-edit-lose-credit:
      merge --no-edit: do not credit people involved in the side branch
  12. Merge branch 'jc/apply-trailing-blank-removal' into maint

    gitster committed Jan 14, 2013
    "git apply" misbehaved when fixing whitespace breakages by removing
    excess trailing blank lines.
    
    * jc/apply-trailing-blank-removal:
      apply.c:update_pre_post_images(): the preimage can be truncated
  13. Merge branch 'pf/editor-ignore-sigint' into maint

    gitster committed Jan 14, 2013
    The behaviour visible to the end users was confusing, when they
    attempt to kill a process spawned in the editor that was in turn
    launched by Git with SIGINT (or SIGQUIT), as Git would catch that
    signal and die.  We ignore these signals now.
    
    * pf/editor-ignore-sigint:
      fix compilation with NO_PTHREADS
      launch_editor: propagate signals from editor to git
      run-command: do not warn about child death from terminal
      launch_editor: ignore terminal signals while editor has control
      launch_editor: refactor to use start/finish_command
      run-command: drop silent_exec_failure arg from wait_or_whine
  14. Merge branch 'mk/maint-graph-infinity-loop' into maint

    gitster committed Jan 14, 2013
    * mk/maint-graph-infinity-loop:
      graph.c: infinite loop in git whatchanged --graph -m
Commits on Jan 12, 2013
  1. Merge branch 'as/api-allocation-doc' into maint

    gitster committed Jan 12, 2013
    * as/api-allocation-doc:
      api-allocation-growing.txt: encourage better variable naming
  2. Merge branch 'jk/enable-test-lint-by-default' into maint

    gitster committed Jan 12, 2013
    We have two simple and quick tests to catch common mistakes when
    writing test scripts, but we did not run them by default when
    running tests.
    
    * jk/enable-test-lint-by-default:
      tests: turn on test-lint by default
  3. Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint

    gitster committed Jan 12, 2013
    "git merge" started calling prepare-commit-msg hook like "git
    commit" does some time ago, but forgot to pay attention to the exit
    status of the hook.
    
    * ap/merge-stop-at-prepare-commit-msg-failure:
      merge: Honor prepare-commit-msg return code
  4. Merge branch 'jc/submittingpatches' into maint

    gitster committed Jan 12, 2013
    * jc/submittingpatches:
      SubmittingPatches: give list and maintainer addresses
      SubmittingPatches: remove overlong checklist
      SubmittingPatches: mention subsystems with dedicated repositories
      SubmittingPatches: who am I and who cares?