summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-10-11Git 2.15-rc1v2.15.0-rc1Junio C Hamano2-1/+18
2017-10-11Merge branch 'ls/filter-process-delayed'Junio C Hamano1-36/+52
2017-10-11Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano12-15/+15
2017-10-11Merge branch 'tb/complete-describe'Junio C Hamano1-1/+1
2017-10-11Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano14-41/+41
2017-10-11Merge branch 'jk/refs-df-conflict'Junio C Hamano4-3/+50
2017-10-11Merge branch 'rs/rs-mailmap'Junio C Hamano1-0/+1
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2-4/+26
2017-10-11Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano1-2/+6
2017-10-11Merge branch 'hn/string-list-doc'Junio C Hamano1-1/+1
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano4-17/+122
2017-10-11Merge branch 'jt/oidmap'Junio C Hamano6-31/+133
2017-10-11Merge branch 'jr/hash-migration-plan-doc'Junio C Hamano2-0/+798
2017-10-10write_entry: untangle symlink and regular-file casesJeff King1-31/+40
2017-10-10write_entry: avoid reading blobs in CE_RETRY caseJeff King1-11/+14
2017-10-10write_entry: fix leak when retrying delayed filterJeff King1-0/+1
2017-10-10cleanup: fix possible overflow errors in binary searchDerrick Stolee12-15/+15
2017-10-09Merge branch 'js/rebase-i-final'Junio C Hamano1-1/+1
2017-10-09i18n: add a missing space in messageJean-Noel Avila1-1/+1
2017-10-07Prepare for -rc1Junio C Hamano1-3/+38
2017-10-07Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano2-1/+10
2017-10-07Merge branch 'ks/verify-filename-non-option-error-message-tweak'Junio C Hamano1-1/+1
2017-10-07Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano1-3/+3
2017-10-07Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano19-113/+115
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano5-4/+11
2017-10-07Merge branch 'rb/compat-poll-fix'Junio C Hamano1-0/+4
2017-10-07Merge branch 'tg/memfixes'Junio C Hamano3-8/+6
2017-10-07Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano1-2/+3
2017-10-07Merge branch 'rs/qsort-s'Junio C Hamano1-1/+1
2017-10-07Merge branch 'jn/strbuf-doc-re-reuse'Junio C Hamano1-2/+9
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2-7/+30
2017-10-07completion: add --broken and --dirty to describeThomas Braun1-1/+1
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller15-42/+42
2017-10-07refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King3-2/+49
2017-10-07t3308: create a real ref directory/file conflictJeff King1-1/+1
2017-10-06api-argv-array.txt: remove broken link to string-list APITodd Zullinger1-1/+1
2017-10-06entry.c: check if file exists after checkoutLars Schneider1-1/+3
2017-10-06sha1_loose_object_info: handle errors from unpack_sha1_restJeff King1-2/+6
2017-10-06.mailmap: normalize name for René ScharfeRené Scharfe1-0/+1
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2-4/+26
2017-10-05entry.c: update cache entry only for existing filesLars Schneider1-1/+2
2017-10-05Git 2.15-rc0v2.15.0-rc0Junio C Hamano2-1/+17
2017-10-05Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2-3/+3
2017-10-05Merge branch 'rs/run-command-use-alloc-array'Junio C Hamano1-1/+1
2017-10-05Merge branch 'sb/git-clang-format'Junio C Hamano1-1/+5
2017-10-05Merge branch 'rs/use-free-and-null'Junio C Hamano1-18/+9
2017-10-05Merge branch 'rs/tag-null-pointer-arith-fix'Junio C Hamano1-4/+4
2017-10-05Merge branch 'rs/cocci-de-paren-call-params'Junio C Hamano1-5/+5
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano5-12/+8
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano7-20/+9
2017-10-05Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2-3/+145
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersTaylor Blau2-1/+10
2017-10-04strbuf doc: reuse after strbuf_release is fineJonathan Nieder1-2/+9
2017-10-04branch: reset instead of release a strbufStefan Beller1-2/+3
2017-10-04sub-process: use child_process.args instead of child_process.argvJohannes Sixt1-2/+1
2017-10-04http-push: fix construction of hex value from pathThomas Gummerer1-1/+1
2017-10-04path.c: fix uninitialized memory accessJeff King1-5/+4
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingRené Scharfe1-1/+1
2017-10-04setup: update error message to be more meaningfulKaartic Sivaraam1-1/+1
2017-10-04branch: change the error messages to be more meaningfulKaartic Sivaraam1-3/+3
2017-10-04Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano19-99/+101
2017-10-04t7301: use test_terminal to check colorJeff King1-2/+3
2017-10-04t4015: use --color with --color-movedJeff King1-13/+12
2017-10-04color: make "always" the same as "auto" in configJeff King3-19/+28
2017-10-04provide --color option for all ref-filter usersJeff King6-4/+16
2017-10-04t3205: use --color instead of color.branch=alwaysJeff King1-3/+2
2017-10-04t3203: drop "always" color testJeff King1-6/+0
2017-10-04t6006: drop "always" color config testsJeff King1-15/+5
2017-10-04t7502: use diff.noprefix for --verbose testJeff King1-2/+2
2017-10-04t7508: use test_terminal for color outputJeff King1-20/+21
2017-10-04t3701: use test-terminal to collect color outputJeff King1-5/+3
2017-10-04t4015: prefer --color to -c color.diff=alwaysJeff King1-14/+14
2017-10-04test-terminal: set TERM=vt100Jeff King7-10/+9
2017-10-03The twelfth batch for 2.15Junio C Hamano1-0/+24
2017-10-03Merge branch 'bw/git-clang-format'Junio C Hamano1-6/+6
2017-10-03Merge branch 'ad/doc-markup-fix'Junio C Hamano1-1/+1
2017-10-03Merge branch 'mh/mmap-packed-refs'Junio C Hamano9-369/+848
2017-10-03Merge branch 'mr/doc-negative-pathspec'Junio C Hamano5-2/+24
2017-10-03Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2-2/+2
2017-10-03Merge branch 'sb/diff-color-move'Junio C Hamano7-0/+35
2017-10-03Merge branch 'sb/test-submodule-update-config'Junio C Hamano1-0/+8
2017-10-03Merge branch 'jk/validate-headref-fix'Junio C Hamano1-11/+12
2017-10-03Merge branch 'jk/read-in-full'Junio C Hamano10-17/+55
2017-10-03Merge branch 'jk/no-optional-locks'Junio C Hamano6-1/+41
2017-10-03Merge branch 'hn/string-list-doc'Junio C Hamano2-239/+162
2017-10-03Merge branch 'hn/path-ownership-comment'Junio C Hamano2-1/+6
2017-10-03Merge branch 'hn/submodule-comment'Junio C Hamano1-0/+4
2017-10-03Merge branch 'sd/branch-copy'Junio C Hamano10-48/+478
2017-10-03Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano6-10/+139
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano7-360/+647
2017-10-03request-pull: capitalise "Git" to make it a proper nounAnn T Ropea2-3/+3
2017-10-03run-command: use ALLOC_ARRAYRené Scharfe1-1/+1
2017-10-02ref-filter.c: parse trailers arguments with %(contents) atomTaylor Blau2-3/+42
2017-10-02ref-filter.c: use trailer_opts to format trailersTaylor Blau3-10/+68
2017-10-02t6300: refactor %(trailers) testsTaylor Blau1-2/+9
2017-10-02doc: use "`<literal>`"-style quoting for literal stringsTaylor Blau1-3/+3
2017-10-02doc: 'trailers' is the preferred way to format trailersTaylor Blau1-1/+2
2017-10-02t4205: unfold across multiple linesTaylor Blau1-1/+1
2017-10-02clang-format: add a comment about the meaning/status of theStephan Beyer1-1/+5
2017-10-02repository: use FREE_AND_NULLRené Scharfe1-18/+9
2017-10-02tag: avoid NULL pointer arithmeticRené Scharfe1-4/+4
2017-10-02graph: use strbuf_addchars() to add spacesRené Scharfe1-7/+3
2017-10-02use strbuf_addstr() for adding strings to strbufsRené Scharfe3-4/+4
2017-10-02path: use strbuf_add_real_path()René Scharfe1-1/+1
2017-10-02builtin/: add UNLEAKsMartin Ågren5-4/+11
2017-10-02coccinelle: remove parentheses that become unnecessaryRené Scharfe1-5/+5
2017-10-02pretty.c: delimit "%(trailers)" arguments with ","Taylor Blau2-7/+30
2017-10-01refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe6-18/+8
2017-10-01refs: pass NULL to refs_resolve_refdup() if hash is not neededRené Scharfe1-2/+1
2017-10-01oidmap: map with OID as keyJonathan Tan6-31/+133
2017-10-01clang-format: adjust line break penaltiesJohannes Schindelin1-6/+6
2017-09-29fast-import: checkpoint: dump branches/tags/marks even if object_count==0Eric Rannaud2-3/+145
2017-09-29poll.c: always set revents, even if to zeroRandall S. Becker1-0/+4
2017-09-29The eleventh batch for 2.15Junio C Hamano1-0/+18
2017-09-29Merge branch 'sb/doc-config-submodule-update'Junio C Hamano1-4/+8
2017-09-29Merge branch 'ma/leakplugs'Junio C Hamano17-35/+75
2017-09-29Merge branch 'rj/no-sign-compare'Junio C Hamano10-24/+25
2017-09-29Merge branch 'sb/merge-commit-msg-hook'Junio C Hamano1-5/+4
2017-09-29Merge branch 'jt/fast-export-copy-modify-fix'Junio C Hamano2-15/+51
2017-09-29Merge branch 'mk/describe-match-with-all'Junio C Hamano3-22/+58
2017-09-29Merge branch 'jm/status-ignored-directory-optim'Junio C Hamano1-6/+41
2017-09-29doc: correct command formattingAdam Dinwoodie1-1/+1
2017-09-28technical doc: add a design doc for hash function transitionJonathan Nieder2-0/+798
2017-09-28The tenth batch for 2.15Junio C Hamano1-0/+47
2017-09-28Merge branch 'js/win32-lazyload-dll'Junio C Hamano1-0/+57
2017-09-28Merge branch 'jc/merge-x-theirs-docfix'Junio C Hamano1-1/+2
2017-09-28Merge branch 'ks/doc-use-camelcase-for-config-name'Junio C Hamano2-3/+3
2017-09-28Merge branch 'mk/diff-delta-avoid-large-offset'Junio C Hamano1-0/+3
2017-09-28Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong'Junio C Hamano1-11/+13
2017-09-28Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano17-46/+29
2017-09-28Merge branch 'rs/mailinfo-qp-decode-fix'Junio C Hamano1-3/+8
2017-09-28Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'Junio C Hamano1-0/+2
2017-09-28Merge branch 'ik/userdiff-html-h-element-fix'Junio C Hamano1-1/+1
2017-09-28Merge branch 'jk/fallthrough'Junio C Hamano15-28/+30
2017-09-28Merge branch 'jk/diff-blob'Junio C Hamano2-2/+7
2017-09-28Merge branch 'hn/typofix'Junio C Hamano1-1/+1
2017-09-28Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger'Junio C Hamano2-8/+94
2017-09-28Merge branch 'jk/describe-omit-some-refs'Junio C Hamano2-4/+11
2017-09-28submodule: correct error message for missing commitsStefan Beller2-2/+2
2017-09-28diff: correct newline in summary for renamed filesStefan Beller7-0/+35
2017-09-27git: add --no-optional-locks optionJeff King6-1/+41
2017-09-27validate_headref: use get_oid_hex for detached HEADsJeff King1-2/+2
2017-09-27validate_headref: use skip_prefix for symref parsingJeff King1-9/+6
2017-09-27validate_headref: NUL-terminate HEAD bufferJeff King1-0/+4
2017-09-27worktree: check the result of read_in_full()Jeff King1-1/+18
2017-09-27worktree: use xsize_t to access file sizeJeff King1-2/+3
2017-09-27distinguish error versus short read from read_in_full()Jeff King3-4/+16
2017-09-27avoid looking at errno for short read_in_full() returnsJeff King2-4/+14
2017-09-27prefer "!=" when checking read_in_full() resultJeff King3-3/+3
2017-09-27t7406: submodule.<name>.update command must not be run from .gitmodulesStefan Beller1-0/+8
2017-09-27string-list.h: move documentation from Documentation/api/ into headerHan-Wen Nienhuys2-239/+162
2017-09-27read_gitfile_gently: clarify return value ownership.Han-Wen Nienhuys1-1/+2
2017-09-27real_path: clarify return value ownershipHan-Wen Nienhuys1-0/+4
2017-09-26Sync with 2.14.2Junio C Hamano11-56/+183
2017-09-26submodule.c: describe submodule_to_gitdir() in a new commentHan-Wen Nienhuys1-0/+4
2017-09-26notes-merge: drop dead zero-write codeJeff King1-2/+0
2017-09-26files-backend: prefer "0" for write_in_full() error checkJeff King1-1/+1
2017-09-26Win32: simplify loading of DLL functionsJohannes Schindelin1-0/+57
2017-09-25packed-backend.c: rename a bunch of things and update commentsMichael Haggerty1-190/+232
2017-09-25mmapped_ref_iterator: inline into `packed_ref_iterator`Michael Haggerty1-170/+114
2017-09-25ref_cache: remove support for storing peeled valuesMichael Haggerty3-72/+11
2017-09-25packed_ref_store: get rid of the `ref_cache` entirelyMichael Haggerty1-27/+2
2017-09-25ref_store: implement `refs_peel_ref()` genericallyMichael Haggerty4-78/+17
2017-09-25packed_read_raw_ref(): read the reference from the mmapped bufferMichael Haggerty1-5/+9
2017-09-25packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`Michael Haggerty1-3/+106
2017-09-25read_packed_refs(): ensure that references are ordered when readMichael Haggerty1-11/+212
2017-09-25packed_ref_cache: keep the `packed-refs` file mmapped if possibleMichael Haggerty3-42/+152
2017-09-25packed-backend.c: reorder some definitionsMichael Haggerty1-24/+24
2017-09-25mmapped_ref_iterator_advance(): no peeled value for broken refsMichael Haggerty1-2/+8
2017-09-25mmapped_ref_iterator: add iterator over a packed-refs fileMichael Haggerty1-55/+152
2017-09-25packed_ref_cache: remember the file-wide peeling stateMichael Haggerty1-5/+12
2017-09-25read_packed_refs(): read references with minimal copyingMichael Haggerty1-61/+40
2017-09-25docs: improve discoverability of exclude pathspecManav Rathi5-2/+24
2017-09-25doc: camelCase the config variables to improve readabilityKaartic Sivaraam2-3/+3
2017-09-25The ninth batch for 2.15Junio C Hamano1-0/+67
2017-09-25Merge branch 'ks/test-readme-phrasofix'Junio C Hamano1-3/+3
2017-09-25Merge branch 'ow/rev-parse-is-shallow-repo'Junio C Hamano3-0/+23
2017-09-25Merge branch 'rj/test-ulimit-on-windows'Junio C Hamano5-40/+42
2017-09-25Merge branch 'jk/info-alternates-fix'Junio C Hamano1-20/+11
2017-09-25Merge branch 'mh/for-each-string-list-item-empty-fix'Junio C Hamano1-2/+4
2017-09-25Merge branch 'tb/test-lint-echo-e'Junio C Hamano1-1/+1
2017-09-25Merge branch 'jk/revision-remove-cmdline-pathspec'Junio C Hamano3-32/+18
2017-09-25Merge branch 'ls/travis-scriptify'Junio C Hamano10-81/+154
2017-09-25Merge branch 'aw/gc-lockfile-fscanf-fix'Junio C Hamano1-1/+1
2017-09-25Merge branch 'hv/mv-nested-submodules-test'Junio C Hamano1-0/+25
2017-09-25Merge branch 'bw/git-clang-format'Junio C Hamano2-0/+169
2017-09-25Merge branch 'nm/imap-send-with-curl'Junio C Hamano1-20/+41
2017-09-25Merge branch 'ks/commit-do-not-touch-cut-line'Junio C Hamano1-1/+1
2017-09-25Merge branch 'tg/refs-allowed-flags'Junio C Hamano2-0/+10
2017-09-25Merge branch 'rs/archive-excluded-directory'Junio C Hamano4-21/+6
2017-09-25Merge branch 'ks/help-alias-label'Junio C Hamano1-1/+1
2017-09-25Merge branch 'jn/per-repo-object-store-fixes'Junio C Hamano6-20/+45
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano22-67/+65
2017-09-25Merge branch 'ez/doc-duplicated-words-fix'Junio C Hamano4-4/+4
2017-09-25Merge branch 'kd/doc-for-each-ref'Junio C Hamano1-16/+17
2017-09-25Merge branch 'cc/subprocess-handshake-missing-capabilities'Junio C Hamano1-2/+2
2017-09-25Merge branch 'kw/write-index-reduce-alloc'Junio C Hamano2-1/+4
2017-09-25Merge branch 'mg/name-rev-tests-with-short-stack'Junio C Hamano3-6/+63
2017-09-25parse-options: only insert newline in help text if neededBrandon Casey2-4/+10
2017-09-25parse-options: write blank line to correct output streamBrandon Casey3-5/+5