1. 06 11月, 2015 13 次提交
    • J
      Merge branch 'dt/http-range' · 848cdba5
      Junio C Hamano 提交于
      A Range: request can be responded with a full response and when
      asked properly libcurl knows how to strip the result down to the
      requested range.  However, we were hand-crafting a range request
      and it did not kick in.
      
      * dt/http-range:
        http: use off_t to store partial file size
        http.c: use CURLOPT_RANGE for range requests
      848cdba5
    • J
      Sync with 2.6.3 · 2c786282
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      2c786282
    • J
      Git 2.6.3 · af40944b
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      af40944b
    • J
      Merge branch 'rs/daemon-plug-child-leak' into maint · b8f52425
      Junio C Hamano 提交于
      "git daemon" uses "run_command()" without "finish_command()", so it
      needs to release resources itself, which it forgot to do.
      
      * rs/daemon-plug-child-leak:
        daemon: plug memory leak
        run-command: factor out child_process_clear()
      b8f52425
    • J
      Merge branch 'rs/wt-status-detached-branch-fix' into maint · db43891c
      Junio C Hamano 提交于
      "git status --branch --short" accessed beyond the constant string
      "HEAD", which has been corrected.
      
      * rs/wt-status-detached-branch-fix:
        wt-status: use skip_prefix() to get rid of magic string length constants
        wt-status: don't skip a magical number of characters blindly
        wt-status: avoid building bogus branch name with detached HEAD
        wt-status: exit early using goto in wt_shortstatus_print_tracking()
        t7060: add test for status --branch on a detached HEAD
      db43891c
    • J
      Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint · f97aee1f
      Junio C Hamano 提交于
      We peek objects from submodule's object store by linking it to the
      list of alternate object databases, but the code to do so forgot to
      correctly initialize the list.
      
      * jk/initialization-fix-to-add-submodule-odb:
        add_submodule_odb: initialize alt_odb list earlier
      f97aee1f
    • J
      Merge branch 'js/misc-fixes' into maint · ace5348d
      Junio C Hamano 提交于
      Various compilation fixes and squelching of warnings.
      
      * js/misc-fixes:
        Correct fscanf formatting string for I64u values
        Silence GCC's "cast of pointer to integer of a different size" warning
        Squelch warning about an integer overflow
      ace5348d
    • J
      Merge branch 'jc/add-u-A-default-to-top' into maint · a878e7e6
      Junio C Hamano 提交于
      "git --literal-pathspecs add -u/-A" without any command line
      argument misbehaved ever since Git 2.0.
      
      * jc/add-u-A-default-to-top:
        add: simplify -u/-A without pathspec
      a878e7e6
    • J
      Merge branch 'jk/delete-modechange-conflict' into maint · 5e6154fb
      Junio C Hamano 提交于
      Merging a branch that removes a path and another that changes the
      mode bits on the same path should have conflicted at the path, but
      it didn't and silently favoured the removal.
      
      * jk/delete-modechange-conflict:
        merge: detect delete/modechange conflict
        t6031: generalize for recursive and resolve strategies
        t6031: move triple-rename test to t3030
      5e6154fb
    • J
      Merge branch 'js/imap-send-curl-compilation-fix' into maint · c378862b
      Junio C Hamano 提交于
      "git imap-send" did not compile well with older version of cURL library.
      
      * js/imap-send-curl-compilation-fix:
        imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
      c378862b
    • J
      Merge branch 'rp/link-curl-before-ssl' into maint · 3897d2d9
      Junio C Hamano 提交于
      The linkage order of libraries was wrong in places around libcurl.
      
      * rp/link-curl-before-ssl:
        configure.ac: detect ssl need with libcurl
        Makefile: make curl-config path configurable
        Makefile: link libcurl before zlib
      3897d2d9
    • J
      Merge branch 'nd/clone-linked-checkout' into maint · 4349f597
      Junio C Hamano 提交于
      It was not possible to use a repository-lookalike created by "git
      worktree add" as a local source of "git clone".
      
      * nd/clone-linked-checkout:
        clone: better error when --reference is a linked checkout
        clone: allow --local from a linked checkout
        enter_repo: allow .git files in strict mode
        enter_repo: avoid duplicating logic, use is_git_directory() instead
        t0002: add test for enter_repo(), non-strict mode
        path.c: delete an extra space
      4349f597
    • J
      Merge branch 'sa/send-email-smtp-batch-data-limit' into maint · 53be1452
      Junio C Hamano 提交于
      When "git send-email" wanted to talk over Net::SMTP::SSL,
      Net::Cmd::datasend() did not like to be fed too many bytes at the
      same time and failed to send messages.  Send the payload one line
      at a time to work around the problem.
      
      * sa/send-email-smtp-batch-data-limit:
        git-send-email.perl: Fixed sending of many/huge changes/patches
      53be1452
  2. 05 11月, 2015 6 次提交
  3. 04 11月, 2015 21 次提交
    • 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
    • J
      Merge branch 'gr/rebase-i-drop-warn' into maint · c04b3a2d
      Junio C Hamano 提交于
      Recent update to "rebase -i" that tries to sanity check the edited
      insn sheet before it uses it has become too picky on Windows where
      CRLF left by the editor is turned into a trailing CR on the line
      read via the "read" built-in command.
      
      * gr/rebase-i-drop-warn:
        rebase-i: work around Windows CRLF line endings
        t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
      c04b3a2d
    • J
      Merge branch 'js/clone-dissociate' into maint · f836a32b
      Junio C Hamano 提交于
      "git clone --dissociate" runs a big "git repack" process at the
      end, and it helps to close file descriptors that are open on the
      packs and their idx files before doing so on filesystems that
      cannot remove a file that is still open.
      
      * js/clone-dissociate:
        clone --dissociate: avoid locking pack files
        sha1_file.c: add a function to release all packs
        sha1_file: consolidate code to close a pack's file descriptor
        t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
      f836a32b
    • J
      Merge branch 'ld/p4-import-labels' into maint · 04bba3a1
      Junio C Hamano 提交于
      Correct "git p4 --detect-labels" so that it does not fail to create
      a tag that points at a commit that is also being imported.
      
      * ld/p4-import-labels:
        git-p4: fix P4 label import for unprocessed commits
        git-p4: do not terminate creating tag for unknown commit
        git-p4: failing test for ignoring invalid p4 labels
      04bba3a1
    • J
      Merge branch 'tk/stripspace' into maint · e23469f9
      Junio C Hamano 提交于
      The internal stripspace() function has been moved to where it
      logically belongs to, i.e. strbuf API, and the command line parser
      of "git stripspace" has been updated to use the parse_options API.
      
      * tk/stripspace:
        stripspace: use parse-options for command-line parsing
        strbuf: make stripspace() part of strbuf
      e23469f9
    • J
      Merge branch 'jk/repository-extension' into maint · f89baca1
      Junio C Hamano 提交于
      Prepare for Git on-disk repository representation to undergo
      backward incompatible changes by introducing a new repository
      format version "1", with an extension mechanism.
      
      * jk/repository-extension:
        introduce "preciousObjects" repository extension
        introduce "extensions" form of core.repositoryformatversion
      f89baca1
    • J
      Tenth batch for 2.7 · c29024e5
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      c29024e5
    • J
      Merge branch 'rs/daemon-plug-child-leak' · c3c592ef
      Junio C Hamano 提交于
      "git daemon" uses "run_command()" without "finish_command()", so it
      needs to release resources itself, which it forgot to do.
      
      * rs/daemon-plug-child-leak:
        daemon: plug memory leak
        run-command: factor out child_process_clear()
      c3c592ef
    • J
      Merge branch 'mk/blame-first-parent' · 6784eb5a
      Junio C Hamano 提交于
      "git blame" learnt to take "--first-parent" and "--reverse" at the
      same time when it makes sense.
      
      * mk/blame-first-parent:
        blame: allow blame --reverse --first-parent when it makes sense
        blame: extract find_single_final
        blame: test to describe use of blame --reverse --first-parent
      6784eb5a
    • J
      Merge branch 'rs/wt-status-detached-branch-fix' · a59d1d80
      Junio C Hamano 提交于
      "git status --branch --short" accessed beyond the constant string
      "HEAD", which has been corrected.
      
      * rs/wt-status-detached-branch-fix:
        wt-status: use skip_prefix() to get rid of magic string length constants
        wt-status: don't skip a magical number of characters blindly
        wt-status: avoid building bogus branch name with detached HEAD
        wt-status: exit early using goto in wt_shortstatus_print_tracking()
        t7060: add test for status --branch on a detached HEAD
      a59d1d80
    • J
      Merge branch 'rs/show-branch-argv-array' · 654b986d
      Junio C Hamano 提交于
      Code simplification.
      
      * rs/show-branch-argv-array:
        show-branch: use argv_array for default arguments
      654b986d