Go to file
Linus Arver 97e9d0b78a trailer: find the end of the log message
Previously, trailer_info_get() computed the trailer block end position
by

(1) checking for the opts->no_divider flag and optionally calling
    find_patch_start() to find the "patch start" location (patch_start), and
(2) calling find_trailer_end() to find the end of the trailer block
    using patch_start as a guide, saving the return value into
    "trailer_end".

The logic in (1) was awkward because the variable "patch_start" is
misleading if there is no patch in the input. The logic in (2) was
misleading because it could be the case that no trailers are in the
input (yet we are setting a "trailer_end" variable before even searching
for trailers, which happens later in find_trailer_start()). The name
"find_trailer_end" was misleading because that function did not look for
any trailer block itself --- instead it just computed the end position
of the log message in the input where the end of the trailer block (if
it exists) would be (because trailer blocks must always come after the
end of the log message).

Combine the logic in (1) and (2) together into find_patch_start() by
renaming it to find_end_of_log_message(). The end of the log message is
the starting point which find_trailer_start() needs to start searching
backward to parse individual trailers (if any).

Helped-by: Jonathan Tan <jonathantanmy@google.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-12-20 11:55:04 -08:00
.github Merge branch 'jk/ci-retire-allow-ref' 2023-09-07 15:06:08 -07:00
Documentation The twelfth batch 2023-09-22 17:01:37 -07:00
block-sha1
builtin commit: ignore_non_trailer computes number of bytes to ignore 2023-10-20 14:25:12 -07:00
ci Merge branch 'jk/ci-retire-allow-ref' 2023-09-07 15:06:08 -07:00
compat hashmap: use expected signatures for comparison functions 2023-08-19 21:17:53 -07:00
contrib Merge branch 'pb/completion-aliases-doc' 2023-09-20 10:44:58 -07:00
ewah
git-gui Merge https://github.com/prati0100/git-gui 2023-08-24 09:57:43 -07:00
gitk-git
gitweb
mergetools
negotiator negotiator/noop: mark unused callback parameters 2023-08-29 17:56:25 -07:00
oss-fuzz
perl
po Merge branch 'po-id' of github.com:bagasme/git-po 2023-08-21 07:05:38 +08:00
refs
reftable
sha1 avoid SHA-1 functions deprecated in OpenSSL 3+ 2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256 Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
t Merge branch 'jk/ort-unused-parameter-cleanups' 2023-09-22 17:01:36 -07:00
templates
trace2 trace2: mark unused config callback parameter 2023-08-29 17:56:25 -07:00
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore gitignore: ignore clangd .cache directory 2023-08-04 10:56:51 -07:00
.gitmodules
.mailmap mailmap: change primary address for Glen Choo 2023-08-07 11:58:17 -07:00
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Start the 2.43 cycle 2023-08-24 09:32:34 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jc/update-index-show-index-version' 2023-09-20 10:45:16 -07:00
README.md
RelNotes Start the 2.43 cycle 2023-08-24 09:32:34 -07:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c Merge branch 'jk/unused-post-2.42' 2023-09-07 15:06:07 -07:00
add-interactive.h
add-patch.c
advice.c advice: handle "rebase" in error_resolve_conflict() 2023-08-07 13:21:00 -07:00
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c Merge branch 'sl/sparse-check-attr' 2023-08-29 13:51:43 -07:00
attr.h
banned.h
base85.c
base85.h
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c branch: error message checking out a branch in use 2023-08-08 18:27:30 -07:00
branch.h
builtin.h
bulk-checkin.c Merge branch 'ew/hash-with-openssl-evp' 2023-09-13 10:07:57 -07:00
bulk-checkin.h
bundle-uri.c bundle-uri: mark unused parameters in callbacks 2023-08-29 17:56:26 -07:00
bundle-uri.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'jk/unused-post-2.42' 2023-09-07 15:06:07 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c commit: ignore_non_trailer computes number of bytes to ignore 2023-10-20 14:25:12 -07:00
commit.h commit: ignore_non_trailer computes number of bytes to ignore 2023-10-20 14:25:12 -07:00
common-main.c
config.c add core.maxTreeDepth config 2023-08-31 15:51:07 -07:00
config.h
config.mak.dev
config.mak.in
config.mak.uname win32: add a helper to run `git.exe` without a foreground window 2023-08-09 13:58:13 -07:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
copy.h
credential.c credential: mark unused parameter in urlmatch callback 2023-08-29 17:56:26 -07:00
credential.h
csum-file.c Merge branch 'ew/hash-with-openssl-evp' 2023-09-13 10:07:57 -07:00
csum-file.h
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c Merge branch 'js/diff-cached-fsmonitor-fix' 2023-09-20 10:44:57 -07:00
diff-merges.c
diff-merges.h
diff-no-index.c Merge branch 'pw/diff-no-index-from-named-pipes' 2023-09-20 10:44:57 -07:00
diff.c Merge branch 'jk/diff-result-code-cleanup' 2023-09-01 11:26:28 -07:00
diff.h diff: drop useless "status" parameter from diff_result_code() 2023-08-21 15:33:24 -07: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
dir.h
editor.c
editor.h
entry.c
entry.h
environment.c lower core.maxTreeDepth default to 2048 2023-08-31 15:51:08 -07:00
environment.h add core.maxTreeDepth config 2023-08-31 15:51:07 -07:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ts/unpacklimit-config-fix' 2023-08-30 13:50:41 -07:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c fsck: detect very large tree pathnames 2023-08-31 15:51:07 -07:00
fsck.h fsck: detect very large tree pathnames 2023-08-31 15:51:07 -07:00
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h Merge branch 'mp/rebase-label-length-limit' 2023-08-24 09:32:33 -07: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
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl git-send-email.perl: avoid printing undef when validating addresses 2023-09-18 12:04:30 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl git-svn: drop FakeTerm hack 2023-08-30 17:20:31 -07:00
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: mark unused parmaeters in pcre fallbacks 2023-08-29 17:56:26 -07:00
grep.h
hash-ll.h Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
hex.h
hook.c
hook.h
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jk/redact-h2h3-headers-fix' 2023-09-22 17:01:36 -07:00
http.h
ident.c Merge branch 'bc/ident-dot-is-no-longer-crud-letter' 2023-08-09 16:18:15 -07:00
ident.h
imap-send.c imap-send: mark unused parameters with NO_OPENSSL 2023-08-29 17:56:26 -07:00
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
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: respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c decorate: use commit color for HEAD arrow 2023-08-21 11:40:10 -07:00
log-tree.h pretty: add pointer and tag options to %(decorate) 2023-08-21 11:40:10 -07:00
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
match-trees.h
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ll.c
merge-ll.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c merge-ort: lowercase a few error messages 2023-09-16 17:26:53 -07:00
merge-ort.h
merge-recursive.c merge-ort: lowercase a few error messages 2023-09-16 17:26:53 -07:00
merge-recursive.h
merge.c
merge.h
mergesort.h
midx.c
midx.h
name-hash.c
name-hash.h
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
object-file.h
object-name.c
object-name.h
object-store-ll.h
object-store.h
object.c
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: mark unused parameters in show_object callback 2023-08-29 17:56:24 -07:00
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'jc/retire-get-sha1-hex' 2023-08-04 10:52:30 -07:00
packfile.h
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c parse-options: mark unused parameters in noop callback 2023-09-05 14:48:17 -07:00
parse-options.c parse-options: allow omitting option help text 2023-08-28 08:20:20 -07:00
parse-options.h
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
preload-index.h
pretty.c pretty: add pointer and tag options to %(decorate) 2023-08-21 11:40:10 -07: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 hashmap: use expected signatures for comparison functions 2023-08-19 21:17:53 -07:00
range-diff.h
reachable.c
reachable.h
read-cache-ll.h
read-cache.c
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'ks/ref-filter-sort-numerically' 2023-09-14 11:16:59 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c
refs.h
refspec.c
refspec.h
remote-curl.c
remote.c
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c
repository.h
rerere.c Merge branch 'jc/retire-get-sha1-hex' 2023-08-04 10:52:30 -07:00
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c Merge branch 'ma/locate-in-path-for-windows' 2023-08-09 16:18:16 -07:00
run-command.h
sane-ctype.h
scalar.c Merge branch 'ds/scalar-updates' 2023-08-29 13:51:44 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'ob/sequencer-remove-dead-code' 2023-09-20 10:44:58 -07:00
sequencer.h
serve.c
serve.h
server-info.c
server-info.h
setup.c Merge branch 'ds/scalar-updates' 2023-08-29 13:51:44 -07:00
setup.h Merge branch 'ds/scalar-updates' 2023-08-29 13:51:44 -07:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c
statinfo.h
strbuf.c Merge branch 'rs/strbuf-addftime-simplify' 2023-07-25 12:05:24 -07:00
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
submodule-config.h
submodule.c
submodule.h
symlinks.c
symlinks.h
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h Merge branch 'bb/use-trace2-counters-for-fsync-stats' 2023-08-02 09:37:23 -07:00
trailer.c trailer: find the end of the log message 2023-12-20 11:55:04 -08:00
trailer.h trailer: separate public from internal portion of trailer_iterator 2023-09-11 10:01:18 -07:00
transport-helper.c
transport-internal.h
transport.c
transport.h
tree-diff.c tree-diff: respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.c traverse_trees(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
tree.c read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree.h read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c tree-walk: reduce stack size for recursive functions 2023-08-31 15:51:07 -07:00
unpack-trees.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
upload-pack.c Merge branch 'ds/upload-pack-error-sequence-fix' 2023-08-24 09:32:33 -07: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
versioncmp.h
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c worktree: mark unused parameters in noop repair callback 2023-08-29 17:56:25 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c maintenance: add get_random_minute() 2023-08-10 14:04:16 -07:00
wrapper.h maintenance: add get_random_minute() 2023-08-10 14:04:16 -07:00
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c Merge branch 'jk/tree-name-and-depth-limit' 2023-09-14 11:16:59 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h

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