Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load trees lazily when walking commit-graph #4

Closed
wants to merge 436 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
436 commits
Select commit Hold shift + click to select a range
d7db100
Merge branch 'bp/fsmonitor'
gitster Feb 27, 2018
5aebb3e
Merge branch 'jk/sq-dequote-on-bogus-input'
gitster Feb 27, 2018
34b65c6
Merge branch 'jk/test-hashmap-updates'
gitster Feb 27, 2018
9dc254b
Merge branch 'rd/typofix'
gitster Feb 27, 2018
f2fcbeb
Merge branch 'jt/binsearch-with-fanout'
gitster Feb 27, 2018
12accdc
Merge branch 'nd/ita-wt-renames-in-status' into maint
gitster Feb 27, 2018
c1ab3b8
Merge branch 'ab/commit-m-with-fixup' into maint
gitster Feb 27, 2018
14890e9
Merge branch 'sb/submodule-update-reset-fix' into maint
gitster Feb 27, 2018
38e79b1
Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint
gitster Feb 27, 2018
bdcdad5
Sync with maint
gitster Feb 27, 2018
2fc74f4
Fifth batch for 2.17
gitster Feb 27, 2018
a5bf824
t: prevent '-x' tracing from interfering with test helpers' stderr
szeder Feb 25, 2018
5fc98e7
t: add means to disable '-x' tracing for individual test scripts
szeder Feb 23, 2018
c3a4456
t1507-rev-parse-upstream: don't check the stderr of a shell function
szeder Feb 23, 2018
11395a3
test_must_be_empty: make sure the file exists, not just empty
gitster Feb 27, 2018
768b9d6
docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'
amhk Feb 27, 2018
21abed5
sha1_name: fix uninitialized memory errors
derrickstolee Feb 27, 2018
14bca6c
sequencer: make lockfiles non-static
Feb 27, 2018
6481652
sequencer: always roll back lock in `do_recursive_merge()`
Feb 27, 2018
ca2a4f4
perl: *.pm files should not have the executable bit
avar Feb 25, 2018
872ba00
Git.pm: remove redundant "use strict" from sub-package
avar Feb 25, 2018
f0e19cb
Git.pm: add the "use warnings" pragma
avar Feb 25, 2018
53ba2c7
perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config file
rscharfe Feb 25, 2018
ebbed3b
revision.c: reduce object database queries
derrickstolee Feb 25, 2018
ddf88fa
diff: add --compact-summary
pclouds Feb 24, 2018
51b74b5
t5536: simplify checking of messages output to stderr
szeder Feb 24, 2018
51d3f43
merge-recursive: always roll back lock in `merge_recursive_generic()`
Feb 28, 2018
5790d25
merge: always roll back lock in `checkout_fast_forward()`
Feb 28, 2018
350292a
sequencer: do not roll back lockfile unnecessarily
Feb 28, 2018
40dc533
t3030-merge-recursive: don't check the stderr of a subshell
szeder Feb 23, 2018
fa06eb6
t5500-fetch-pack: don't check the stderr of a subshell
szeder Feb 23, 2018
9b2ac68
t5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log file
szeder Feb 23, 2018
91538d0
t5570-git-daemon: don't check the stderr of a subshell
szeder Feb 23, 2018
d31f298
t9903-bash-prompt: don't check the stderr of __git_ps1()
szeder Feb 23, 2018
5827506
t1510-repo-setup: mark as untraceable with '-x'
szeder Feb 23, 2018
94201a2
t/README: add a note about don't saving stderr of compound commands
szeder Feb 23, 2018
aedffe9
travis-ci: run tests with '-x' tracing
szeder Feb 23, 2018
026336c
untracked cache: use git_env_bool() not getenv() for customization
gitster Feb 28, 2018
c22c624
Merge branch 'nd/am-quit'
gitster Feb 28, 2018
619e521
Merge branch 'es/worktree-add-post-checkout-hook'
gitster Feb 28, 2018
7676b86
Merge branch 'sb/status-doc-fix'
gitster Feb 28, 2018
177bd65
Merge branch 'tk/apply-dev-null-verify-name-fix'
gitster Feb 28, 2018
ba5f3fc
Merge branch 'gs/test-unset-xdg-cache-home'
gitster Feb 28, 2018
2c20dc1
Merge branch 'tg/worktree-create-tracking'
gitster Feb 28, 2018
0996727
Merge branch 'tz/do-not-clean-spec-file'
gitster Feb 28, 2018
69917e6
Merge branch 'jk/push-options-via-transport-fix'
gitster Feb 28, 2018
7e31236
Sixth batch for 2.17
gitster Feb 28, 2018
781262c
hooks/pre-auto-gc-battery: allow gc to run on non-laptops
kilobyte Feb 28, 2018
095c741
commit: run git gc --auto just before the post-commit hook
avar Feb 28, 2018
902f414
t3701: don't hard code sha1 hash values
phillipwood Mar 1, 2018
23fea4c
t3701: add failing test for pathological context lines
phillipwood Mar 1, 2018
fecc6f3
add -p: adjust offsets of subsequent hunks when one is skipped
phillipwood Mar 1, 2018
6100081
write_locked_index(): add flag to avoid writing unchanged index
Mar 1, 2018
1dbf0c0
userdiff: add built-in pattern for golang
agrn Mar 1, 2018
2b8ea7f
add -p: calculate offset delta for edited patches
phillipwood Mar 5, 2018
b3e0fcf
add -p: fix counting when splitting and coalescing
phillipwood Mar 5, 2018
3a8522f
add -p: don't rely on apply's '--recount' option
phillipwood Mar 5, 2018
7d5b30e
gitweb: hard-depend on the Digest::MD5 5.8 module
avar Mar 3, 2018
29118b3
Git.pm: hard-depend on the File::{Temp,Spec} modules
avar Mar 3, 2018
1046c11
git-send-email: unconditionally use Net::{SMTP,Domain}
avar Mar 3, 2018
e5741c3
perl: update our ancient copy of Error.pm
avar Mar 3, 2018
10cf3b0
perl: update our copy of Mail::Address
avar Mar 3, 2018
2865467
perl: move CPAN loader wrappers to another namespace
avar Mar 3, 2018
edfb7b9
perl: generalize the Git::LoadCPAN facility
avar Mar 3, 2018
382029f
perl: move the perl/Git/FromCPAN tree to perl/FromCPAN
avar Mar 3, 2018
075321c
Makefile: add NO_PERL_CPAN_FALLBACKS knob
tmzullinger Mar 3, 2018
1aca69c
perl Git::LoadCPAN: emit better errors under NO_PERL_CPAN_FALLBACKS
avar Mar 3, 2018
0aa7a78
smart-http: document flush after "# service" line
peff Mar 3, 2018
af3570e
t3701: add a test for interactive.diffFilter
peff Mar 3, 2018
42f7d45
add--interactive: detect bogus diffFilter output
peff Mar 3, 2018
15dc3b9
send-email: rename variable for clarity
chrissicool Mar 3, 2018
d11c943
send-email: support separate Reply-To address
chrissicool Mar 3, 2018
95308d6
object.h: update flag allocation comment
pclouds Mar 6, 2018
3d1cf1e
object.h: realign object flag allocation comment
pclouds Mar 6, 2018
7f19def
t2028: fix minor error and issues in newly-added "worktree move" tests
sunshineco Mar 4, 2018
05d290e
Merge branch 'nm/tag-edit'
gitster Mar 6, 2018
a4ae2e5
Merge branch 'sm/mv-dry-run-update'
gitster Mar 6, 2018
c1a7902
Merge branch 'ab/fetch-prune'
gitster Mar 6, 2018
2cd91ec
Merge branch 'xz/send-email-batch-size'
gitster Mar 6, 2018
9ca488c
Merge branch 'nd/rebase-show-current-patch'
gitster Mar 6, 2018
f2fd27c
Merge branch 'sb/color-h-cleanup'
gitster Mar 6, 2018
44f2f3f
Merge branch 'sg/t6300-modernize'
gitster Mar 6, 2018
60f8b89
Merge branch 'pw/add-p-single'
gitster Mar 6, 2018
f655707
Merge branch 'ab/simplify-perl-makefile'
gitster Mar 6, 2018
f88590e
Merge branch 'jc/allow-ff-merging-kept-tags'
gitster Mar 6, 2018
9660804
Merge branch 'bw/doc-submodule-recurse-config-with-clone'
gitster Mar 6, 2018
e33c332
Merge branch 'jk/cached-commit-buffer'
gitster Mar 6, 2018
148bce9
Merge branch 'jk/test-helper-v-output-fix'
gitster Mar 6, 2018
327e524
Merge branch 'ms/non-ascii-ticks'
gitster Mar 6, 2018
c14d5f9
Merge branch 'rs/strbuf-read-file-or-whine'
gitster Mar 6, 2018
169c9c0
Merge branch 'bw/c-plus-plus'
gitster Mar 6, 2018
6c3e6f6
Merge branch 'jk/strbuf-read-file-close-error'
gitster Mar 6, 2018
179e1f5
Merge branch 'bw/perl-timegm-timelocal-fix'
gitster Mar 6, 2018
c6284da
Seventh batch for 2.17
gitster Mar 6, 2018
b475e44
completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate
pclouds Mar 7, 2018
4ea2c97
completion: simplify _git_notes
pclouds Mar 7, 2018
b25e2e6
completion: complete --{reuse,reedit}-message= for all notes subcmds
pclouds Mar 7, 2018
27b42d0
completion: more subcommands in _git_notes()
pclouds Mar 7, 2018
a12cec9
userdiff.c: add C# async keyword in diff pattern
thomaslevesque Mar 8, 2018
2caa7b8
git manpage: note git-security@googlegroups.com
avar Mar 8, 2018
c710d18
Merge branch 'sg/travis-build-during-script-phase'
gitster Mar 8, 2018
4094e47
Merge branch 'jh/status-no-ahead-behind'
gitster Mar 8, 2018
9e69a14
Merge branch 'ot/ref-filter-cleanup'
gitster Mar 8, 2018
5fc4a7e
Merge branch 'rv/grep-cleanup'
gitster Mar 8, 2018
65ebfec
Merge branch 'sg/subtree-signed-commits'
gitster Mar 8, 2018
7519a60
Merge branch 'ds/find-unique-abbrev-optim'
gitster Mar 8, 2018
d5120da
Merge branch 'ds/mark-parents-uninteresting-optim'
gitster Mar 8, 2018
a8d45dc
Merge branch 'jc/test-must-be-empty'
gitster Mar 8, 2018
cd3d56a
Merge branch 'mk/doc-pretty-fill'
gitster Mar 8, 2018
74735c9
Merge branch 'rs/perf-repeat-thrice-by-default'
gitster Mar 8, 2018
cdda65a
Merge branch 'bp/untracked-cache-noflush'
gitster Mar 8, 2018
9bb8eb0
Merge branch 'ab/gc-auto-in-commit'
gitster Mar 8, 2018
077cde9
Merge branch 'ag/userdiff-go-funcname'
gitster Mar 8, 2018
d0db9ed
Eighth batch for 2.17
gitster Mar 8, 2018
54ce2e9
t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'
szeder Mar 8, 2018
c20bf94
t9402-git-cvsserver-refs: don't check the stderr of a subshell
szeder Mar 8, 2018
2b7750c
sha1_file: restore OBJECT_INFO_QUICK functionality
jonathantanmy Mar 13, 2018
868f7d2
Merge branch 'nd/diff-stat-with-summary'
gitster Mar 14, 2018
787aa97
Merge branch 'ma/roll-back-lockfiles'
gitster Mar 14, 2018
d92a015
Merge branch 'rj/test-i18ngrep'
gitster Mar 14, 2018
571e472
Merge branch 'sg/test-x'
gitster Mar 14, 2018
b423234
Merge branch 'ab/pre-auto-gc-battery'
gitster Mar 14, 2018
436d18f
Merge branch 'pw/add-p-recount'
gitster Mar 14, 2018
bd0f794
Merge branch 'nd/worktree-move'
gitster Mar 14, 2018
c5e2df0
Merge branch 'jk/add-i-diff-filter'
gitster Mar 14, 2018
88506cb
Merge branch 'jk/smart-http-protocol-doc-fix'
gitster Mar 14, 2018
99321e3
Merge branch 'nd/object-allocation-comments'
gitster Mar 14, 2018
7fb6aef
Merge branch 'nd/parseopt-completion'
gitster Mar 14, 2018
ffb2c0f
index-pack: support checking objects but not links
jonathantanmy Mar 14, 2018
98a2ea4
fetch-pack: do not check links for partial fetch
jonathantanmy Mar 14, 2018
0e267b7
Fix bugs preventing adding updated cache entries to the name hash
benpeart Mar 15, 2018
b8fd600
http: fix an unused variable warning for 'curl_no_proxy'
ramsay-jones Mar 14, 2018
40c17eb
t/t3200: fix a typo in a test description
sivaraam Mar 10, 2018
fbc615b
Merge branch 'np/send-email-header-parsing'
gitster Mar 15, 2018
e74737b
Merge branch 'cl/send-email-reply-to'
gitster Mar 15, 2018
ae1644b
Merge branch 'ab/perl-fixes'
gitster Mar 15, 2018
a8ba07c
Merge branch 'ab/man-sec-list'
gitster Mar 15, 2018
9ecfd98
Merge branch 'sg/cvs-tests-with-x'
gitster Mar 15, 2018
e215e89
Merge branch 'tl/userdiff-csharp-async'
gitster Mar 15, 2018
0afbf6c
Git 2.17-rc0
gitster Mar 15, 2018
abc8de6
l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed)
jiangxin Mar 15, 2018
b82ef32
Merge remote-tracking branch 'git-po/maint'
jiangxin Mar 15, 2018
33ac3e8
l10n: es.po: Update Spanish translation 2.17.0
ChrisADR Mar 16, 2018
31243e7
l10n: bg.po: Updated Bulgarian translation (3376t)
alshopov Mar 16, 2018
14f437f
RelNotes: add details on Perl module changes
tmzullinger Mar 16, 2018
1a849b5
l10n: vi.po(3376t): Updated Vietnamese translation for v2.17
vnwildman Mar 17, 2018
7778125
Merge branch 'master' of git://github.com/alshopov/git-po
jiangxin Mar 17, 2018
d65800c
Merge branch 'master' of https://github.com/vnwildman/git
jiangxin Mar 17, 2018
6a07148
l10n: fr.po v2.17.0 round 1
jnavila Mar 16, 2018
d2cad6e
Merge branch 'fr_v2.17.0' of git://github.com/jnavila/git
jiangxin Mar 18, 2018
b5827d2
l10n: Update Catalan translation
jordimas Mar 18, 2018
1439a72
l10n: sv.po: Update Swedish translation (3376t0f0u)
nafmo Mar 18, 2018
bd9958c
Documentation/merge-strategies: typofix
dpursehouse Mar 17, 2018
1775e99
completion: complete tags with git tag --delete/--verify
tmzullinger Mar 18, 2018
9ee0540
mingw: abort on invalid strftime formats
dscho Mar 19, 2018
206a6ae
filter-branch: use printf instead of echo -e
mlocati Mar 19, 2018
156e178
-Wuninitialized: remove some 'init-self' workarounds
ramsay-jones Mar 19, 2018
00a4b03
read-cache: fix an -Wmaybe-uninitialized warning
ramsay-jones Mar 19, 2018
b635ed9
doc/gitattributes: mention non-recursive behavior
peff Mar 20, 2018
dabe29b
Merge branch 'master' of https://github.com/Softcatala/git-po
jiangxin Mar 21, 2018
df8526c
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
jiangxin Mar 21, 2018
75901df
Merge branch 'ma/config-page-only-in-list-mode'
gitster Mar 21, 2018
beb2cdf
Merge branch 'ma/skip-writing-unchanged-index'
gitster Mar 21, 2018
6494066
Merge branch 'jh/fsck-promisors'
gitster Mar 21, 2018
fddf9a2
Merge branch 'bp/refresh-cache-ent-rehash-fix'
gitster Mar 21, 2018
f62452e
Merge branch 'jt/transfer-fsck-with-promissor'
gitster Mar 21, 2018
5647103
Merge branch 'ks/t3200-typofix'
gitster Mar 21, 2018
79cc643
Merge branch 'rj/http-code-cleanup'
gitster Mar 21, 2018
bfaab48
Merge branch 'tz/relnotes-1.7-on-perl'
gitster Mar 21, 2018
e2a37ec
Merge branch 'dp/merge-strategy-doc-fix'
gitster Mar 21, 2018
4c5dbf1
Merge branch 'js/ming-strftime'
gitster Mar 21, 2018
f46cdf4
Merge branch 'ml/filter-branch-portability-fix'
gitster Mar 21, 2018
c108a77
Merge branch 'tz/complete-tag-delete-tagname'
gitster Mar 21, 2018
d178111
Merge branch 'rj/warning-uninitialized-fix'
gitster Mar 21, 2018
d16c379
Merge branch 'jk/attributes-path-doc'
gitster Mar 21, 2018
085f5f9
Git 2.17-rc1
gitster Mar 21, 2018
8b0eaa4
completion: clear cached --options when sourcing the completion script
szeder Mar 22, 2018
573ce03
Merge branch 'sg/travis-build-during-script-phase' into maint
gitster Mar 22, 2018
b322219
Merge branch 'nd/diff-flush-before-warning' into maint
gitster Mar 22, 2018
721dce0
Merge branch 'jt/http-redact-cookies' into maint
gitster Mar 22, 2018
7e44d80
Merge branch 'mr/packed-ref-store-fix' into maint
gitster Mar 22, 2018
b0e0fc2
Merge branch 'tg/split-index-fixes' into maint
gitster Mar 22, 2018
f936c9b
Merge branch 'jk/daemon-fixes' into maint
gitster Mar 22, 2018
091853a
Merge branch 'nd/list-merge-strategy' into maint
gitster Mar 22, 2018
34b9ec8
Merge branch 'ew/svn-branch-segfault-fix' into maint
gitster Mar 22, 2018
d78b7eb
Merge branch 'jt/fsck-code-cleanup' into maint
gitster Mar 22, 2018
dab684f
Merge branch 'sg/test-i18ngrep' into maint
gitster Mar 22, 2018
6ef449e
Merge branch 'bw/oidmap-autoinit' into maint
gitster Mar 22, 2018
b1bdf46
Merge branch 'cl/t9001-cleanup' into maint
gitster Mar 22, 2018
60736db
Merge branch 'ks/submodule-doc-updates' into maint
gitster Mar 22, 2018
9bcb489
Merge branch 'rs/describe-unique-abbrev' into maint
gitster Mar 22, 2018
b502aa4
Merge branch 'rb/hashmap-h-compilation-fix' into maint
gitster Mar 22, 2018
bffce88
Merge branch 'jc/mailinfo-cleanup-fix' into maint
gitster Mar 22, 2018
3112c3f
Merge branch 'nd/shared-index-fix' into maint
gitster Mar 22, 2018
9c34129
Merge branch 'tz/doc-show-defaults-to-head' into maint
gitster Mar 22, 2018
e55521b
Merge branch 'jc/worktree-add-short-help' into maint
gitster Mar 22, 2018
fda2326
Merge branch 'rs/cocci-strbuf-addf-to-addstr' into maint
gitster Mar 22, 2018
34f6f0e
Merge branch 'nd/ignore-glob-doc-update' into maint
gitster Mar 22, 2018
2e1062d
Merge branch 'jk/gettext-poison' into maint
gitster Mar 22, 2018
67b7dd3
Merge branch 'rj/sparse-updates' into maint
gitster Mar 22, 2018
68559c4
Merge branch 'sg/doc-test-must-fail-args' into maint
gitster Mar 22, 2018
dfc20a5
Merge branch 'bc/doc-interpret-trailers-grammofix' into maint
gitster Mar 22, 2018
5a03f1d
Merge branch 'bp/fsmonitor' into maint
gitster Mar 22, 2018
9ea8e0c
Merge branch 'rd/typofix' into maint
gitster Mar 22, 2018
e092248
Merge branch 'sb/status-doc-fix' into maint
gitster Mar 22, 2018
8bfeb0e
Merge branch 'gs/test-unset-xdg-cache-home' into maint
gitster Mar 22, 2018
342215b
Merge branch 'tg/worktree-create-tracking' into maint
gitster Mar 22, 2018
c9bc2c5
Merge branch 'sm/mv-dry-run-update' into maint
gitster Mar 22, 2018
393eee1
Merge branch 'jk/cached-commit-buffer' into maint
gitster Mar 22, 2018
88595eb
Merge branch 'ms/non-ascii-ticks' into maint
gitster Mar 22, 2018
d32eb83
Git 2.16.3
gitster Mar 22, 2018
90bbd50
Sync with Git 2.16.3
gitster Mar 22, 2018
b60e88c
t9902: disable test on the list of merge-strategies under GETTEXT_POISON
gitster Mar 23, 2018
7be97e4
l10n: fr.po: v2.17.0 no fuzzy
jnavila Mar 23, 2018
edc320e
Merge branch 'fr_v2.17.0' of git://github.com/jnavila/git
jiangxin Mar 25, 2018
9f242a1
unpack-trees: release oid_array after use in check_updates()
rscharfe Mar 25, 2018
0a790f0
git-stash.txt: remove extra square bracket
tgummerer Mar 26, 2018
9748e39
submodule deinit: handle non existing pathspecs gracefully
stefanbeller Mar 27, 2018
1be5ae8
l10n: ko.po: Update Korean translation
changwoo Mar 19, 2018
87cc76f
Merge branch 'nd/parseopt-completion'
gitster Mar 28, 2018
2081fa7
Merge branch 'pc/submodule-helper'
gitster Mar 28, 2018
72d30c7
Merge branch 'tg/stash-doc-typofix'
gitster Mar 28, 2018
03df495
Git 2.17-rc2
gitster Mar 28, 2018
31e5e17
l10n: zh_CN: for git v2.17.0 l10n round 1
jiangxin Feb 22, 2018
610f809
l10n: zh_CN: review for git v2.17.0 l10n round 1
oldsharp Mar 29, 2018
c7620bd
upload-pack: disable object filtering when disabled by config
jrn Mar 28, 2018
c2a499e
Merge branch 'jh/partial-clone'
gitster Mar 29, 2018
8bb6d60
l10n: de.po: translate 132 new messages
ralfth Mar 16, 2018
fd2fb4a
add -p: fix 2.17.0-rc* regression due to moved code
avar Mar 31, 2018
5f94417
Merge branch 'pw/add-p-single'
gitster Apr 2, 2018
1614dd0
Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git-l10n/git-po
gitster Apr 2, 2018
468165c
Git 2.17
gitster Apr 2, 2018
b53b878
csum-file: rename hashclose() to finalize_hashfile()
derrickstolee Mar 14, 2018
4194f63
csum-file: refactor finalize_hashfile() method
derrickstolee Feb 26, 2018
0b6968d
commit-graph: add format document
derrickstolee Feb 8, 2018
e1d630d
graph: add commit graph design document
derrickstolee Feb 8, 2018
d744f01
commit-graph: create git-commit-graph builtin
derrickstolee Feb 8, 2018
7e3e8bb
commit-graph: implement write_commit_graph()
derrickstolee Feb 8, 2018
4fb391f
commit-graph: implement git-commit-graph write
derrickstolee Feb 8, 2018
7f216dc
commit-graph: implement git commit-graph read
derrickstolee Feb 16, 2018
79bda5a
commit-graph: add core.commitGraph setting
derrickstolee Feb 8, 2018
fbe7f21
commit-graph: close under reachability
derrickstolee Feb 8, 2018
041b2ef
commit: integrate commit graph with commit parsing
derrickstolee Feb 8, 2018
83da570
commit-graph: read only from specific pack-indexes
derrickstolee Feb 8, 2018
75edbca
commit-graph: build graph from starting commits
derrickstolee Feb 8, 2018
ba1221a
commit-graph: implement "--additive" option
derrickstolee Feb 26, 2018
f85cee5
treewide: rename tree to maybe_tree
derrickstolee Apr 6, 2018
9d101a9
commit: create get_commit_tree() method
derrickstolee Mar 28, 2018
55152e4
treewide: replace maybe_tree with accessor methods
derrickstolee Apr 6, 2018
55ec97d
commit-graph: lazy-load trees for commits
derrickstolee Apr 6, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
/git-clone
/git-column
/git-commit
/git-commit-graph
/git-commit-tree
/git-config
/git-count-objects
Expand Down
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ matrix:
compiler:
addons:
before_install:
before_script:
script:
- >
test "$TRAVIS_REPO_SLUG" != "git/git" ||
Expand All @@ -46,7 +45,6 @@ matrix:
services:
- docker
before_install:
before_script:
script: ci/run-linux32-docker.sh
- env: jobname=StaticAnalysis
os: linux
Expand All @@ -56,7 +54,6 @@ matrix:
packages:
- coccinelle
before_install:
before_script:
script: ci/run-static-analysis.sh
after_failure:
- env: jobname=Documentation
Expand All @@ -68,13 +65,11 @@ matrix:
- asciidoc
- xmlto
before_install:
before_script:
script: ci/test-documentation.sh
after_failure:

before_install: ci/install-dependencies.sh
before_script: ci/run-build.sh
script: ci/run-tests.sh
script: ci/run-build-and-tests.sh
after_failure: ci/print-test-failures.sh

notifications:
Expand Down
5 changes: 5 additions & 0 deletions Documentation/CodingGuidelines
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,11 @@ For C programs:
- Use Git's gettext wrappers to make the user interface
translatable. See "Marking strings for translation" in po/README.

- Variables and functions local to a given source file should be marked
with "static". Variables that are visible to other source files
must be declared with "extern" in header files. However, function
declarations should not use "extern", as that is already the default.

For Perl programs:

- Most of the C guidelines above apply.
Expand Down
30 changes: 30 additions & 0 deletions Documentation/RelNotes/2.16.2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Git v2.16.2 Release Notes
=========================

Fixes since v2.16.1
-------------------

* An old regression in "git describe --all $annotated_tag^0" has been
fixed.

* "git svn dcommit" did not take into account the fact that a
svn+ssh:// URL with a username@ (typically used for pushing) refers
to the same SVN repository without the username@ and failed when
svn.pushmergeinfo option is set.

* "git merge -Xours/-Xtheirs" learned to use our/their version when
resolving a conflicting updates to a symbolic link.

* "git clone $there $here" is allowed even when here directory exists
as long as it is an empty directory, but the command incorrectly
removed it upon a failure of the operation.

* "git stash -- <pathspec>" incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.

* "git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.


Also contains various documentation updates and code clean-ups.
49 changes: 49 additions & 0 deletions Documentation/RelNotes/2.16.3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Git v2.16.3 Release Notes
=========================

Fixes since v2.16.2
-------------------

* "git status" after moving a path in the working tree (hence making
it appear "removed") and then adding with the -N option (hence
making that appear "added") detected it as a rename, but did not
report the old and new pathnames correctly.

* "git commit --fixup" did not allow "-m<message>" option to be used
at the same time; allow it to annotate resulting commit with more
text.

* When resetting the working tree files recursively, the working tree
of submodules are now also reset to match.

* Fix for a commented-out code to adjust it to a rather old API change
around object ID.

* When there are too many changed paths, "git diff" showed a warning
message but in the middle of a line.

* The http tracing code, often used to debug connection issues,
learned to redact potentially sensitive information from its output
so that it can be more safely sharable.

* Crash fix for a corner case where an error codepath tried to unlock
what it did not acquire lock on.

* The split-index mode had a few corner case bugs fixed.

* Assorted fixes to "git daemon".

* Completion of "git merge -s<strategy>" (in contrib/) did not work
well in non-C locale.

* Workaround for segfault with more recent versions of SVN.

* Recently introduced leaks in fsck have been plugged.

* Travis CI integration now builds the executable in 'script' phase
to follow the established practice, rather than during
'before_script' phase. This allows the CI categorize the failures
better ('failed' is project's fault, 'errored' is build
environment's).

Also contains various documentation updates and code clean-ups.
Loading