mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 20:28:13 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
65,954 Commits 6 Branches 956 Tags 349 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
f3117dfdd1
Go to file
Glen Choo f3117dfdd1 t5526: introduce test helper to assert on fetches 
Tests in t/t5526-fetch-submodules.sh are unnecessarily noisy:

* The tests have extra logic in order to reproduce the expected stderr
  literally, but not all of these details (e.g. the head of the
  remote-tracking branch before the fetch) are relevant to the test.

* The expect.err file is constructed by the add_upstream_commit() helper
  as input into test_cmp, but most tests fetch a different combination
  of repos from expect.err. This results in noisy tests that modify
  parts of that expect.err to generate the expected output.

To address both of these issues, introduce a verify_fetch_result()
helper to t/t5526-fetch-submodules.sh that asserts on the output of "git
fetch --recurse-submodules" and handles the ordering of expect.err.

As a result, the tests no longer construct expect.err manually. Tests
still consider the old head of the remote-tracking branch ("$head1"),
but that will be fixed in a later commit.

Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-03-07 16:51:02 -08:00
.github Merge branch 'ab/ci-updates' 2021-12-15 09:39:49 -08:00
block-sha1
builtin Merge branch 'ah/log-no-graph' 2022-02-23 16:58:03 -08:00
ci compat: auto-detect if zlib has uncompress2() 2022-01-26 09:05:55 -08:00
compat Merge branch 'ab/auto-detect-zlib-compress2' 2022-02-16 15:14:30 -08:00
contrib Merge branch 'ab/complete-show-all-commands' 2022-02-17 16:25:06 -08:00
Documentation The seventh batch 2022-02-23 16:58:13 -08:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl perl Git.pm: don't ignore signalled failure in _cmd_close() 2022-02-01 15:21:19 -08:00
po l10n: Update Catalan translation 2022-01-23 09:40:52 +01:00
ppc
refs Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs' 2022-02-18 13:53:27 -08:00
reftable Merge branch 'ab/auto-detect-zlib-compress2' 2022-02-16 15:14:30 -08:00
sha1collisiondetection@855827c583
sha1dc
sha256
t t5526: introduce test helper to assert on fetches 2022-03-07 16:51:02 -08:00
templates
trace2 Merge branch 'ab/run-command' 2021-12-15 09:39:47 -08:00
xdiff Merge branch 'pw/xdiff-classify-record-in-histogram' 2021-12-21 15:03:14 -08:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore hook: add 'run' subcommand 2022-01-07 15:19:34 -08:00
.gitmodules
.mailmap mailmap: change primary address for Derrick Stolee 2022-02-14 13:27:31 -08:00
.tsan-suppressions
abspath.c
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c Merge branch 'pw/add-p-hunk-split-fix' 2022-02-09 14:20:59 -08:00
advice.c branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
advice.h branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'en/remerge-diff' 2022-02-16 15:14:29 -08:00
apply.h Merge branch 'rs/apply-symlinks-use-strset' 2022-02-05 09:42:30 -08:00
archive-tar.c
archive-zip.c
archive.c i18n: factorize "--foo requires --bar" and the like 2022-01-05 13:31:00 -08:00
archive.h
attr.c
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c git-rev-list: add --exclude-first-parent-only flag 2022-01-12 11:08:42 -08:00
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c Merge branch 'gc/branch-recurse-submodules' 2022-02-18 13:53:29 -08:00
branch.h branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
builtin.h hook: add 'run' subcommand 2022-01-07 15:19:34 -08:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'ab/auto-detect-zlib-compress2' 2022-02-16 15:14:30 -08:00
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
CODE_OF_CONDUCT.md
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt hook: add 'run' subcommand 2022-01-07 15:19:34 -08:00
commit-graph.c
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ab/config-based-hooks-2' 2022-02-09 14:21:00 -08:00
commit.h receive-pack.c: consolidate find header logic 2022-01-06 13:17:20 -08:00
common-main.c Merge branch 'en/keep-cwd' 2022-01-05 14:01:28 -08:00
config.c Merge branch 'jt/conditional-config-on-remote-url' 2022-02-09 14:20:59 -08:00
config.h config: include file if remote URL matches a glob 2022-01-18 13:55:53 -08:00
config.mak.dev Makefile: FreeBSD cannot do C99-or-below build 2022-01-18 12:16:23 -08:00
config.mak.in
config.mak.uname Merge branch 'ab/auto-detect-zlib-compress2' 2022-02-16 15:14:30 -08:00
configure.ac compat: auto-detect if zlib has uncompress2() 2022-01-26 09:05:55 -08:00
connect.c ls-remote & transport API: release "struct transport_ls_refs_options" 2022-02-06 18:02:34 -08:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'rs/daemon-plug-leak' 2022-01-05 14:01:31 -08:00
date.c
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-merges.c diff-merges: avoid history simplifications when diffing merges 2022-02-02 10:02:28 -08:00
diff-merges.h
diff-no-index.c
diff.c Merge branch 'js/diff-filter-negation-fix' 2022-02-16 15:14:30 -08:00
diff.h Merge branch 'js/diff-filter-negation-fix' 2022-02-16 15:14:30 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'ds/sparse-checkout-malformed-pattern-fix' 2022-01-10 11:52:49 -08:00
dir.h
editor.c
entry.c
entry.h
environment.c Merge branch 'ns/tmp-objdir' 2022-01-03 16:24:15 -08:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c repo-settings: rename the traditional default fetch.negotiationAlgorithm 2022-02-02 09:36:17 -08:00
fetch-negotiator.h
fetch-pack.c Merge branch 'ps/fetch-optim-with-commit-graph' 2022-02-23 16:58:03 -08:00
fetch-pack.h
fmt-merge-msg.c Merge branch 'fs/ssh-signing-key-lifetime' 2022-01-12 15:11:41 -08:00
fmt-merge-msg.h merge: allow to pretend a merge is made into a different branch 2021-12-20 14:55:02 -08:00
fsck.c
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'ab/auto-detect-zlib-compress2' 2022-02-16 15:14:30 -08:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py Merge branch 'ab/config-based-hooks-2' 2022-02-09 14:21:00 -08:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl send-email: use 'git hook run' for 'sendemail-validate' 2022-01-07 15:19:35 -08:00
git-sh-i18n.sh
git-sh-setup.sh git-sh-setup: remove remnant bits referring to git-legacy-stash 2022-01-27 18:00:09 -08:00
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Git 2.35.1 2022-01-28 16:48:42 -08:00
git-web--browse.sh
git.c Merge branch 'ab/config-based-hooks-2' 2022-02-09 14:21:00 -08:00
git.rc
gpg-interface.c gpg-interface: trim CR from ssh-keygen 2022-01-07 13:42:49 -08:00
gpg-interface.h
graph.c log: fix memory leak if --graph is passed multiple times 2022-02-11 10:06:40 -08:00
graph.h log: fix memory leak if --graph is passed multiple times 2022-02-11 10:06:40 -08:00
grep.c Merge branch 'rs/grep-expr-cleanup' 2022-02-05 09:42:30 -08:00
grep.h log: let --invert-grep only invert --grep 2021-12-17 14:13:08 -08:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c help: make auto-correction prompt more consistent 2021-12-16 13:49:39 -08:00
help.h
hex.c
hook.c hooks: convert worktree 'post-checkout' hook to hook library 2022-01-07 15:19:34 -08:00
hook.h hooks: convert worktree 'post-checkout' hook to hook library 2022-01-07 15:19:34 -08:00
http-backend.c Merge branch 'ab/usage-die-message' 2022-01-10 11:52:53 -08:00
http-fetch.c i18n: factorize "--foo requires --bar" and the like 2022-01-05 13:31:00 -08:00
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
INSTALL
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
ll-merge.h ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
lockfile.c
lockfile.h
log-tree.c show, log: include conflict/warning messages in --remerge-diff headers 2022-02-02 10:02:28 -08:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'ab/auto-detect-zlib-compress2' 2022-02-16 15:14:30 -08:00
match-trees.c
mem-pool.c mem-pool: don't assume uintmax_t is aligned enough for all types 2022-01-24 10:26:40 -08:00
mem-pool.h
merge-blobs.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'en/remerge-diff' 2022-02-16 15:14:29 -08:00
merge-ort.h show, log: include conflict/warning messages in --remerge-diff headers 2022-02-02 10:02:28 -08:00
merge-recursive.c merge-ort: format messages slightly different for use in headers 2022-02-02 10:02:27 -08:00
merge-recursive.h merge-ort: format messages slightly different for use in headers 2022-02-02 10:02:27 -08:00
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'tb/midx-no-bitmap-for-no-objects' 2022-02-18 13:53:30 -08:00
midx.h midx: read RIDX chunk when present 2022-01-27 12:07:53 -08:00
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file.c Merge branch 'ns/tmp-objdir' 2022-01-03 16:24:15 -08:00
object-name.c cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters) 2021-12-30 13:05:29 -08:00
object-store.h Merge branch 'ns/tmp-objdir' 2022-01-03 16:24:15 -08:00
object.c Merge branch 'ns/tmp-objdir' 2022-01-03 16:24:15 -08:00
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c pack-bitmap.c: gracefully fallback after opening pack/MIDX 2022-01-27 12:07:53 -08:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c midx: read RIDX chunk when present 2022-01-27 12:07:53 -08:00
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'jt/pack-header-lshift-overflow' 2022-01-12 15:11:41 -08:00
packfile.h Merge branch 'tb/pack-revindex-on-disk-cleanup' 2021-12-15 09:39:50 -08:00
pager.c
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c branch: add flags and config to inherit tracking 2021-12-20 22:40:21 -08:00
parse-options.c Merge branch 'ab/cat-file' 2022-02-05 09:42:31 -08:00
parse-options.h Merge branch 'rs/parse-options-lithelp-help' 2022-02-11 16:55:58 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'es/pretty-describe-more' 2021-12-15 09:39:48 -08:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c i18n: refactor "foo and bar are mutually exclusive" 2022-01-05 13:29:23 -08:00
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'vd/sparse-clean-etc' 2022-02-17 16:25:05 -08:00
README.md Merge branch 'po/readme-mention-contributor-hints' 2022-02-09 14:20:59 -08:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom" 2022-01-05 13:31:00 -08:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs' 2022-02-18 13:53:27 -08:00
refs.h Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs' 2022-02-18 13:53:27 -08:00
refspec.c
refspec.h
RelNotes Name the next one 2.36 to prepare for 2.35.1 2022-01-28 16:57:10 -08:00
remote-curl.c
remote.c refs API: remove "failure_errno" from refs_resolve_ref_unsafe() 2022-01-26 15:58:41 -08:00
remote.h
replace-object.c
replace-object.h
repo-settings.c Merge branch 'en/fetch-negotiation-default-fix' 2022-02-16 15:14:30 -08:00
repository.c Merge branch 'ns/tmp-objdir' 2022-01-03 16:24:15 -08:00
repository.h Merge branch 'en/fetch-negotiation-default-fix' 2022-02-16 15:14:30 -08:00
rerere.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
rerere.h
reset.c Merge branch 'pw/use-in-process-checkout-in-rebase' 2022-02-18 13:53:27 -08:00
reset.h rebase --apply: set ORIG_HEAD correctly 2022-01-26 12:08:53 -08:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ah/log-no-graph' 2022-02-23 16:58:03 -08:00
revision.h Merge branch 'ah/log-no-graph' 2022-02-23 16:58:03 -08:00
run-command.c Merge branch 'ab/config-based-hooks-2' 2022-02-09 14:21:00 -08:00
run-command.h run-command: remove old run_hook_{le,ve}() hook API 2022-01-07 15:19:35 -08:00
SECURITY.md
send-pack.c
send-pack.h
sequencer.c Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs' 2022-02-18 13:53:27 -08:00
sequencer.h create_autostash(): remove unneeded parameter 2022-01-26 12:08:53 -08:00
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c git-rev-list: add --exclude-first-parent-only flag 2022-01-12 11:08:42 -08:00
shallow.h
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c sparse-index: sparse index is disallowed when split index is active 2022-01-23 17:06:05 -08:00
sparse-index.h
split-index.c split-index: it really is incompatible with the sparse index 2022-01-23 17:06:23 -08:00
split-index.h
stable-qsort.c stable-qsort: avoid using potentially unaligned access 2022-01-07 15:48:40 -08:00
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
submodule-config.h branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
submodule.c branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
submodule.h branch: add --recurse-submodules option for branch creation 2022-02-04 08:16:39 -08:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c log: clean unneeded objects during log --remerge-diff 2022-02-02 10:02:27 -08:00
tmp-objdir.h log: clean unneeded objects during log --remerge-diff 2022-02-02 10:02:27 -08:00
trace2.c
trace2.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c ls-remote & transport API: release "struct transport_ls_refs_options" 2022-02-06 18:02:34 -08:00
transport.h ls-remote & transport API: release "struct transport_ls_refs_options" 2022-02-06 18:02:34 -08:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'en/keep-cwd' 2022-01-05 14:01:28 -08:00
unpack-trees.h
upload-pack.c upload-pack.c: increase output buffer size 2021-12-15 11:51:18 -08:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c refs API: remove "failure_errno" from refs_resolve_ref_unsafe() 2022-01-26 15:58:41 -08:00
worktree.h
wrap-for-bin.sh
wrapper.c wrapper: use a CSPRNG to generate random file names 2022-01-17 14:17:51 -08:00
write-or-die.c Merge branch 'ew/test-wo-fsync' 2021-12-15 09:39:52 -08:00
ws.c
wt-status.c Merge branch 'xw/am-empty' 2022-01-05 14:01:28 -08:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks