This project is mirrored from https://github.com/git/git. Updated .
  1. 30 Sep, 2014 4 commits
    • 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
  2. 29 Sep, 2014 8 commits
    • Junio C Hamano's avatar
      Update draft release notes to 2.2 · 0bf7dd65
      Junio C Hamano authored
      0bf7dd65
    • Junio C Hamano's avatar
      Merge branch 'jk/mbox-from-line' · 26d05873
      Junio C Hamano authored
      Some MUAs mangled a line in a message that begins with "From " to
      ">From " when writing to a mailbox file and feeding such an input
      to "git am" used to lose such a line.
      
      * jk/mbox-from-line:
        mailinfo: work around -Wstring-plus-int warning
        mailinfo: make ">From" in-body header check more robust
      26d05873
    • Junio C Hamano's avatar
      Merge branch 'sb/t6031-typofix' · 12ba0e77
      Junio C Hamano authored
      * sb/t6031-typofix:
        t6031-test-merge-recursive: do not forget to add file to be committed
      12ba0e77
    • Junio C Hamano's avatar
      Merge branch 'sb/t9300-typofix' · 4d4dc66d
      Junio C Hamano authored
      * sb/t9300-typofix:
        t9300-fast-import: fix typo in test description
      4d4dc66d
    • Junio C Hamano's avatar
      Merge branch 'rs/remote-simplify' · 60dfd846
      Junio C Hamano authored
      * rs/remote-simplify:
        remote: simplify match_name_with_pattern() using strbuf
      60dfd846
    • Junio C Hamano's avatar
      Merge branch 'rs/graph-simplify' · 0a2ba82c
      Junio C Hamano authored
      * rs/graph-simplify:
        graph: simplify graph_padding_line()
      0a2ba82c
    • Junio C Hamano's avatar
      Merge branch 'da/rev-parse-verify-quiet' · 507fe835
      Junio C Hamano authored
      "rev-parse --verify --quiet $name" is meant to quietly exit with a
      non-zero status when $name is not a valid object name, but still
      gave error messages in some cases.
      
      * da/rev-parse-verify-quiet:
        stash: prefer --quiet over shell redirection of the standard error stream
        refs: make rev-parse --quiet actually quiet
        t1503: use test_must_be_empty
        Documentation: a note about stdout for git rev-parse --verify --quiet
      507fe835
    • Junio C Hamano's avatar
      Merge branch 'hj/pretty-naked-decoration' · b8e533f1
      Junio C Hamano authored
      The pretty-format specifier "%d", which expanded to " (tagname)"
      for a tagged commit, gained a cousin "%D" that just gives the
      "tagname" without frills.
      
      * hj/pretty-naked-decoration:
        pretty: add %D format specifier
      b8e533f1
  3. 28 Sep, 2014 2 commits
  4. 26 Sep, 2014 12 commits
    • Junio C Hamano's avatar
      Update draft release notes to 2.2 · d29e9c89
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      d29e9c89
    • Junio C Hamano's avatar
      Merge branch 'sb/help-unknown-command-sort-fix' · 5d7f49dc
      Junio C Hamano authored
      Code cleanup.
      
      * sb/help-unknown-command-sort-fix:
        help: fix the size passed to qsort
      5d7f49dc
    • Junio C Hamano's avatar
      Merge branch 'jk/branch-verbose-merged' · 5500095f
      Junio C Hamano authored
      The "--verbose" option no longer breaks "git branch --merged $it".
      
      * jk/branch-verbose-merged:
        branch: clean up commit flags after merge-filter walk
      5500095f
    • Junio C Hamano's avatar
      Merge branch 'rs/realloc-array' · 1c2ea2cd
      Junio C Hamano authored
      Code cleanup.
      
      * rs/realloc-array:
        use REALLOC_ARRAY for changing the allocation size of arrays
        add macro REALLOC_ARRAY
      1c2ea2cd
    • Junio C Hamano's avatar
      Merge branch 'jk/close-stderr-of-credential-cache-deamon' · b3300087
      Junio C Hamano authored
      Plug fd leaks.
      
      * jk/close-stderr-of-credential-cache-deamon:
        credential-cache: close stderr in daemon process
      b3300087
    • Junio C Hamano's avatar
      Merge branch 'jc/ignore-sigpipe-while-running-hooks' · bdab1bca
      Junio C Hamano authored
      pre- and post-receive hooks are no longer required to read all
      their inputs.
      
      * jc/ignore-sigpipe-while-running-hooks:
        receive-pack: allow hooks to ignore its standard input stream
      bdab1bca
    • Junio C Hamano's avatar
      Merge branch 'jk/prune-packed-server-info' · c0f5f311
      Junio C Hamano authored
      Code cleanup.
      
      * jk/prune-packed-server-info:
        repack: call prune_packed_objects() and update_server_info() directly
        server-info: clean up after writing info/packs
        make update-server-info more robust
        prune-packed: fix minor memory leak
      c0f5f311
    • Junio C Hamano's avatar
      Merge branch 'jc/hash-object-fsck-tag' · f190737f
      Junio C Hamano authored
      Using "hash-object --literally", test one of the new breakages
      js/fsck-tag-validation topic teaches "fsck" to catch is caught.
      
      * jc/hash-object-fsck-tag:
        t1450: make sure fsck detects a malformed tagger line
      f190737f
    • Junio C Hamano's avatar
      Merge branch 'jc/hash-object' · 868440f5
      Junio C Hamano authored
      "hash-object" learned a new "--literally" option to hash any random
      garbage into a loose object, to allow us to create a test data for
      mechanisms to catch corrupt objects.
      
      * jc/hash-object:
        hash-object: add --literally option
        hash-object: pass 'write_object' as a flag
        hash-object: reduce file-scope statics
      868440f5
    • Junio C Hamano's avatar
      Merge branch 'js/fsck-tag-validation' · 13f4f046
      Junio C Hamano authored
      Teach "git fsck" to inspect the contents of annotated tag objects.
      
      * js/fsck-tag-validation:
        Make sure that index-pack --strict checks tag objects
        Add regression tests for stricter tag fsck'ing
        fsck: check tag objects' headers
        Make sure fsck_commit_buffer() does not run out of the buffer
        fsck_object(): allow passing object data separately from the object itself
        Refactor type_from_string() to allow continuing after detecting an error
      13f4f046
    • Junio C Hamano's avatar
      Merge branch 'jk/faster-name-conflicts' · 9bc42227
      Junio C Hamano authored
      Optimize the check to see if a ref $F can be created by making sure
      no existing ref has $F/ as its prefix, which especially matters in
      a repository with a large number of existing refs.
      
      * jk/faster-name-conflicts:
        refs: speed up is_refname_available
      9bc42227
    • Junio C Hamano's avatar
      Merge branch 'jk/write-packed-refs-via-stdio' · 69a5bbbb
      Junio C Hamano authored
      Optimize the code path to write out the packed-refs file, which
      especially matters in a repository with a large number of refs.
      
      * jk/write-packed-refs-via-stdio:
        refs: write packed_refs file using stdio
      69a5bbbb
  5. 25 Sep, 2014 3 commits
  6. 23 Sep, 2014 2 commits
  7. 22 Sep, 2014 6 commits
  8. 19 Sep, 2014 3 commits