1. 20 11月, 2015 2 次提交
    • J
      Merge branch 'lf/ref-is-hidden-namespace' · dbba85e4
      Jeff King 提交于
      Extend transfer.hideRefs to work better with use of namespaces.
      
      * lf/ref-is-hidden-namespace:
        t5509: add basic tests for hideRefs
        hideRefs: add support for matching full refs
        upload-pack: strip refs before calling ref_is_hidden()
        config.txt: document the semantics of hideRefs with namespaces
      dbba85e4
    • J
      Merge branch 'dk/gc-idx-wo-pack' · 45014bea
      Jeff King 提交于
      Having a leftover .idx file without corresponding .pack file in
      the repository hurts performance; "git gc" learned to prune them.
      
      * dk/gc-idx-wo-pack:
        gc: remove garbage .idx files from pack dir
        t5304: test cleaning pack garbage
        prepare_packed_git(): refactor garbage reporting in pack directory
      45014bea
  2. 06 11月, 2015 19 次提交
  3. 05 11月, 2015 8 次提交
  4. 04 11月, 2015 11 次提交
    • J
      Sync with maint · aa826b65
      Junio C Hamano 提交于
      aa826b65
    • J
      Merge branch 'mk/blame-error-message' into maint · fdca2bed
      Junio C Hamano 提交于
      The error message from "git blame --contents --reverse" incorrectly
      talked about "--contents --children".
      
      * mk/blame-error-message:
        blame: fix option name in error message
      fdca2bed
    • J
      Merge branch 'jk/merge-file-exit-code' into maint · 5c15ca0b
      Junio C Hamano 提交于
      "git merge-file" tried to signal how many conflicts it found, which
      obviously would not work well when there are too many of them.
      
      * jk/merge-file-exit-code:
        merge-file: clamp exit code to maximum 127
      5c15ca0b
    • J
      Merge branch 'dt/name-hash-dir-entry-fix' into maint · 3a27eec4
      Junio C Hamano 提交于
      The name-hash subsystem that is used to cope with case insensitive
      filesystems keeps track of directories and their on-filesystem
      cases for all the paths in the index by holding a pointer to a
      randomly chosen cache entry that is inside the directory (for its
      ce->ce_name component).  This pointer was not updated even when the
      cache entry was removed from the index, leading to use after free.
      This was fixed by recording the path for each directory instead of
      borrowing cache entries and restructuring the API somewhat.
      
      * dt/name-hash-dir-entry-fix:
        name-hash: don't reuse cache_entry in dir_entry
      3a27eec4
    • J
      Merge branch 'jc/am-3-fallback-regression-fix' into maint · ced2321a
      Junio C Hamano 提交于
      "git am -3" had a small regression where it is aborted in its error
      handling codepath when underlying merge-recursive failed in certain
      ways, as it assumed that the internal call to merge-recursive will
      never die, which is not the case (yet).
      
      * jc/am-3-fallback-regression-fix:
        am -3: do not let failed merge from completing the error codepath
      ced2321a
    • J
      Merge branch 'jc/usage-stdin' into maint · f5f76845
      Junio C Hamano 提交于
      The synopsis text and the usage string of subcommands that read
      list of things from the standard input are often shown as if they
      only take input from a file on a filesystem, which was misleading.
      
      * jc/usage-stdin:
        usage: do not insist that standard input must come from a file
      f5f76845
    • J
      Merge branch 'rt/placeholder-in-usage' into maint · 14f905ca
      Junio C Hamano 提交于
      A couple of commands still showed "[options]" in their usage string
      to note where options should come on their command line, but we
      spell that "[<options>]" in most places these days.
      
      * rt/placeholder-in-usage:
        am, credential-cache: add angle brackets to usage string
      14f905ca
    • J
      Merge branch 'dt/t7063-fix-flaky-test' into maint · ccb47391
      Junio C Hamano 提交于
      * dt/t7063-fix-flaky-test:
        t7063: fix flaky untracked-cache test
      ccb47391
    • J
      Merge branch 'mk/submodule-gitdir-path' into maint · 1bf986bc
      Junio C Hamano 提交于
      The submodule code has been taught to work better with separate
      work trees created via "git worktree add".
      
      * mk/submodule-gitdir-path:
        path: implement common_dir handling in git_pathdup_submodule()
        submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
      1bf986bc
    • J
      Merge branch 'nd/gc-auto-background-fix' into maint · c1324e66
      Junio C Hamano 提交于
      When "git gc --auto" is backgrounded, its diagnosis message is
      lost.  Save it to a file in $GIT_DIR and show it next time the "gc
      --auto" is run.
      
      * nd/gc-auto-background-fix:
        gc: save log from daemonized gc --auto and print it next time
      c1324e66
    • J
      Merge branch 'ls/p4-translation-failure' into maint · c7bdbd6f
      Junio C Hamano 提交于
      Work around "git p4" failing when the P4 depot records the contents
      in UTF-16 without UTF-16 BOM.
      
      * ls/p4-translation-failure:
        git-p4: handle "Translation of file content failed"
        git-p4: add test case for "Translation of file content failed" error
      c7bdbd6f