Go to file
Johannes Sixt 386076ec92 userdiff-cpp: back out the digit-separators in numbers
The implementation of digit-separating single-quotes introduced a
note-worthy regression: the change of a character literal with a
digit would splice the digit and the closing single-quote. For
example, the change from 'a' to '2' is now tokenized as
'[-a'-]{+2'+} instead of '[-a-]{+2+}'.

The options to fix the regression are:

- Tighten the regular expression such that the single-quote can only
  occur between digits (that would match the official syntax).

- Remove support for digit separators.

I chose to remove support, because

- I have not seen a lot of code make use of digit separators.

- If code does use digit separators, then the numbers are typically
  long. If a change in one of the segments occurs, it is actually
  better visible if only that segment is highlighted as the word
  that changed instead of the whole long number.

This choice does introduce another minor regression, though, which
is highlighted in the test case: when a change occurs in the second
or later segment of a hexadecimal number where the segment begins
with a digit, but also has letters, the segment is mistaken as
consisting of a number and an identifier. I can live with that.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-10-25 08:47:44 -07:00
.github Merge branch 'jx/ci-l10n' 2021-10-03 21:49:17 -07:00
Documentation The eleventh batch 2021-10-06 13:40:32 -07:00
block-sha1
builtin Merge branch 'tb/commit-graph-usage-fix' 2021-10-06 13:40:11 -07:00
ci Merge branch 'tb/multi-pack-bitmaps' 2021-09-20 15:20:39 -07:00
compat Merge branch 'cb/pedantic-build-for-developers' 2021-09-20 15:20:41 -07:00
contrib Merge branch 'rs/use-xopen-in-index-pack' 2021-09-23 13:44:50 -07:00
ewah
git-gui
gitk-git
gitweb Merge branch 'gh/gitweb-branch-sort' 2021-09-10 11:46:32 -07:00
mergetools
negotiator
perl
po
ppc
refs Merge branch 'ab/retire-refs-unused-funcs' 2021-10-06 13:40:13 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t userdiff-cpp: back out the digit-separators in numbers 2021-10-25 08:47:44 -07:00
templates
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
CODE_OF_CONDUCT.md
COPYING
GIT-VERSION-GEN
INSTALL INSTALL: mention that we need libcurl 7.19.4 or newer to build 2021-09-13 10:39:03 -07:00
LGPL-2.1
Makefile Merge branch 'ab/make-compdb-fix' 2021-10-03 21:49:21 -07:00
README.md
RelNotes
SECURITY.md
abspath.c
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c Merge branch 'ab/retire-advice-config' 2021-09-10 11:46:29 -07:00
advice.h Merge branch 'ab/retire-advice-config' 2021-09-10 11:46:29 -07:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'jc/trivial-threeway-binary-merge' 2021-09-15 13:15:26 -07:00
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
bloom.h
branch.c
branch.h
builtin.h builtin.h: remove cmd_tar_tree() declaration 2021-10-01 14:39:46 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'ab/repo-settings-cleanup' 2021-10-06 13:40:11 -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
command-list.txt
commit-graph.c Merge branch 'js/run-command-close-packs' 2021-09-20 15:20:45 -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.h
common-main.c
config.c Merge branch 'rs/drop-core-compression-vars' 2021-09-23 13:44:46 -07:00
config.h Merge branch 'ab/retire-decl-of-missing-unused-funcs' 2021-10-06 13:40:14 -07:00
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'ah/connect-parse-feature-v0-fix' 2021-10-03 21:49:21 -07:00
connect.h
connected.c Merge branch 'ps/fetch-optim' 2021-09-20 15:20:39 -07:00
connected.h
convert.c
convert.h
copy.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
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.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 'jt/submodule-name-to-gitdir' 2021-09-23 13:44:49 -07:00
dir.h Merge branch 'ds/sparse-index-ignored-files' 2021-09-20 15:20:44 -07:00
editor.c
entry.c
entry.h
environment.c Merge branch 'ab/repo-settings-cleanup' 2021-10-06 13:40:11 -07:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c repo-settings.c: simplify the setup 2021-09-22 13:15:00 -07:00
fetch-negotiator.h
fetch-pack.c
fetch-pack.h
fmt-merge-msg.c
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
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh Merge branch 'mr/bisect-in-c-4' 2021-09-23 13:44:48 -07:00
git-compat-util.h Merge branch 'ab/repo-settings-cleanup' 2021-10-06 13:40:11 -07:00
git-curl-compat.h http: don't hardcode the value of CURL_SOCKOPT_OK 2021-09-13 10:39:04 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: protect against NULL in crypt(3) 2021-09-16 20:47:23 -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
git-quiltimport.sh
git-rebase--preserve-merges.sh
git-request-pull.sh
git-send-email.perl Merge branch 'ab/send-email-config-fix' 2021-09-15 13:15:24 -07:00
git-sh-i18n.sh
git-sh-setup.sh git-sh-setup: remove unused "pull with rebase" message 2021-09-12 16:22:05 -07:00
git-submodule.sh Merge branch 'ab/unused-script-helpers' 2021-09-23 13:44:47 -07:00
git-svn.perl
git-web--browse.sh
git.c
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c grep: store grep_source buffer as const 2021-09-22 11:59:50 -07:00
grep.h Merge branch 'ab/retire-decl-of-missing-unused-funcs' 2021-10-06 13:40:14 -07:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c Merge branch 'jk/http-server-protocol-versions' 2021-09-23 13:44:47 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jk/http-redact-fix' 2021-10-03 21:49:19 -07:00
http.h
ident.c
imap-send.c http: centralize the accounting of libcurl dependencies 2021-09-13 10:39:04 -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.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h log-tree.h: remove unused function declarations 2021-10-01 14:39:46 -07:00
ls-refs.c Merge branch 'jk/reduce-malloc-in-v2-servers' 2021-09-28 13:06:53 -07:00
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c Merge branch 'ab/mailmap-leakfix' 2021-09-10 11:46:28 -07:00
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 'jt/add-submodule-odb-clean-up' 2021-10-06 13:40:11 -07:00
merge-ort.h
merge-recursive.c Merge branch 'jt/add-submodule-odb-clean-up' 2021-10-06 13:40:11 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'rs/packfile-bad-object-list-in-oidset' 2021-09-23 13:44:46 -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 'hn/refs-errno-cleanup' 2021-10-03 21:49:18 -07:00
object-name.c
object-store.h Merge branch 'rs/packfile-bad-object-list-in-oidset' 2021-09-23 13:44:46 -07:00
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c oidset: make oidset_size() an inline function 2021-09-12 16:14:32 -07:00
oidset.h oidset: make oidset_size() an inline function 2021-09-12 16:14:32 -07:00
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h pack-revindex.h: correct the time complexity descriptions 2021-09-15 22:16:25 -07:00
pack-write.c Merge branch 'tb/pack-finalize-ordering' 2021-09-20 15:20:42 -07:00
pack.h
packfile.c Merge branch 'rs/close-pack-leakfix' 2021-10-03 21:49:20 -07:00
packfile.h packfile: convert has_packed_and_bad() to object_id 2021-09-12 16:14:32 -07:00
pager.c
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c parse-options API: remove OPTION_ARGUMENT feature 2021-09-12 23:27:38 -07:00
parse-options.h parse-options API: remove OPTION_ARGUMENT feature 2021-09-12 23:27:38 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'lh/systemd-timers' 2021-09-20 15:20:40 -07:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
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 Merge branch 'ab/serve-cleanup' 2021-09-20 15:20:43 -07:00
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c Merge branch 'rs/range-diff-avoid-segfault-with-I' 2021-09-15 13:15:27 -07:00
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'ab/repo-settings-cleanup' 2021-10-06 13:40:11 -07:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'ab/retire-refs-unused-funcs' 2021-10-06 13:40:13 -07:00
refs.h Merge branch 'ab/retire-refs-unused-funcs' 2021-10-06 13:40:13 -07:00
refspec.c
refspec.h
remote-curl.c string-list.[ch]: remove string_list_init() compatibility function 2021-09-28 14:43:38 -07:00
remote.c Merge branch 'cb/remote-ndebug-fix' 2021-09-10 11:46:30 -07:00
remote.h
replace-object.c
replace-object.h
repo-settings.c repository.h: don't use a mix of int and bitfields 2021-09-22 13:15:00 -07:00
repository.c Merge branch 'jt/add-submodule-odb-clean-up' 2021-10-06 13:40:11 -07:00
repository.h Merge branch 'ab/repo-settings-cleanup' 2021-10-06 13:40:11 -07:00
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jt/add-submodule-odb-clean-up' 2021-10-06 13:40:11 -07:00
revision.h Merge branch 'jt/add-submodule-odb-clean-up' 2021-10-06 13:40:11 -07:00
run-command.c Merge branch 'mr/bisect-in-c-4' 2021-09-23 13:44:48 -07:00
run-command.h Merge branch 'mr/bisect-in-c-4' 2021-09-23 13:44:48 -07:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'pw/rebase-reread-todo-after-editing' 2021-10-06 13:40:12 -07:00
sequencer.h Merge branch 'pw/rebase-reread-todo-after-editing' 2021-10-06 13:40:12 -07:00
serve.c serve: reject commands used as capabilities 2021-09-15 12:25:19 -07:00
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shallow.h
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'ds/sparse-index-ignored-files' 2021-09-20 15:20:44 -07:00
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.[ch]: remove string_list_init() compatibility function 2021-09-28 14:43:38 -07:00
string-list.h string-list.[ch]: remove string_list_init() compatibility function 2021-09-28 14:43:38 -07:00
strmap.c
strmap.h
strvec.c
strvec.h strvec: use size_t to store nr and alloc 2021-09-12 16:25:23 -07:00
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'jt/add-submodule-odb-clean-up' 2021-10-06 13:40:11 -07:00
submodule.h Merge branch 'jt/submodule-name-to-gitdir' 2021-09-23 13:44:49 -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 Merge branch 'en/typofixes' 2021-09-28 13:06:53 -07:00
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'ab/serve-cleanup' 2021-09-20 15:20:43 -07:00
transport.h
tree-diff.c tree-diff: fix leak when not HAVE_ALLOCA_H 2021-09-16 13:43:42 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h unicode: update the width tables to Unicode 14 2021-09-17 17:26:21 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'ds/sparse-index-ignored-files' 2021-09-20 15:20:44 -07:00
unpack-trees.h
upload-pack.c Merge branch 'ab/serve-cleanup' 2021-09-20 15:20:43 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c userdiff-cpp: back out the digit-separators in numbers 2021-10-25 08:47:44 -07: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
worktree.h
wrap-for-bin.sh
wrapper.c wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c 2021-09-22 13:15:00 -07:00
write-or-die.c
ws.c
wt-status.c
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). 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