mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 20:28:13 +02:00
Code
50,659 Commits 6 Branches 956 Tags 349 MiB
15b7581776
Commit Graph

50659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nguyễn Thái Ngọc Duy
15b7581776 t/helper: merge test-prio-queue into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
b8d5cf4f96 t/helper: merge test-path-utils into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
c033cc1508 t/helper: merge test-online-cpus into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
d9cc2c8780 t/helper: merge test-mktemp into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
34889d3cd7 t/helper: merge (unused) test-mergesort into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
9080e75fbc t/helper: merge (unused) test-match-trees into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
cc6f663dea t/helper: merge test-index-version into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
7c18cbd562 t/helper: merge test-hashmap into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
c680668d1a t/helper: merge test-genrandom into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
dbceb3ecc5 t/helper: merge test-example-decorate into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
8133061e69 t/helper: merge test-dump-split-index into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
06ccb29e8b t/helper: merge test-dump-cache-tree into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
1c854745bd t/helper: merge test-drop-caches into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
9153dde5e2 t/helper: merge (unused) test-delta into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
a801a7cfc7 t/helper: merge test-date into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
e499894443 t/helper: merge test-ctype into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
0e2678af4c t/helper: merge test-config into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
64eb82fea8 t/helper: merge test-lazy-init-name-hash into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
dae2ff9bb6 t/helper: merge test-sha1 into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
0e496492d2 t/helper: merge test-chmtime into test-tool 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:47 -07:00
Nguyễn Thái Ngọc Duy
efd71f8913 t/helper: add an empty test-tool program 
This will become an umbrella program that absorbs most [1] t/helper
programs in. By having a single executable binary we reduce disk usage
(libgit.a is replicated by every t/helper program) and shorten link
time a bit.

Running "make --jobs=1; du -sh t/helper" with ccache fully populated,
it takes 27 seconds and 277MB at the beginning of this series, 17
seconds and 42MB at the end.

[1] There are a couple programs that will not become part of
    test-tool: test-line-buffer and test-svn-fe have extra
    dependencies and test-fake-ssh's program name has to be a single
    word for some ssh tests.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-03-27 08:45:13 -07:00
Junio C Hamano
90bbd502d5 Sync with Git 2.16.3 2018-03-22 14:36:51 -07:00
Junio C Hamano
d32eb83c1d Git 2.16.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v2.16.3 		2018-03-22 14:24:45 -07:00
Junio C Hamano
88595ebceb Merge branch 'ms/non-ascii-ticks' into maint 
Doc markup fix.

* ms/non-ascii-ticks:
  Documentation/gitsubmodules.txt: avoid non-ASCII apostrophes
 2018-03-22 14:24:26 -07:00
Junio C Hamano
393eee1cad Merge branch 'jk/cached-commit-buffer' into maint 
Code clean-up.

* jk/cached-commit-buffer:
  revision: drop --show-all option
  commit: drop uses of get_cached_commit_buffer()
 2018-03-22 14:24:25 -07:00
Junio C Hamano
c9bc2c5d4d Merge branch 'sm/mv-dry-run-update' into maint 
Code clean-up.

* sm/mv-dry-run-update:
  mv: remove unneeded 'if (!show_only)'
  t7001: add test case for --dry-run
 2018-03-22 14:24:25 -07:00
Junio C Hamano
342215be59 Merge branch 'tg/worktree-create-tracking' into maint 
Hotfix for a recent topic.

* tg/worktree-create-tracking:
  git-worktree.txt: fix indentation of example and text of 'add' command
  git-worktree.txt: fix missing ")" typo
 2018-03-22 14:24:24 -07:00
Junio C Hamano
8bfeb0e42c Merge branch 'gs/test-unset-xdg-cache-home' into maint 
Test update.

* gs/test-unset-xdg-cache-home:
  test-lib.sh: unset XDG_CACHE_HOME
 2018-03-22 14:24:24 -07:00
Junio C Hamano
e09224812a Merge branch 'sb/status-doc-fix' into maint 
Docfix.

* sb/status-doc-fix:
  Documentation/git-status: clarify status table for porcelain mode
 2018-03-22 14:24:23 -07:00
Junio C Hamano
9ea8e0ca81 Merge branch 'rd/typofix' into maint 
Typofix.

* rd/typofix:
  Correct mispellings of ".gitmodule" to ".gitmodules"
  t/: correct obvious typo "detahced"
 2018-03-22 14:24:22 -07:00
Junio C Hamano
5a03f1d75a Merge branch 'bp/fsmonitor' into maint 
Doc update for a recently added feature.

* bp/fsmonitor:
  fsmonitor: update documentation to remove reference to invalid config settings
 2018-03-22 14:24:21 -07:00
Junio C Hamano
dfc20a5e3c Merge branch 'bc/doc-interpret-trailers-grammofix' into maint 
Docfix.

* bc/doc-interpret-trailers-grammofix:
  docs/interpret-trailers: fix agreement error
 2018-03-22 14:24:21 -07:00
Junio C Hamano
68559c464a Merge branch 'sg/doc-test-must-fail-args' into maint 
Devdoc update.

* sg/doc-test-must-fail-args:
  t: document 'test_must_fail ok=<signal-name>'
 2018-03-22 14:24:20 -07:00
Junio C Hamano
67b7dd3d86 Merge branch 'rj/sparse-updates' into maint 
Devtool update.

* rj/sparse-updates:
  Makefile: suppress a sparse warning for pack-revindex.c
  config.mak.uname: remove SPARSE_FLAGS setting for cygwin
 2018-03-22 14:24:19 -07:00
Junio C Hamano
2e1062d30f Merge branch 'jk/gettext-poison' into maint 
Test updates.

* jk/gettext-poison:
  git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME
  t0205: drop redundant test
 2018-03-22 14:24:19 -07:00
Junio C Hamano
34f6f0eca2 Merge branch 'nd/ignore-glob-doc-update' into maint 
Doc update.

* nd/ignore-glob-doc-update:
  gitignore.txt: elaborate shell glob syntax
 2018-03-22 14:24:18 -07:00
Junio C Hamano
fda2326cb7 Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maint 
* rs/cocci-strbuf-addf-to-addstr:
  cocci: simplify check for trivial format strings
 2018-03-22 14:24:17 -07:00
Junio C Hamano
e55521be8d Merge branch 'jc/worktree-add-short-help' into maint 
Error message fix.

* jc/worktree-add-short-help:
  worktree: say that "add" takes an arbitrary commit in short-help
 2018-03-22 14:24:17 -07:00
Junio C Hamano
9c34129e6b Merge branch 'tz/doc-show-defaults-to-head' into maint 
Doc update.

* tz/doc-show-defaults-to-head:
  doc: mention 'git show' defaults to HEAD
 2018-03-22 14:24:17 -07:00
Junio C Hamano
3112c3fa7f Merge branch 'nd/shared-index-fix' into maint 
Code clean-up.

* nd/shared-index-fix:
  read-cache: don't write index twice if we can't write shared index
  read-cache.c: move tempfile creation/cleanup out of write_shared_index
  read-cache.c: change type of "temp" in write_shared_index()
 2018-03-22 14:24:16 -07:00
Junio C Hamano
bffce882fd Merge branch 'jc/mailinfo-cleanup-fix' into maint 
Corner case bugfix.

* jc/mailinfo-cleanup-fix:
  mailinfo: avoid segfault when can't open files
 2018-03-22 14:24:16 -07:00
Junio C Hamano
b502aa4f45 Merge branch 'rb/hashmap-h-compilation-fix' into maint 
Code clean-up.

* rb/hashmap-h-compilation-fix:
  hashmap.h: remove unused variable
 2018-03-22 14:24:15 -07:00
Junio C Hamano
9bcb48912c Merge branch 'rs/describe-unique-abbrev' into maint 
Code clean-up.

* rs/describe-unique-abbrev:
  describe: use strbuf_add_unique_abbrev() for adding short hashes
 2018-03-22 14:24:14 -07:00
Junio C Hamano
60736db161 Merge branch 'ks/submodule-doc-updates' into maint 
Doc updates.

* ks/submodule-doc-updates:
  Doc/git-submodule: improve readability and grammar of a sentence
  Doc/gitsubmodules: make some changes to improve readability and syntax
 2018-03-22 14:24:14 -07:00
Junio C Hamano
b1bdf46bb8 Merge branch 'cl/t9001-cleanup' into maint 
Test clean-up.

* cl/t9001-cleanup:
  t9001: use existing helper in send-email test
 2018-03-22 14:24:13 -07:00
Junio C Hamano
6ef449ea77 Merge branch 'bw/oidmap-autoinit' into maint 
Code clean-up.

* bw/oidmap-autoinit:
  oidmap: ensure map is initialized
 2018-03-22 14:24:12 -07:00
Junio C Hamano
dab684ff43 Merge branch 'sg/test-i18ngrep' into maint 
Test fixes.

* sg/test-i18ngrep:
  t: make 'test_i18ngrep' more informative on failure
  t: validate 'test_i18ngrep's parameters
  t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'
  t5536: let 'test_i18ngrep' read the file without redirection
  t5510: consolidate 'grep' and 'test_i18ngrep' patterns
  t4001: don't run 'git status' upstream of a pipe
  t6022: don't run 'git merge' upstream of a pipe
  t5812: add 'test_i18ngrep's missing filename parameter
  t5541: add 'test_i18ngrep's missing filename parameter
 2018-03-22 14:24:12 -07:00
Junio C Hamano
d78b7eb2d5 Merge branch 'jt/fsck-code-cleanup' into maint 
Plug recently introduced leaks in fsck.

* jt/fsck-code-cleanup:
  fsck: fix leak when traversing trees
 2018-03-22 14:24:12 -07:00
Junio C Hamano
34b9ec8dd9 Merge branch 'ew/svn-branch-segfault-fix' into maint 
Workaround for segfault with more recent versions of SVN.

* ew/svn-branch-segfault-fix:
  git-svn: control destruction order to avoid segfault
 2018-03-22 14:24:11 -07:00
Junio C Hamano
091853a1aa Merge branch 'nd/list-merge-strategy' into maint 
Completion of "git merge -s<strategy>" (in contrib/) did not work
well in non-C locale.

* nd/list-merge-strategy:
  completion: fix completing merge strategies on non-C locales
 2018-03-22 14:24:11 -07:00