This project is mirrored from https://github.com/git/git. Updated .
  1. 13 Oct, 2014 1 commit
  2. 08 Oct, 2014 5 commits
    • Junio C Hamano's avatar
      Update draft release notes to 2.2 · 63a45136
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      63a45136
    • Junio C Hamano's avatar
      Merge branch 'sp/stream-clean-filter' · f0d89001
      Junio C Hamano authored
      When running a required clean filter, we do not have to mmap the
      original before feeding the filter.  Instead, stream the file
      contents directly to the filter and process its output.
      
      * sp/stream-clean-filter:
        sha1_file: don't convert off_t to size_t too early to avoid potential die()
        convert: stream from fd to required clean filter to reduce used address space
        copy_fd(): do not close the input file descriptor
        mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size
        memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT
        config.c: add git_env_ulong() to parse environment variable
        convert: drop arguments other than 'path' from would_convert_to_git()
      f0d89001
    • Junio C Hamano's avatar
      Merge branch 'bw/use-write-script-in-tests' · 9342f497
      Junio C Hamano authored
      * bw/use-write-script-in-tests:
        t/lib-credential: use write_script
      9342f497
    • Junio C Hamano's avatar
      Merge branch 'nd/archive-pathspec' · b2c45f5b
      Junio C Hamano authored
      "git archive" learned to filter what gets archived with pathspec.
      
      * nd/archive-pathspec:
        archive: support filtering paths with glob
      b2c45f5b
    • Junio C Hamano's avatar
      Merge branch 'jc/push-cert' · fb06b528
      Junio C Hamano authored
      Allow "git push" request to be signed, so that it can be verified and
      audited, using the GPG signature of the person who pushed, that the
      tips of branches at a public repository really point the commits
      the pusher wanted to, without having to "trust" the server.
      
      * jc/push-cert: (24 commits)
        receive-pack::hmac_sha1(): copy the entire SHA-1 hash out
        signed push: allow stale nonce in stateless mode
        signed push: teach smart-HTTP to pass "git push --signed" around
        signed push: fortify against replay attacks
        signed push: add "pushee" header to push certificate
        signed push: remove duplicated protocol info
        send-pack: send feature request on push-cert packet
        receive-pack: GPG-validate push certificates
        push: the beginning of "git push --signed"
        pack-protocol doc: typofix for PKT-LINE
        gpg-interface: move parse_signature() to where it should be
        gpg-interface: move parse_gpg_output() to where it should be
        send-pack: clarify that cmds_sent is a boolean
        send-pack: refactor inspecting and resetting status and sending commands
        send-pack: rename "new_refs" to "need_pack_data"
        receive-pack: factor out capability string generation
        send-pack: factor out capability string generation
        send-pack: always send capabilities
        send-pack: refactor decision to send update per ref
        send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
        ...
      fb06b528
  3. 07 Oct, 2014 6 commits
  4. 30 Sep, 2014 13 commits
    • Junio C Hamano's avatar
      Sync with 2.1.2 · 565301e4
      Junio C Hamano authored
      * maint:
        Git 2.1.2
      565301e4
    • Junio C Hamano's avatar
      Merge branch 'jt/itimer-autoconf' · 7dded661
      Junio C Hamano authored
      setitmer(2) and related API elements can be configured from
      Makefile but autoconf did not know about it.
      
      * jt/itimer-autoconf:
        autoconf: check for setitimer()
        autoconf: check for struct itimerval
        git-compat-util.h: add missing semicolon after struct itimerval
      7dded661
    • Junio C Hamano's avatar
      Merge branch 'jc/test-lazy-prereq' · 0ba92ef3
      Junio C Hamano authored
      Test-script clean-up.
      
      * jc/test-lazy-prereq:
        tests: drop GIT_*_TIMING_TESTS environment variable support
      0ba92ef3
    • Junio C Hamano's avatar
      Merge branch 'sb/merge-recursive-copy-paste-fix' · ab9bc95d
      Junio C Hamano authored
      "git merge-recursive" had a small bug that could have made it
      mishandle "one side deleted, the other side did not touch it" in a
      rare corner case, where the other side actually did touch to cause
      the blob object names to be different but both blobs before and
      after the change normalize to the same (e.g. correcting mistake to
      check in a blob with CRLF line endings by replacing it with another
      blob that records the same contents with LF line endings).
      
      * sb/merge-recursive-copy-paste-fix:
        merge-recursive: remove stale commented debugging code
        merge-recursive: fix copy-paste mistake
      ab9bc95d
    • Junio C Hamano's avatar
      Merge branch 'pr/use-default-sigpipe-setting' · 131f0315
      Junio C Hamano authored
      We used to get confused when a process called us with SIGPIPE
      ignored; we do want to die with SIGPIPE when the output is not
      read by default, and do ignore the signal when appropriate.
      
      * pr/use-default-sigpipe-setting:
        mingw.h: add dummy functions for sigset_t operations
        unblock and unignore SIGPIPE
      131f0315
    • Junio C Hamano's avatar
      Git 2.1.2 · 80b616d0
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      80b616d0
    • Junio C Hamano's avatar
      Merge branch 'jk/fsck-exit-code-fix' into maint · 46c8f859
      Junio C Hamano authored
      "git fsck" failed to report that it found corrupt objects via its
      exit status in some cases.
      
      * jk/fsck-exit-code-fix:
        fsck: return non-zero status on missing ref tips
        fsck: exit with non-zero status upon error from fsck_obj()
      46c8f859
    • Junio C Hamano's avatar
      Merge branch 'ta/config-add-to-empty-or-true-fix' into maint · 102edda4
      Junio C Hamano authored
      "git config --add section.var val" used to lose existing
      section.var whose value was an empty string.
      
      * ta/config-add-to-empty-or-true-fix:
        config: avoid a funny sentinel value "a^"
        make config --add behave correctly for empty and NULL values
      102edda4
    • Junio C Hamano's avatar
      Merge branch 'mk/reachable-protect-detached-head' into maint · 421ec4f8
      Junio C Hamano authored
      Reachability check (used in "git prune" and friends) did not add a
      detached HEAD as a starting point to traverse objects still in use.
      
      * mk/reachable-protect-detached-head:
        reachable.c: add HEAD to reachability starting commits
      421ec4f8
    • Junio C Hamano's avatar
      Merge branch 'mb/fast-import-delete-root' into maint · 5b830a85
      Junio C Hamano authored
      An attempt to remove the entire tree in the "git fast-import" input
      stream caused it to misbehave.
      
      * mb/fast-import-delete-root:
        fast-import: fix segfault in store_tree()
        t9300: test filedelete command
      5b830a85
    • Junio C Hamano's avatar
      Merge branch 'jk/index-pack-threading-races' into maint · 46092ebf
      Junio C Hamano authored
      When receiving an invalid pack stream that records the same object
      twice, multiple threads got confused due to a race.
      
      * jk/index-pack-threading-races:
        index-pack: fix race condition with duplicate bases
      46092ebf
    • Junio C Hamano's avatar
      Merge branch 'jk/send-pack-many-refspecs' into maint · 06051709
      Junio C Hamano authored
      "git push" over HTTP transport had an artificial limit on number of
      refs that can be pushed imposed by the command line length.
      
      * jk/send-pack-many-refspecs:
        send-pack: take refspecs over stdin
      06051709
    • Junio C Hamano's avatar
      Merge branch 'so/rebase-doc' into maint · e7867e80
      Junio C Hamano authored
      * so/rebase-doc:
        Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
        Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
      e7867e80
  5. 29 Sep, 2014 9 commits
  6. 28 Sep, 2014 2 commits
  7. 26 Sep, 2014 4 commits