Go to file
Johannes Schindelin fd3f7f619a add -p: gracefully handle unparseable hunk headers in colored diffs
In
https://lore.kernel.org/git/ecf6f5be-22ca-299f-a8f1-bda38e5ca246@gmail.com,
Phillipe Blain reported that the built-in `git add -p` command fails
when asked to use [`diff-so-fancy`][diff-so-fancy] to colorize the diff.

The reason is that this tool produces colored diffs with a hunk header
that does not contain any parseable `@@ ... @@` line range information,
and therefore we cannot detect any part in that header that comes after
the line range.

As proposed by Phillip Wood, let's take that for a clear indicator that
we should show the hunk headers verbatim. This is what the Perl version
of the interactive `add` command did, too.

[diff-so-fancy]: https://github.com/so-fancy/diff-so-fancy

Reported-by: Philippe Blain <levraiphilippeblain@gmail.com>
Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-09-01 09:55:21 -07:00
.github ci(github): bring back the 'print test failures' step 2022-06-08 16:12:37 -07:00
Documentation Git 2.37.2 2022-08-10 21:52:36 -07:00
block-sha1
builtin Merge branch 'jc/string-list-cleanup' into maint 2022-08-10 21:52:36 -07:00
ci Merge branch 'js/ci-github-workflow-markup' 2022-06-17 10:33:32 -07:00
compat Merge branch 'ds/win-syslog-compiler-fix' into maint 2022-08-05 15:51:37 -07:00
contrib Merge branch 'cl/rerere-train-with-no-sign' into maint 2022-08-10 21:52:33 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools Merge branch 'fr/vimdiff-layout-fix' into maint 2022-07-27 13:00:28 -07:00
negotiator
perl
po l10n: sv.po: Update Swedish translation (5367t0f0u) 2022-06-26 20:38:46 +08:00
ppc
refs
reftable
sha1collisiondetection@855827c583
sha1dc
sha256
t add -p: gracefully handle unparseable hunk headers in colored diffs 2022-09-01 09:55:21 -07:00
templates
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN Git 2.37.2 2022-08-10 21:52:36 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
README.md
RelNotes Downmerge a handful of fixes for 2.37.x maintenance track 2022-07-27 13:22:06 -07:00
SECURITY.md
abspath.c
aclocal.m4
add-interactive.c Merge 'js/add-i-delete' into maint-2.37 2022-07-04 13:40:59 -07:00
add-interactive.h
add-patch.c add -p: gracefully handle unparseable hunk headers in colored diffs 2022-09-01 09:55:21 -07:00
advice.c
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
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c commit-graph: fix corrupt upgrade from generation v1 to v2 2022-07-15 16:51:39 -07:00
bloom.h
branch.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache-tree.h cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache.h Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
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 Merge branch 'rs/combine-diff-with-incompatible-options' into maint 2022-07-27 13:00:32 -07:00
command-list.txt
commit-graph.c Merge branch 'tb/commit-graph-genv2-upgrade-fix' into maint 2022-08-10 21:52:35 -07:00
commit-graph.h commit-graph: introduce `repo_find_commit_pos_in_graph()` 2022-07-15 16:51:39 -07:00
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
commit.h
common-main.c
config.c
config.h
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
configure.ac
connect.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
connect.h
connected.c
connected.h
convert.c
convert.h checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
copy.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c daemon: clarify directory arguments 2022-07-19 12:45:31 -07:00
date.c
date.h
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.h
diff-no-index.c
diff.c
diff.h
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 'gg/worktree-from-the-above' into maint 2022-07-27 13:00:29 -07:00
dir.h
editor.c
entry.c checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
entry.h checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
environment.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -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.h
fsck.c
fsck.h
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-settings.c fsmonitor: avoid memory leak in `fsm_settings__get_incompatible_msg()` 2022-06-16 13:22:03 -07:00
fsmonitor-settings.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 Sync with 2.35.4 2022-06-23 12:36:12 +02:00
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: clarify directory list 2022-07-19 12:45:31 -07:00
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 'kk/p4-client-name-encoding-fix' into maint 2022-08-10 21:52:33 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
git.rc
gpg-interface.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
hook.c Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
hook.h
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
http.h
ident.c
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
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
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/merge-dual-dir-renames-fix' into maint 2022-07-27 13:00:28 -07:00
merge-ort.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -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 'ab/env-array' 2022-06-10 15:04:13 -07:00
object-name.c
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.h
pack-check.c
pack-mtimes.c pack-mtimes: avoid closing a bogus file descriptor 2022-06-16 13:22:03 -07:00
pack-mtimes.h
pack-objects.c
pack-objects.h pack-objects.h: remove outdated pahole results 2022-06-28 15:39:03 -07:00
pack-revindex.c
pack-revindex.h
pack-write.c pack-write: drop always-NULL parameter 2022-06-16 11:59:55 -07:00
pack.h
packfile.c
packfile.h
pager.c
parallel-checkout.c checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
parallel-checkout.h checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
parse-options-cb.c
parse-options.c
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 pkt-line.h: move comment closer to the associated code 2022-07-22 14:06:05 -07:00
preload-index.c
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
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 Merge branch 'pb/range-diff-with-submodule' 2022-06-13 15:53:41 -07:00
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'tk/untracked-cache-with-uall' into maint 2022-08-10 21:52:34 -07:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
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 i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
remote.h
replace-object.c
replace-object.h
repo-settings.c
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/resolve-undo' into maint 2022-08-10 21:52:32 -07:00
revision.h
run-command.c Merge branch 'js/wait-or-whine-can-fail' 2022-06-13 15:53:44 -07:00
run-command.h Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'jc/revert-show-parent-info' 2022-06-15 15:09:27 -07:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c Merge branch 'cr/setup-bug-typo' into maint 2022-07-27 13:19:49 -07:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'jt/unparse-commit-upon-graft-change' 2022-06-13 15:53:42 -07:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
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 i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
submodule-config.h
submodule.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
submodule.h Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
symlinks.c
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
trailer.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
trailer.h
transport-helper.c
transport-internal.h
transport.c transport.c: avoid "whitelist" 2022-07-19 12:45:31 -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 checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c i18n: mark message helpers prefix for translation 2022-06-21 10:06:54 -07:00
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
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07: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