1
0
mirror of https://github.com/git/git.git synced 2024-10-21 06:59:20 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Ævar Arnfjörð Bjarmason 5d22e18965 test-lib.sh: try to re-chmod & retry on failed trash removal
Try to re-chmod the trash directory on startup if we fail to "rm -rf"
it. This fixes problems where the test leaves the trash directory
behind in a bad permission state for whatever reason.

This fixes an interaction between [1] where t0004-unwritable.sh was
made to use "test_when_finished" for cleanup, and [2] which added the
"--immediate" mode. If a test in this file failed when running with
"--immediate" we wouldn't run the "test_when_finished" block, which
re-chmods the ".git/objects" directory (see [1]).

This can be demonstrated as e.g. (output snipped for less verbosity):

    $ ./t0004-unwritable.sh --run=3 --immediate
    ok 1 # skip setup (--run)
    ok 2 # skip write-tree should notice unwritable repository (--run)
    not ok 3 - commit should notice unwritable repository
    [...]
    $ ./t0004-unwritable.sh --run=3 --immediate
    rm: cannot remove '[...]/trash directory.t0004-unwritable/.git/objects/info': Permission denied
    FATAL: Cannot prepare test area
    [...]

Instead of some version of reverting [1] let's make the test-lib.sh
resilient to this edge-case, it will happen due to [1], but also
e.g. if the relevant "test-lib.sh" process is kill -9'd during the
test run. We should try harder to recover in this case. If we fail to
remove the test directory let's retry after (re-)chmod-ing it.

This doesn't need to be guarded by something that's equivalent to
"POSIXPERM" since if we don't support "chmod" we were about to fail
anyway.

Let's also discard any error output from (a possibly nonexisting)
"chmod", we'll fail on the subsequent "rm -rf" anyway, likewise for
the first "rm -rf" invocation, we don't want to get the "cannot
remove" output if we can get around it with the "chmod", but we do
want any error output from the second "rm -rf", in case that doesn't
fix the issue.

The lack of &&-chaining between the "chmod" and "rm -rf" is
intentional, if we fail the first "rm -rf", can't chmod, but then
succeed the second time around that's what we were hoping for. We just
want to nuke the directory, not carry forward every possible error
code or error message.

1. dbda967684d (t0004 (unwritable files): simplify error handling,
   2010-09-06)
2. b586744a864 (test: skip clean-up when running under --immediate
   mode, 2011-06-27)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-10-15 08:54:33 -07:00
.github Merge branch 'js/ci-check-whitespace-updates' 2021-08-02 14:06:40 -07:00
block-sha1
builtin Merge branch 'rs/use-fspathhash' 2021-08-04 13:28:54 -07:00
ci ci/install-dependencies: handle "sparse" job package installs 2021-07-26 15:20:51 -07:00
compat mingw: align symlinks-related rmdir() behavior with Linux 2021-08-02 15:10:58 -07:00
contrib Merge branch 'ab/attribute-format' 2021-07-28 13:17:59 -07:00
Documentation Git 2.33 2021-08-16 12:15:44 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl Merge branch 'ab/send-email-optim' 2021-07-22 13:05:54 -07:00
po l10n: sv.po: Update Swedish translation (5230t0f0u) 2021-08-16 06:54:20 +08:00
ppc
refs Merge branch 'hn/refs-debug-empty-prefix' 2021-07-28 13:18:04 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t test-lib.sh: try to re-chmod & retry on failed trash removal 2021-10-15 08:54:33 -07:00
templates
trace2
xdiff Merge branch 'ab/pickaxe-pcre2' 2021-07-13 16:52:50 -07:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
abspath.c
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
advice.c
advice.h advice.h: add missing __attribute__((format)) & fix usage 2021-07-13 15:20:20 -07:00
alias.c
alias.h
alloc.c
alloc.h
apply.c string-list.h users: change to use *_{nodup,dup}() 2021-07-01 12:32:22 -07:00
apply.h
archive-tar.c
archive-zip.c
archive.c string-list.h users: change to use *_{nodup,dup}() 2021-07-01 12:32:22 -07:00
archive.h
attr.c
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: remove "ref_list" in favor of string-list.c API 2021-07-06 12:10:17 -07:00
bundle.h bundle: remove "ref_list" in favor of string-list.c API 2021-07-06 12:10:17 -07:00
cache-tree.c Merge branch 'ds/commit-and-checkout-with-sparse-index' 2021-08-04 13:28:53 -07:00
cache-tree.h
cache.h Merge branch 'jt/bulk-prefetch' 2021-08-02 14:06:42 -07:00
cbtree.c oidtree: a crit-bit tree for odb_loose_cache 2021-07-07 21:28:04 -07:00
cbtree.h oidtree: avoid unaligned access to crit-bit tree 2021-08-15 13:13:50 -07:00
chdir-notify.c
chdir-notify.h
check_bindir
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 Merge branch 'ab/pickaxe-pcre2' 2021-07-13 16:52:50 -07:00
command-list.txt
commit-graph.c Merge branch 'ab/attribute-format' 2021-07-28 13:17:59 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ds/gender-neutral-doc' 2021-07-16 17:42:53 -07:00
commit.h
common-main.c
config.c Merge branch 'ds/gender-neutral-doc' 2021-07-16 17:42:53 -07:00
config.h Merge branch 'ds/gender-neutral-doc' 2021-07-16 17:42:53 -07:00
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'js/config-mak-windows-pcre-fix' 2021-07-16 17:42:47 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c convert: release strbuf to avoid leak 2021-07-26 12:19:20 -07:00
convert.h
copy.c
COPYING
credential.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
credential.h *.h: move some *_INIT to designated initializers 2021-07-01 12:31:45 -07:00
csum-file.c Merge branch 'tb/midx-use-checksum' 2021-07-16 17:42:46 -07:00
csum-file.h Merge branch 'tb/midx-use-checksum' 2021-07-16 17:42:46 -07:00
ctype.c
daemon.c
date.c comments: avoid using the gender of our users 2021-06-16 11:25:11 +09:00
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c diff-lib: handle index diffs with sparse dirs 2021-07-14 13:42:49 -07:00
diff-merges.c Revert 'diff-merges: let "-m" imply "-p"' 2021-08-09 13:52:01 -07:00
diff-merges.h
diff-no-index.c
diff.c Merge branch 'ab/pickaxe-pcre2' 2021-08-06 12:52:15 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'ah/plugleaks' 2021-08-04 13:28:52 -07:00
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c use fspathhash() everywhere 2021-07-30 12:14:27 -07:00
dir.h Merge branch 'ew/many-alternate-optim' 2021-07-28 13:17:57 -07:00
editor.c
entry.c string-list.h users: change to use *_{nodup,dup}() 2021-07-01 12:32:22 -07:00
entry.h
environment.c environment: move strbuf into block to plug leak 2021-07-26 12:19:20 -07:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c
fetch-pack.h
fmt-merge-msg.c fmt-merge-msg: free newly allocated temporary strings when done 2021-07-26 12:19:19 -07:00
fmt-merge-msg.h
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
gettext.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'ew/mmap-failures' 2021-07-16 17:42:47 -07:00
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 git-p4: fix failed submit by skip non-text data files 2021-06-28 09:49:30 -07:00
git-quiltimport.sh
git-rebase--preserve-merges.sh
git-request-pull.sh
git-send-email.perl Merge branch 'ab/send-email-optim' 2021-07-22 13:05:54 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh Merge branch 'ar/submodule-add' 2021-08-04 13:28:52 -07:00
git-svn.perl
GIT-VERSION-GEN Git 2.33 2021-08-16 12:15:44 -07:00
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c graph: improve grammar of "invalid color" error message 2021-06-15 12:54:26 +09:00
graph.h
grep.c Merge branch 'rs/grep-parser-fix' 2021-07-13 16:52:53 -07:00
grep.h
hash-lookup.c
hash-lookup.h
hash.h oidtree: avoid unaligned access to crit-bit tree 2021-08-15 13:13:50 -07:00
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c Merge branch 'ab/attribute-format' 2021-07-28 13:17:59 -07:00
INSTALL
iterator.h
json-writer.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
json-writer.h *.h: move some *_INIT to designated initializers 2021-07-01 12:31:45 -07:00
khash.h khash: clarify that allocations never fail 2021-07-06 13:07:50 -07:00
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 bitmaps: don't recurse into trees already in the bitmap 2021-06-15 11:13:11 +09:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c load_ref_decorations(): fix decoration with tags 2021-07-14 10:11:02 -07:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c Merge branch 'ar/mailinfo-memcmp-to-skip-prefix' 2021-07-08 13:15:03 -07:00
mailinfo.h
mailmap.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
mailmap.h
Makefile Merge branch 'ab/getcwd-test' 2021-08-04 13:28:55 -07:00
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'en/ort-perf-batch-14' 2021-08-04 13:28:54 -07:00
merge-ort.h
merge-recursive.c use fspathhash() everywhere 2021-07-30 12:14:27 -07:00
merge-recursive.h
merge.c dir.[ch]: replace dir_init() with DIR_INIT 2021-07-01 12:32:22 -07:00
mergesort.c
mergesort.h
midx.c Merge branch 'ab/attribute-format' 2021-07-28 13:17:59 -07:00
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file.c Merge branch 'cb/many-alternate-optim-fixup' 2021-08-11 12:36:17 -07:00
object-name.c oidtree: a crit-bit tree for odb_loose_cache 2021-07-07 21:28:04 -07:00
object-store.h object-store: avoid extra ';' from KHASH_INIT 2021-08-09 09:01:30 -07:00
object.c Merge branch 'jk/log-decorate-optim' 2021-07-28 13:17:58 -07:00
object.h object.h: add lookup_object_by_type() function 2021-06-28 20:30:18 -07:00
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c oidtree: avoid unaligned access to crit-bit tree 2021-08-15 13:13:50 -07:00
oidtree.h oidtree: a crit-bit tree for odb_loose_cache 2021-07-07 21:28:04 -07:00
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jk/check-pack-valid-before-opening-bitmap' 2021-08-02 14:06:43 -07:00
pack-bitmap.h
pack-check.c csum-file: introduce checksum_valid() 2021-06-28 20:36:17 -07:00
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c xmmap: inform Linux users of tuning knobs on ENOMEM 2021-06-29 23:14:25 -07:00
packfile.h
pager.c pager: avoid setting COLUMNS when we're guessing its value 2021-06-28 10:42:10 -07:00
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c parse-options: don't complete option aliases by default 2021-07-16 11:31:44 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h Merge branch 'ds/gender-neutral-doc' 2021-07-16 17:42:53 -07:00
pkt-line.c Merge branch 'dl/packet-read-response-end-fix' 2021-07-28 13:17:56 -07:00
pkt-line.h
preload-index.c
pretty.c log: avoid loading decorations for userformats that don't need it 2021-06-28 20:30:17 -07:00
pretty.h log: avoid loading decorations for userformats that don't need it 2021-06-28 20:30:17 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c Merge branch 'jt/partial-clone-submodule-1' 2021-07-16 17:42:53 -07:00
promisor-remote.h promisor-remote: support per-repository config 2021-06-28 09:57:42 -07:00
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h *.h: add a few missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
range-diff.c Merge branch 'ab/pickaxe-pcre2' 2021-07-13 16:52:50 -07:00
range-diff.h
reachable.c object.h: add lookup_object_by_type() function 2021-06-28 20:30:18 -07:00
reachable.h
read-cache.c Merge branch 'ah/plugleaks' 2021-08-04 13:28:52 -07:00
README.md
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'ah/plugleaks' 2021-08-04 13:28:52 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'hn/refs-iterator-peel-returns-boolean' 2021-07-16 17:42:49 -07:00
refs.h
refspec.c
refspec.h
RelNotes
remote-curl.c Merge branch 'dl/packet-read-response-end-fix' 2021-07-28 13:17:56 -07:00
remote.c
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c promisor-remote: support per-repository config 2021-06-28 09:57:42 -07:00
repository.h promisor-remote: support per-repository config 2021-06-28 09:57:42 -07:00
rerere.c
rerere.h
reset.c reset: clear_unpack_trees_porcelain to plug leak 2021-07-26 12:19:21 -07:00
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h Merge branch 'bc/rev-list-without-commit-line' 2021-07-22 13:05:56 -07:00
run-command.c Merge branch 'jt/partial-clone-submodule-1' 2021-07-16 17:42:53 -07:00
run-command.h Merge branch 'jt/partial-clone-submodule-1' 2021-07-16 17:42:53 -07:00
SECURITY.md
send-pack.c send-pack.c: move "no refs in common" abort earlier 2021-06-30 14:57:22 -07:00
send-pack.h
sequencer.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
sequencer.h
serve.c Merge branch 'dl/packet-read-response-end-fix' 2021-07-28 13:17:56 -07:00
serve.h
server-info.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
setup.c Merge branch 'jt/partial-clone-submodule-1' 2021-07-16 17:42:53 -07:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shallow.h
shell.c
shortlog.h
sideband.c sideband: don't lose clear-to-eol at packet boundary 2021-06-17 14:11:36 +09:00
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c sparse-index: recompute cache-tree 2021-07-14 15:05:53 -07:00
sparse-index.h
split-index.c split-index: use oideq instead of memcmp to compare object_id's 2021-06-15 12:07:56 +09:00
split-index.h
stable-qsort.c
strbuf.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strbuf.h Merge branch 'ab/attribute-format' 2021-07-28 13:17:59 -07:00
streaming.c
streaming.h
string-list.c string-list.[ch]: add a string_list_init_{nodup,dup}() 2021-07-01 12:32:22 -07:00
string-list.h string-list.[ch]: add a string_list_init_{nodup,dup}() 2021-07-01 12:32:22 -07:00
strmap.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strmap.h
strvec.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c run-command: refactor subprocess env preparation 2021-06-28 09:58:01 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace2.c
trace2.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'ab/struct-init' 2021-07-16 17:42:53 -07:00
transport.h
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 'ds/commit-and-checkout-with-sparse-index' 2021-08-04 13:28:53 -07:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c userdiff: add support for C# record types 2021-06-16 17:06:20 +09:00
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 *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'ds/status-with-sparse-index' 2021-07-28 13:18:02 -07:00
wt-status.h status: skip sparse-checkout percentage with sparse-index 2021-07-14 13:42:49 -07:00
xdiff-interface.c Merge branch 'ab/pickaxe-pcre2' 2021-07-13 16:52:50 -07:00
xdiff-interface.h
zlib.c

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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. 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