Skip to content

[FOR TESTS ONLY] Check sparse-checkou with en/clean-nested-with-ignored #341

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1979 commits
Select commit Hold shift + click to select a range
d37dc23
url: do not allow %00 to represent NUL in URLs
matvore Jun 4, 2019
fc7e03a
clang-format: use git grep to generate the ForEachMacros list
ojeda Jun 3, 2019
922a0a7
l10n: es: 2.22.0 round 3
Jun 4, 2019
488ed58
Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-po
jiangxin Jun 5, 2019
914bd09
Merge branch '2.22' of https://github.com/ChrisADR/git-po
jiangxin Jun 5, 2019
d46c551
l10n: zh_CN: for git v2.22.0 l10n round 1~3
jiangxin Apr 16, 2019
5b53363
l10n: zh_CN: Revision for git v2.22.0 l10n
fangyi-zhou Jun 2, 2019
de2b054
l10n: bg.po: Updated Bulgarian translation (4581t)
alshopov Jun 5, 2019
481de8a
merge-recursive: restore accidentally dropped setting of path
newren Jun 4, 2019
d314d77
l10n: TEAMS: Change German translation team leader
ruester Jun 1, 2019
8c18948
l10n: de.po: improve description of 'git reset --quiet'
ralfth Feb 28, 2019
219829a
l10n: de.po: Update German translation
ruester Jun 1, 2019
01991ce
config/alias.txt: change " and ' to `
Denton-L Jun 5, 2019
459842e
config/alias.txt: document alias accepting non-command first word
Denton-L Jun 5, 2019
20fbf7d
Merge branch 'en/merge-directory-renames-fix'
gitster Jun 6, 2019
82eb147
l10n: fr.po: Review French translation
cmalard Jun 5, 2019
d014920
Merge branch 'master' of git://github.com/alshopov/git-po
jiangxin Jun 7, 2019
0cdb8d2
Merge branch 'fr_review' of git://github.com/jnavila/git
jiangxin Jun 7, 2019
6ee1eac
Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po
gitster Jun 7, 2019
b697d92
Git 2.22
gitster Jun 7, 2019
5718c53
t5616: use correct flag to check object is missing
jonathantanmy Jun 11, 2019
810e193
t5616: cover case of client having delta base
jonathantanmy Jun 11, 2019
6970252
completion: do not cache if --git-completion-helper fails
pclouds Jun 12, 2019
e103f72
commit-graph: return with errors during write
derrickstolee Jun 12, 2019
5af8039
commit-graph: collapse parameters into flags
derrickstolee Jun 12, 2019
10bd0be
commit-graph: remove Future Work section
derrickstolee Jun 12, 2019
c9905be
commit-graph: create write_commit_graph_context
derrickstolee Jun 12, 2019
ef5b83f
commit-graph: extract fill_oids_from_packs()
derrickstolee Jun 12, 2019
4c9efe8
commit-graph: extract fill_oids_from_commit_hex()
derrickstolee Jun 12, 2019
b2c8306
commit-graph: extract fill_oids_from_all_packs()
derrickstolee Jun 12, 2019
014e344
commit-graph: extract count_distinct_commits()
derrickstolee Jun 12, 2019
f998d54
commit-graph: extract copy_oids_to_commits()
derrickstolee Jun 12, 2019
238def5
commit-graph: extract write_commit_graph_file()
derrickstolee Jun 12, 2019
c3a3a96
commit-graph: use raw_object_store when closing
derrickstolee May 17, 2019
5472c32
packfile: close commit-graph in close_all_packs
derrickstolee May 17, 2019
2d511cf
packfile: rename close_all_packs to close_object_store
derrickstolee May 17, 2019
8d4679f
poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
dscho Jun 13, 2019
08e0450
kwset: allow building with GCC 8
dscho Jun 13, 2019
4fa42df
winansi: simplify loading the GetCurrentConsoleFontEx() function
dscho Jun 13, 2019
9dae4fe
config: avoid calling `labs()` on too-large data type
dscho Jun 13, 2019
2bd69b9
add -p: fix checkout -p with pathological context
phillipwood Jun 12, 2019
568a05c
cleanup: fix possible overflow errors in binary search, part 2
rscharfe Jun 13, 2019
86d2271
Merge branch 'ab/send-email-transferencoding-fix'
gitster Jun 13, 2019
cf3269f
Merge branch 'nd/init-relative-template-fix'
gitster Jun 13, 2019
8202d12
Merge branch 'sb/format-patch-base-patch-id-fix'
gitster Jun 13, 2019
c0e78f7
Merge branch 'jk/unused-params-final-batch'
gitster Jun 13, 2019
66dc7b6
Merge branch 'en/fast-export-encoding'
gitster Jun 13, 2019
0d107b1
Merge branch 'nd/worktree-name-sanitization'
gitster Jun 13, 2019
ed7f8ac
Merge branch 'js/rebase-cleanup'
gitster Jun 13, 2019
000bce0
Merge branch 'nd/corrupt-worktrees'
gitster Jun 13, 2019
89d1b57
Merge branch 'ab/fail-prereqs-in-test'
gitster Jun 13, 2019
c4a38d1
Merge branch 'nd/merge-quit'
gitster Jun 13, 2019
e91f65d
Merge branch 'dl/format-patch-notes-config'
gitster Jun 13, 2019
8d32d25
Merge branch 'jk/help-unknown-ref-fix'
gitster Jun 13, 2019
813a3a2
Merge branch 'ew/update-server-info'
gitster Jun 13, 2019
2a983b2
Merge branch 'mh/import-transport-fd-fix'
gitster Jun 13, 2019
51d6c0f
Merge branch 'ab/deprecate-R-for-dynpath'
gitster Jun 13, 2019
c510261
Merge branch 'pw/rebase-edit-message-for-replayed-merge'
gitster Jun 13, 2019
0aae918
The first batch after 2.22
gitster Jun 13, 2019
cc8d872
t3404: fix a typo
dscho Jun 14, 2019
5d5c46b
Merge branch 'ds/object-info-for-prefetch-fix'
gitster Jun 17, 2019
7df94cd
Merge branch 'es/git-debugger-doc'
gitster Jun 17, 2019
ac97dc4
Merge branch 'es/grep-require-name-when-needed'
gitster Jun 17, 2019
63b6b4b
Merge branch 'ew/server-info-remove-crufts'
gitster Jun 17, 2019
86d8730
Merge branch 'jk/HEAD-symref-in-xfer-namespaces'
gitster Jun 17, 2019
9b3897a
Merge branch 'jk/am-i-resolved-fix'
gitster Jun 17, 2019
5b476dc
Merge branch 'js/bisect-helper-check-get-oid-return-value'
gitster Jun 17, 2019
3a54d80
Merge branch 'js/bundle-verify-require-object-store'
gitster Jun 17, 2019
6e0b1c6
Merge branch 'vv/merge-squash-with-explicit-commit'
gitster Jun 17, 2019
9476094
Merge branch 'ba/clone-remote-submodules'
gitster Jun 17, 2019
2f47531
Merge branch 'bl/userdiff-octave'
gitster Jun 17, 2019
bdc81d1
Merge branch 'ds/topo-traversal-using-commit-graph'
gitster Jun 17, 2019
a3e6b42
Merge branch 'js/fsmonitor-unflake'
gitster Jun 17, 2019
e7ef93b
Merge branch 'sw/git-p4-unshelve-branched-files'
gitster Jun 17, 2019
3dc47c4
Merge branch 'bb/unicode-12.1-reiwa'
gitster Jun 17, 2019
55b34f3
Merge branch 'es/first-contrib-tutorial'
gitster Jun 17, 2019
d4fdeed
Merge branch 'po/git-help-on-git-itself'
gitster Jun 17, 2019
add59c4
Merge branch 'mm/p4-unshelve-windows-fix'
gitster Jun 17, 2019
dedc046
Merge branch 'pb/request-pull-verify-remote-ref'
gitster Jun 17, 2019
14f49b2
Merge branch 'xl/record-partial-clone-origin'
gitster Jun 17, 2019
a6a95cd
The second batch
gitster Jun 17, 2019
5d137fc
fsmonitor: avoid signed integer overflow / infinite loop
carenas Jun 15, 2019
177fbab
coccinelle: use COPY_ARRAY for copying arrays
rscharfe Jun 15, 2019
921d49b
use COPY_ARRAY for copying arrays
rscharfe Jun 15, 2019
29c83fc
interpret-trailers: load default config
peff Jun 19, 2019
729a9b5
wrapper: avoid undefined behaviour in macOS
carenas Jun 16, 2019
96728b2
verify-tag: drop signal.h include
peff Jun 18, 2019
7a06fb0
wt-status.h: drop stdio.h include
peff Jun 18, 2019
63b50c8
stash: fix show referencing stash index
tgummerer Jun 15, 2019
bdbdf42
delta-islands: respect progress flag
peff Jun 20, 2019
a41dad4
Merge branch 'ml/userdiff-rust'
gitster Jun 21, 2019
8867aa8
Merge branch 'jt/partial-clone-missing-ref-delta-base'
gitster Jun 21, 2019
34032c4
Merge branch 'md/list-objects-filter-memfix'
gitster Jun 21, 2019
ca02d36
Merge branch 'md/list-objects-filter-parse-msgfix'
gitster Jun 21, 2019
88542ef
Merge branch 'cm/send-email-document-req-modules'
gitster Jun 21, 2019
755793b
Merge branch 'ab/hash-object-doc'
gitster Jun 21, 2019
e694ea5
Merge branch 'an/ignore-doc-update'
gitster Jun 21, 2019
f9089e8
Merge branch 'md/url-parse-harden'
gitster Jun 21, 2019
90d79d7
Merge branch 'mo/clang-format-for-each-update'
gitster Jun 21, 2019
8dca754
The third batch
gitster Jun 21, 2019
ed33bd8
t0001: fix on case-insensitive filesystems
dscho Jun 24, 2019
3fb72c7
config: use unsigned_mult_overflows to check for overflows
rscharfe Jun 22, 2019
664178e
config: don't multiply in parse_unit_factor()
rscharfe Jun 22, 2019
39c575c
config: simplify parsing of unit factors
rscharfe Jun 22, 2019
dfa880e
doc: don't use git.kernel.org as example gitweb URL
jwilk Jun 22, 2019
c9749b3
t3404: modernize here doc style
szeder Jun 24, 2019
077b979
t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
szeder Jun 24, 2019
cd1096b
pager: add a helper function to clear the last line in the terminal
szeder Jun 24, 2019
30db18b
submodule foreach: fix recursion of options
Jun 24, 2019
e532a90
t5551: use 'test_i18ngrep' to check translated output
szeder Jun 24, 2019
8d45ad8
t5551: test usage of chunked encoding explicitly
jonathantanmy Jun 5, 2019
d7d9088
rebase: fix garbled progress display with '-x'
szeder Jun 27, 2019
5b12e31
progress: use term_clear_line()
szeder Jun 24, 2019
9430147
list-objects-filter: encapsulate filter components
matvore Jun 27, 2019
7a7c7f4
list-objects-filter: put omits set in filter struct
matvore Jun 27, 2019
842b005
list-objects-filter-options: always supply *errbuf
matvore Jun 27, 2019
e987df5
list-objects-filter: implement composite filters
matvore Jun 27, 2019
f56f764
list-objects-filter-options: move error check up
matvore Jun 27, 2019
cf9ceb5
list-objects-filter-options: make filter_spec a string_list
matvore Jun 27, 2019
c269495
strbuf: give URL-encoding API a char predicate fn
matvore Jun 27, 2019
489fc9e
list-objects-filter-options: allow mult. --filter
matvore Jun 27, 2019
5a133e8
list-objects-filter-options: clean up use of ALLOC_GROW
matvore Jun 27, 2019
90d21f9
list-objects-filter-options: make parser void
matvore Jun 27, 2019
906b639
rebase --am: ignore rebase.rescheduleFailedExec
dscho Jul 1, 2019
1a64e07
Document that 'git -C ""' works and doesn't change directory
szeder Jun 29, 2019
3711d1c
docs: git-clone: refer to long form of options
qnerden Jul 2, 2019
bfc8c84
docs: git-clone: list short form of options first
qnerden Jul 2, 2019
f2f4715
ci: don't update Homebrew
szeder Jul 3, 2019
af8ed04
ci: disable Homebrew's auto cleanup
szeder Jul 3, 2019
37a2e35
ci/lib.sh: update a comment about installed P4 and Git-LFS versions
szeder Jul 6, 2019
24df0d4
trace2: correct trace2 field name documentation
steadmon Jul 9, 2019
3aef54e
diff: munmap() file contents before running external diff
dscho Jul 11, 2019
3bca1e7
transport-helper: enforce atomic in push_refs_with_push
nasamuffin Jul 11, 2019
f7bf24d
gpg(docs): use correct --verify syntax
rtmorgan Jul 12, 2019
02638d1
read-cache.c: do not die if mmap fails
varuncnaik Jul 14, 2019
64c45dc
gpg-interface: do not scan past the end of buffer
Jul 16, 2019
eb7c786
mingw: support spawning programs containing spaces in their names
dscho Jul 16, 2019
2581ea3
transport-helper: avoid var decl in for () loop control
gitster Jul 16, 2019
b2b1f61
rm: resolving by removal is not a warning-worthy event
gitster Jul 17, 2019
7926cee
README: fix rendering of text in angle brackets
dilijev Jul 18, 2019
cc0c429
CodingGuidelines: spell out post-C89 rules
gitster Jul 16, 2019
b09364c
clean: show an error message when the path is too long
dscho Jul 18, 2019
b777f3f
xdiff: clamp function context indices in post-image
peff Jul 23, 2019
35d7715
Merge branch 'nd/init-relative-template-fix' into maint
gitster Jul 25, 2019
933f294
Merge branch 'nd/corrupt-worktrees' into maint
gitster Jul 25, 2019
dae2954
Merge branch 'mh/import-transport-fd-fix' into maint
gitster Jul 25, 2019
90891c6
Merge branch 'ds/object-info-for-prefetch-fix' into maint
gitster Jul 25, 2019
518e874
Merge branch 'es/grep-require-name-when-needed' into maint
gitster Jul 25, 2019
776d668
Merge branch 'ew/server-info-remove-crufts' into maint
gitster Jul 25, 2019
5ca0db3
Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maint
gitster Jul 25, 2019
5bbbd57
Merge branch 'jk/am-i-resolved-fix' into maint
gitster Jul 25, 2019
abbd504
Merge branch 'js/bundle-verify-require-object-store' into maint
gitster Jul 25, 2019
33f2790
Merge branch 'vv/merge-squash-with-explicit-commit' into maint
gitster Jul 25, 2019
10432cc
Merge branch 'js/fsmonitor-unflake' into maint
gitster Jul 25, 2019
7a779ca
Merge branch 'bb/unicode-12.1-reiwa' into maint
gitster Jul 25, 2019
0eb2774
Merge branch 'mm/p4-unshelve-windows-fix' into maint
gitster Jul 25, 2019
58f3484
Merge branch 'pb/request-pull-verify-remote-ref' into maint
gitster Jul 25, 2019
9db52cf
Merge branch 'xl/record-partial-clone-origin' into maint
gitster Jul 25, 2019
f54a2a8
Merge branch 'jt/partial-clone-missing-ref-delta-base' into maint
gitster Jul 25, 2019
43f40de
Merge branch 'md/list-objects-filter-memfix' into maint
gitster Jul 25, 2019
167d02a
Merge branch 'an/ignore-doc-update' into maint
gitster Jul 25, 2019
d7267d5
Merge branch 'md/url-parse-harden' into maint
gitster Jul 25, 2019
27e4131
Merge branch 'mo/clang-format-for-each-update' into maint
gitster Jul 25, 2019
24c161d
Merge branch 'es/git-debugger-doc' into maint
gitster Jul 25, 2019
2c30e34
Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint
gitster Jul 25, 2019
fe3ec21
Merge branch 'sw/git-p4-unshelve-branched-files' into maint
gitster Jul 25, 2019
4098130
Merge branch 'cm/send-email-document-req-modules' into maint
gitster Jul 25, 2019
352253a
Merge branch 'ab/hash-object-doc' into maint
gitster Jul 25, 2019
98e06de
Flush fixes up to the third batch post 2.22.0
gitster Jul 25, 2019
0d0e1e8
xdiff: drop system includes in xutils.c
carenas Jul 28, 2019
29a0f90
xdiff: remove duplicate headers from xhistogram.c
carenas Jul 28, 2019
81ed2b4
xdiff: remove duplicate headers from xpatience.c
carenas Jul 28, 2019
d61e6ce
Documentation/git-fsck.txt: include fsck.* config variables
szeder Jul 29, 2019
9147e5a
Merge branch 'js/gcc-8-and-9' into maint
gitster Jul 29, 2019
58f6cfd
Merge branch 'js/unmap-before-ext-diff' into maint
gitster Jul 29, 2019
2b31284
Merge branch 'rm/gpg-program-doc-fix' into maint
gitster Jul 29, 2019
9d98862
Merge branch 'vn/xmmap-gently' into maint
gitster Jul 29, 2019
c8823b4
Merge branch 'di/readme-markup-fix' into maint
gitster Jul 29, 2019
8926ea6
Merge branch 'js/trace2-signo-typofix' into maint
gitster Jul 29, 2019
3846f5c
Merge branch 'sg/ci-brew-gcc-workaround' into maint
gitster Jul 29, 2019
bcb30d7
Merge branch 'sg/git-C-empty-doc' into maint
gitster Jul 29, 2019
ca9eba8
Merge branch 'jt/t5551-test-chunked' into maint
gitster Jul 29, 2019
0a2e838
Merge branch 'sg/t5551-fetch-smart-error-is-translated' into maint
gitster Jul 29, 2019
63d9fa2
Merge branch 'jw/gitweb-sample-update' into maint
gitster Jul 29, 2019
dc55e3e
Merge branch 'js/t0001-case-insensitive' into maint
gitster Jul 29, 2019
82ac2fb
Merge branch 'cb/mkstemps-uint-type-fix' into maint
gitster Jul 29, 2019
0726f13
Merge branch 'js/t3404-typofix' into maint
gitster Jul 29, 2019
90334a8
Merge branch 'rs/copy-array' into maint
gitster Jul 29, 2019
ea21965
Merge branch 'cb/fsmonitor-intfix' into maint
gitster Jul 29, 2019
747201d
Merge branch 'dl/config-alias-doc' into maint
gitster Jul 29, 2019
0c47e8d
Merge branch 'po/doc-branch' into maint
gitster Jul 29, 2019
1a27b78
Merge branch 'es/local-atomic-push-failure-with-http' into maint
gitster Jul 29, 2019
17952bd
Merge branch 'js/clean-report-too-long-a-path' into maint
gitster Jul 29, 2019
c5d81d7
Merge branch 'sr/gpg-interface-stop-at-the-end' into maint
gitster Jul 29, 2019
2f72ebf
Merge branch 'js/mingw-spawn-with-spaces-in-path' into maint
gitster Jul 29, 2019
9c65991
Merge branch 'jc/denoise-rm-to-resolve' into maint
gitster Jul 29, 2019
1cf76b7
Merge branch 'qn/clone-doc-use-long-form' into maint
gitster Jul 29, 2019
8eb5097
Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into …
gitster Jul 29, 2019
292a0de
Merge branch 'ms/submodule-foreach-fix' into maint
gitster Jul 29, 2019
3e06e74
Merge branch 'sg/rebase-progress' into maint
gitster Jul 29, 2019
e591501
Merge branch 'jk/delta-islands-progress-fix' into maint
gitster Jul 29, 2019
97cb523
Merge branch 'rs/config-unit-parsing' into maint
gitster Jul 29, 2019
39521d0
Merge branch 'nd/completion-no-cache-failure' into maint
gitster Jul 29, 2019
649cae6
Merge branch 'pw/rebase-abort-clean-rewritten' into maint
gitster Jul 29, 2019
05ed24d
Merge branch 'tg/stash-ref-by-index-fix' into maint
gitster Jul 29, 2019
0100103
Merge branch 'jk/trailers-use-config' into maint
gitster Jul 29, 2019
0324b6f
Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maint
gitster Jul 29, 2019
689204c
Merge branch 'pw/add-p-recount' into maint
gitster Jul 29, 2019
dea6737
Merge branch 'ds/close-object-store' into maint
gitster Jul 29, 2019
7011ce1
Merge branch 'fc/fetch-with-import-fix' into maint
gitster Jul 29, 2019
f91dbd8
Merge branch 'jc/post-c89-rules-doc' into maint
gitster Jul 29, 2019
1feeaaf
Merge fixes made on the 'master' front
gitster Jul 29, 2019
4d8ec15
RelNotes/2.21.1: typofix
Aug 1, 2019
ae76814
Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint
gitster Aug 9, 2019
5e864ac
Merge branch 'sg/fsck-config-in-doc' into maint
gitster Aug 9, 2019
414784d
Merge branch 'jk/no-system-includes-in-dot-c' into maint
gitster Aug 9, 2019
5d929ec
Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint
gitster Aug 9, 2019
3d246de
.mailmap: update email address of Philip Oakley
PhilipOakley Aug 11, 2019
75b2f01
Git 2.22.1
gitster Aug 9, 2019
502c386
t7300-clean: demonstrate deleting nested repo with an ignored file br…
szeder Aug 25, 2019
ab8db61
treewide: rename 'struct exclude' to 'struct path_pattern'
derrickstolee Sep 3, 2019
caa3d55
treewide: rename 'struct exclude_list' to 'struct pattern_list'
derrickstolee Sep 3, 2019
4ff89ee
treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
derrickstolee Sep 3, 2019
65edd96
treewide: rename 'exclude' methods to 'pattern'
derrickstolee Sep 3, 2019
468ce99
unpack-trees: rename 'is_excluded_from_list()'
derrickstolee Sep 3, 2019
7541cc5
t7300: add testcases showing failure to clean specified pathspecs
newren Sep 17, 2019
bbbb6b0
dir: fix typo in comment
newren Sep 17, 2019
a5e916c
dir: fix off-by-one error in match_pathspec_item
newren Sep 17, 2019
404ebce
dir: also check directories for matching pathspecs
newren Sep 17, 2019
a3d89d8
dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
newren Sep 17, 2019
89a1f4a
dir: if our pathspec might match files under a dir, recurse into it
newren Sep 17, 2019
29b577b
dir: add commentary explaining match_pathspec_item's return value
newren Sep 17, 2019
3aca580
git-clean.txt: do not claim we will delete files with -n/--dry-run
newren Sep 17, 2019
e86bbcf
clean: disambiguate the definition of -d
newren Sep 17, 2019
09487f2
clean: avoid removing untracked files in a nested git repository
newren Sep 17, 2019
ca8b539
clean: rewrap overly long line
newren Sep 17, 2019
902b90c
clean: fix theoretical path corruption
newren Sep 17, 2019
94d5342
sparse-checkout: create builtin with 'list' subcommand
derrickstolee Aug 18, 2019
b3b96db
sparse-checkout: create 'init' subcommand
derrickstolee Aug 18, 2019
0e78252
clone: add --sparse mode
derrickstolee Aug 18, 2019
75d611d
sparse-checkout: 'set' subcommand
derrickstolee Aug 19, 2019
8467b4b
sparse-checkout: add '--stdin' option to set subcommand
derrickstolee Sep 17, 2019
922db1e
sparse-checkout: create 'disable' subcommand
derrickstolee Aug 20, 2019
4580fdf
trace2: add region in clear_ce_flags
jeffhostetler Apr 30, 2019
291ba19
sparse-checkout: add 'cone' mode
derrickstolee Aug 19, 2019
d7bb328
sparse-checkout: use hashmaps for cone patterns
derrickstolee Aug 19, 2019
dcf5114
sparse-checkout: init and set in cone mode
derrickstolee Aug 20, 2019
18c0a42
unpack-trees: hash less in cone mode
derrickstolee Aug 22, 2019
76f1c3a
Merge remote-tracking branch 'junio/en/clean-nested-with-ignored' int…
derrickstolee Sep 18, 2019
fadcc77
TEST: check if dropping asterisks works
derrickstolee Sep 18, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 15 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,21 @@ SpacesInSquareBrackets: false
Cpp11BracedListStyle: false

# A list of macros that should be interpreted as foreach loops instead of as
# function calls.
ForEachMacros: ['for_each_string_list_item']
# function calls. Taken from:
# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' \
# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \
# | sort | uniq
ForEachMacros:
- 'for_each_abbrev'
- 'for_each_builtin'
- 'for_each_string_list_item'
- 'for_each_ut'
- 'for_each_wanted_builtin'
- 'list_for_each'
- 'list_for_each_dir'
- 'list_for_each_prev'
- 'list_for_each_prev_safe'
- 'list_for_each_safe'

# The maximum number of consecutive empty lines to keep.
MaxEmptyLinesToKeep: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Git community does not use github.com for their contributions. Instead, we use
a mailing list ([email protected]) for code submissions, code
reviews, and bug reports.

Nevertheless, you can use [submitGit](http://submitgit.herokuapp.com/) to
Nevertheless, you can use [GitGitGadget](https://gitgitgadget.github.io/) to
conveniently send your Pull Requests commits to our mailing list.

Please read ["A note from the maintainer"](https://git.kernel.org/pub/scm/git/git.git/plain/MaintNotes?h=todo)
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list ([email protected]) for code submissions, code reviews, and
bug reports. Nevertheless, you can use submitGit to conveniently send your Pull
Requests commits to our mailing list.
bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.

Please read the "guidelines for contributing" linked above!
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/fuzz-commit-graph
/fuzz_corpora
/fuzz-pack-headers
/fuzz-pack-idx
Expand Down Expand Up @@ -81,7 +82,7 @@
/git-init-db
/git-interpret-trailers
/git-instaweb
/git-legacy-rebase
/git-legacy-stash
/git-log
/git-ls-files
/git-ls-remote
Expand Down Expand Up @@ -121,10 +122,6 @@
/git-range-diff
/git-read-tree
/git-rebase
/git-rebase--am
/git-rebase--common
/git-rebase--interactive
/git-rebase--merge
/git-rebase--preserve-merges
/git-receive-pack
/git-reflog
Expand All @@ -135,7 +132,6 @@
/git-remote-ftps
/git-remote-fd
/git-remote-ext
/git-remote-testgit
/git-remote-testpy
/git-remote-testsvn
/git-repack
Expand All @@ -160,6 +156,7 @@
/git-show-branch
/git-show-index
/git-show-ref
/git-sparse-checkout
/git-stage
/git-stash
/git-status
Expand Down Expand Up @@ -229,3 +226,4 @@
*.pdb
/Debug/
/Release/
*.dSYM
4 changes: 4 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Ben Walton <[email protected]> <[email protected]>
Benoit Sigoure <[email protected]> <[email protected]>
Bernt Hansen <[email protected]> <[email protected]>
Brandon Casey <[email protected]> <[email protected]>
Brandon Williams <[email protected]> <[email protected]>
brian m. carlson <[email protected]>
brian m. carlson <[email protected]> <[email protected]>
Bryan Larsen <[email protected]> <[email protected]>
Expand All @@ -39,6 +40,8 @@ Cord Seele <[email protected]> <[email protected]>
Christian Couder <[email protected]> <[email protected]>
Christian Stimming <[email protected]> <[email protected]>
Christopher Díaz Riveros <[email protected]> Christopher Diaz Riveros
Clemens Buchacher <[email protected]> <[email protected]>
Clemens Buchacher <[email protected]> <[email protected]>
Csaba Henk <[email protected]> <[email protected]>
Dan Johnson <[email protected]>
Dana L. How <[email protected]> <[email protected]>
Expand Down Expand Up @@ -207,6 +210,7 @@ Petr Baudis <[email protected]> <[email protected]>
Petr Baudis <[email protected]> <xpasky@machine>
Phil Hord <[email protected]> <[email protected]>
Philip Jägenstedt <[email protected]> <[email protected]>
Philip Oakley <[email protected]> <[email protected]> # secondary <[email protected]>
Philipp A. Hartmann <[email protected]> <[email protected]>
Philippe Bruhat <[email protected]>
Ralf Thielow <[email protected]> <[email protected]>
Expand Down
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ os:
- linux
- osx

osx_image: xcode10.1

compiler:
- clang
- gcc
Expand All @@ -19,16 +21,6 @@ matrix:
compiler:
addons:
before_install:
- env: jobname=Windows
os: linux
compiler:
addons:
before_install:
script:
- >
test "$TRAVIS_REPO_SLUG" != "git/git" ||
ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
after_failure:
- env: jobname=Linux32
os: linux
compiler:
Expand Down
2 changes: 2 additions & 0 deletions Documentation/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ mergetools-*.txt
manpage-base-url.xsl
SubmittingPatches.txt
tmp-doc-diff/
GIT-ASCIIDOCFLAGS
/GIT-EXCLUDED-PROGRAMS
39 changes: 34 additions & 5 deletions Documentation/CodingGuidelines
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,30 @@ For C programs:
by e.g. "echo DEVELOPER=1 >>config.mak".

- We try to support a wide range of C compilers to compile Git with,
including old ones. That means that you should not use C99
initializers, even if a lot of compilers grok it.
including old ones. You should not use features from newer C
standard, even if your compiler groks them.

- Variables have to be declared at the beginning of the block.
There are a few exceptions to this guideline:

. since early 2012 with e1327023ea, we have been using an enum
definition whose last element is followed by a comma. This, like
an array initializer that ends with a trailing comma, can be used
to reduce the patch noise when adding a new identifer at the end.

. since mid 2017 with cbc0f81d, we have been using designated
initializers for struct (e.g. "struct t v = { .val = 'a' };").

. since mid 2017 with 512f41cf, we have been using designated
initializers for array (e.g. "int array[10] = { [5] = 2 }").

These used to be forbidden, but we have not heard any breakage
report, and they are assumed to be safe.

- Variables have to be declared at the beginning of the block, before
the first statement (i.e. -Wdeclaration-after-statement).

- Declaring a variable in the for loop "for (int i = 0; i < 10; i++)"
is still not allowed in this codebase.

- NULL pointers shall be written as NULL, not as 0.

Expand Down Expand Up @@ -412,6 +432,12 @@ For C programs:
must be declared with "extern" in header files. However, function
declarations should not use "extern", as that is already the default.

- You can launch gdb around your program using the shorthand GIT_DEBUGGER.
Run `GIT_DEBUGGER=1 ./bin-wrappers/git foo` to simply use gdb as is, or
run `GIT_DEBUGGER="<debugger> <debugger-args>" ./bin-wrappers/git foo` to
use your own debugger and arguments. Example: `GIT_DEBUGGER="ddd --gdb"
./bin-wrappers/git log` (See `wrap-for-bin.sh`.)

For Perl programs:

- Most of the C guidelines above apply.
Expand Down Expand Up @@ -580,11 +606,14 @@ Writing Documentation:
or commands:

Literal examples (e.g. use of command-line options, command names,
branch names, configuration and environment variables) must be
typeset in monospace (i.e. wrapped with backticks):
branch names, URLs, pathnames (files and directories), configuration and
environment variables) must be typeset in monospace (i.e. wrapped with
backticks):
`--pretty=oneline`
`git rev-list`
`remote.pushDefault`
`http://git.example.com`
`.git/config`
`GIT_DIR`
`HEAD`

Expand Down
53 changes: 40 additions & 13 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ ARTICLES =
SP_ARTICLES =
OBSOLETE_HTML =

-include GIT-EXCLUDED-PROGRAMS

MAN1_TXT += $(filter-out \
$(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard git-*.txt))
MAN1_TXT += git.txt
MAN1_TXT += gitk.txt
MAN1_TXT += gitremote-helpers.txt
MAN1_TXT += gitweb.txt

MAN5_TXT += gitattributes.txt
Expand All @@ -30,20 +32,26 @@ MAN7_TXT += gitdiffcore.txt
MAN7_TXT += giteveryday.txt
MAN7_TXT += gitglossary.txt
MAN7_TXT += gitnamespaces.txt
MAN7_TXT += gitremote-helpers.txt
MAN7_TXT += gitrevisions.txt
MAN7_TXT += gitsubmodules.txt
MAN7_TXT += gittutorial-2.txt
MAN7_TXT += gittutorial.txt
MAN7_TXT += gitworkflows.txt

ifdef MAN_FILTER
MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
else
MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
MAN_FILTER = $(MAN_TXT)
endif

MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
GIT_MAN_REF = master

OBSOLETE_HTML += everyday.html
OBSOLETE_HTML += git-remote-helpers.html
DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML)

ARTICLES += howto-index
ARTICLES += git-tools
Expand All @@ -68,6 +76,7 @@ SP_ARTICLES += howto/maintain-git
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
SP_ARTICLES += $(API_DOCS)

TECH_DOCS += MyFirstContribution
TECH_DOCS += SubmittingPatches
TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
Expand All @@ -89,11 +98,13 @@ TECH_DOCS += technical/trivial-merge
SP_ARTICLES += $(TECH_DOCS)
SP_ARTICLES += technical/api-index

DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
ARTICLES_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
HTML_FILTER ?= $(ARTICLES_HTML) $(OBSOLETE_HTML)
DOC_HTML = $(MAN_HTML) $(filter $(HTML_FILTER),$(ARTICLES_HTML) $(OBSOLETE_HTML))

DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER),$(MAN1_TXT)))
DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))

prefix ?= $(HOME)
bindir ?= $(prefix)/bin
Expand Down Expand Up @@ -324,6 +335,15 @@ mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
date >$@

TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))

GIT-ASCIIDOCFLAGS: FORCE
@FLAGS='$(TRACK_ASCIIDOCFLAGS)'; \
if test x"$$FLAGS" != x"`cat GIT-ASCIIDOCFLAGS 2>/dev/null`" ; then \
echo >&2 " * new asciidoc flags"; \
echo "$$FLAGS" >GIT-ASCIIDOCFLAGS; \
fi

clean:
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
Expand All @@ -333,30 +353,31 @@ clean:
$(RM) SubmittingPatches.txt
$(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) manpage-base-url.xsl
$(RM) GIT-ASCIIDOCFLAGS

$(MAN_HTML): %.html : %.txt asciidoc.conf
$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_HTML) -d manpage -o $@+ $< && \
mv $@+ $@

$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_HTML) -o $@+ $< && \
mv $@+ $@

manpage-base-url.xsl: manpage-base-url.xsl.in
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@

%.1 %.5 %.7 : %.xml manpage-base-url.xsl
%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
$(QUIET_XMLTO)$(RM) $@ && \
$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<

%.xml : %.txt asciidoc.conf
%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_XML) -d manpage -o $@+ $< && \
mv $@+ $@

user-manual.xml: user-manual.txt user-manual.conf
user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
$(TXT_TO_XML) -d book -o $@+ $< && \
mv $@+ $@
Expand All @@ -366,7 +387,8 @@ technical/api-index.txt: technical/api-index-skel.txt \
$(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh

technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \
asciidoc.conf GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt

SubmittingPatches.txt: SubmittingPatches
Expand Down Expand Up @@ -423,7 +445,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
WEBDOC_DEST = /pub/software/scm/git/docs

howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
sed -e '1,/^$$/d' $< | \
$(TXT_TO_HTML) - >$@+ && \
Expand Down Expand Up @@ -457,4 +479,9 @@ print-man1:
lint-docs::
$(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl

ifeq ($(wildcard po/Makefile),po/Makefile)
doc-l10n install-l10n::
$(MAKE) -C po $@
endif

.PHONY: FORCE
Loading