Go to file
Jialong Wang 838c0ba500 apply: report input location in header parsing errors
Several header parsing errors in apply.c still report only line
numbers. When applying more than one input, that does not tell the
user which input the line belongs to.

Report the patch input location for these header parsing errors, and
update the related tests.

While touching parse_git_diff_header(), update the helper state to use
the current header line when reporting these errors.

Signed-off-by: Jialong Wang <jerrywang183@yahoo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2026-03-17 11:08:24 -07:00
.github Merge branch 'ps/ci-gitlab-msvc-updates' 2026-02-27 15:11:52 -08:00
Documentation The 16th batch 2026-03-12 14:09:07 -07:00
bin-wrappers
block-sha1
builtin Merge branch 'ps/odb-sources' 2026-03-12 14:09:07 -07:00
ci Merge branch 'ps/ci-reduce-gitlab-envsize' 2026-03-10 14:23:21 -07:00
compat Merge branch 'mc/tr2-process-ancestry-cleanup' 2026-02-25 11:54:18 -08:00
compiler-tricks
contrib Merge branch 'kn/osxkeychain-buildfix' 2026-03-04 10:52:59 -08:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
odb odb/source: make `begin_transaction()` function pluggable 2026-03-05 11:45:17 -08:00
oss-fuzz
perl
po
refs Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
reftable
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
src
subprojects
t apply: report input location in header parsing errors 2026-03-17 11:08:24 -07:00
templates Merge branch 'pt/fsmonitor-watchman-sample-fix' 2026-03-10 14:23:23 -07:00
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitlab-ci.yml Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation' 2026-03-12 10:56:04 -07:00
.gitmodules
.mailmap .mailmap: update email address for Tian Yuchen 2026-03-09 12:46:34 -07:00
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
Cargo.toml
GIT-BUILD-OPTIONS.in
GIT-VERSION-FILE.in
GIT-VERSION-GEN
INSTALL
LGPL-2.1
Makefile Merge branch 'ps/odb-sources' 2026-03-12 14:09:07 -07:00
README.md
RelNotes
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c Merge branch 'aa/add-p-no-auto-advance' 2026-03-03 11:08:13 -08:00
add-interactive.h
add-patch.c Merge branch 'aa/add-p-no-auto-advance' 2026-03-03 11:08:13 -08:00
advice.c
advice.h
alias.c alias: treat empty subsection [alias ""] as plain [alias] 2026-02-26 13:06:49 -08:00
alias.h
alloc.c
alloc.h
apply.c apply: report input location in header parsing errors 2026-03-17 11:08:24 -07:00
apply.h apply: report input location in header parsing errors 2026-03-17 11:08:24 -07:00
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
banned.h
base85.c
base85.h
bisect.c Merge branch 'ps/for-each-ref-in-fixes' 2026-02-27 15:11:50 -08:00
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h environment: move "branch.autoSetupMerge" into `struct repo_config_values` 2026-02-26 07:22:53 -08:00
build.rs
builtin.h
bundle-uri.c
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: add color_parse_quietly() 2026-02-23 13:23:41 -08:00
color.h color: add color_parse_quietly() 2026-02-23 13:23:41 -08:00
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c odb: embed base source in the "files" backend 2026-03-05 11:45:15 -08: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 'ps/receive-pack-shallow-optim' 2026-03-02 17:06:53 -08:00
commit.h Merge branch 'ps/receive-pack-shallow-optim' 2026-03-02 17:06:53 -08:00
common-exit.c
common-init.c
common-init.h
common-main.c
config.c
config.h
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'mc/tr2-process-ancestry-cleanup' 2026-02-25 11:54:18 -08:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
copy.h
credential.c
credential.h
csum-file.c
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
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c Merge branch 'mm/diff-no-index-find-object' 2026-03-10 14:23:22 -07:00
diff.h
diffcore-break.c Merge branch 'en/merge-ort-almost-wo-the-repository' 2026-03-04 10:53:02 -08:00
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 environment: stop using core.sparseCheckout globally 2026-02-26 07:22:51 -08:00
dir.h
editor.c
editor.h
entry.c
entry.h
environment.c Merge branch 'ob/core-attributesfile-in-repository' 2026-03-05 10:04:49 -08:00
environment.h Merge branch 'ob/core-attributesfile-in-repository' 2026-03-05 10:04:49 -08:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
for-each-ref.h
fsck.c
fsck.h
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 build: regenerate config-list.h when Documentation changes 2026-02-24 10:51:54 -08:00
generate-hooklist.sh
generate-perl.sh
generate-python.sh
generate-script.sh
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h
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 Merge branch 'sp/send-email-validate-charset' 2026-03-12 10:56:05 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c Merge branch 'jh/alias-i18n-fixes' 2026-03-10 14:23:24 -07:00
git.rc.in
gpg-interface.c Merge branch 'uk/signature-is-good-after-key-expires' 2026-03-02 17:06:50 -08:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.c
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'jh/alias-i18n-fixes' 2026-03-10 14:23:24 -07:00
help.h
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c
hook.h
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c odb: embed base source in the "files" backend 2026-03-05 11:45:15 -08:00
http.h
ident.c
ident.h
imap-send.c
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.h
list.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
loose.c odb: embed base source in the "files" backend 2026-03-05 11:45:15 -08:00
loose.h
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.h
merge.c
merge.h
mergesort.h
meson.build Merge branch 'ps/odb-sources' 2026-03-12 14:09:07 -07:00
meson_options.txt
midx-write.c
midx.c odb: embed base source in the "files" backend 2026-03-05 11:45:15 -08:00
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-convert.c Merge branch 'bc/sha1-256-interop-02' 2026-03-12 10:56:02 -07:00
object-file-convert.h
object-file.c Merge branch 'ps/odb-sources' 2026-03-12 14:09:07 -07:00
object-file.h Merge branch 'ps/fsck-stream-from-the-right-object-instance' 2026-03-05 10:04:49 -08:00
object-name.c
object-name.h
object.c Merge branch 'ps/fsck-stream-from-the-right-object-instance' 2026-03-05 10:04:49 -08:00
object.h Merge branch 'ps/receive-pack-shallow-optim' 2026-03-02 17:06:53 -08:00
odb.c odb/source: make `write_alternate()` function pluggable 2026-03-05 11:45:17 -08:00
odb.h odb/source: make `read_alternates()` function pluggable 2026-03-05 11:45:16 -08:00
oid-array.c
oid-array.h
oidmap.c oidmap: make entry cleanup explicit in oidmap_clear 2026-03-05 11:16:18 -08:00
oidmap.h oidmap: make entry cleanup explicit in oidmap_clear 2026-03-05 11:16:18 -08:00
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'ps/odb-sources' 2026-03-12 14:09:07 -07:00
packfile.h Merge branch 'ps/odb-sources' 2026-03-12 14:09:07 -07:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c Merge branch 'rs/parse-options-duplicated-long-options' 2026-03-10 14:23:19 -07:00
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path-walk.c
path-walk.h
path.c Merge branch 'kj/path-micro-code-cleanup' 2026-03-12 10:56:02 -07:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c
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
pseudo-merge.c
pseudo-merge.h
quote.c
quote.h
range-diff.c apply: report input location in header parsing errors 2026-03-17 11:08:24 -07:00
range-diff.h
reachable.c
reachable.h
read-cache-ll.h
read-cache.c Merge branch 'cs/add-skip-submodule-ignore-all' 2026-03-09 14:36:55 -07:00
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c Merge branch 'ar/config-hooks' 2026-03-10 14:23:18 -07:00
refs.h Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
refspec.c
refspec.h
remote-curl.c
remote.c Merge branch 'hn/status-compare-with-push' 2026-03-12 14:09:06 -07:00
remote.h
repack-cruft.c
repack-filtered.c
repack-geometry.c
repack-midx.c
repack-promisor.c Merge branch 'ps/odb-for-each-object' 2026-03-02 17:06:50 -08:00
repack.c
repack.h
replace-object.c
replace-object.h
replay.c
replay.h
repo-settings.c
repo-settings.h
repository.c Merge branch 'bc/sha1-256-interop-02' 2026-03-12 10:56:02 -07:00
repository.h Merge branch 'bc/sha1-256-interop-02' 2026-03-12 10:56:02 -07:00
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
revision.h
run-command.c Merge branch 'ds/for-each-repo-w-worktree' 2026-03-12 14:09:05 -07:00
run-command.h Merge branch 'ds/for-each-repo-w-worktree' 2026-03-12 14:09:05 -07:00
sane-ctype.h
scalar.c
send-pack.c
send-pack.h
sequencer.c Merge branch 'ar/run-command-hook-take-2' 2026-03-09 14:36:55 -07:00
sequencer.h
serve.c
serve.h
server-info.c
server-info.h
setup.c Merge branch 'kn/ref-location' 2026-03-04 10:52:59 -08:00
setup.h Merge branch 'kn/ref-location' 2026-03-04 10:52:59 -08:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'sp/shallow-deepen-relative-fix' 2026-03-04 10:52:59 -08:00
shallow.h Merge branch 'sp/shallow-deepen-relative-fix' 2026-03-04 10:52:59 -08:00
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c environment: stop using core.sparseCheckout globally 2026-02-26 07:22:51 -08:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c
statinfo.h
strbuf.c
strbuf.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 odb: move reparenting logic into respective subsystems 2026-03-05 11:45:15 -08:00
tmp-objdir.h odb: move reparenting logic into respective subsystems 2026-03-05 11:45:15 -08:00
trace.c
trace.h
trace2.c
trace2.h
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'ar/config-hooks' 2026-03-10 14:23:18 -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 environment: stop using core.sparseCheckout globally 2026-02-26 07:22:51 -08:00
unpack-trees.h
upload-pack.c Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -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-def.h.in
version.c
version.h
versioncmp.c
versioncmp.h
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
worktree.h Merge branch 'ps/refs-for-each' 2026-03-09 14:36:55 -07:00
wrapper.c
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status.c Merge branch 'ob/core-attributesfile-in-repository' 2026-03-05 10:04:49 -08: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.adoc to get started, then see Documentation/giteveryday.adoc for a useful minimum set of commands, and Documentation/git-<commandname>.adoc 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.adoc (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 to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://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