Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Johannes Schindelin bc24382c2b builtin rebase: prepare for builtin rebase -i
The builtin rebase and the builtin interactive rebase have been
developed independently, on purpose: Google Summer of Code rules
specifically state that students have to work on independent projects,
they cannot collaborate on the same project.

One fallout is that the rebase-in-c and rebase-i-in-c patches cause no
merge conflicts but a royal number of tests in the test suite to fail.

It is easy to explain why: rebase-in-c was developed under the
assumption that all rebase backends are implemented in Unix shell script
and can be sourced via `. git-rebase--<backend>`, which is no longer
true with rebase-i-in-c, where git-rebase--interactive is a hard-linked
builtin.

This patch fixes that.

Please note that we also skip the finish_rebase() call for interactive
rebases because the built-in interactive rebase already takes care of
that. This is needed to support the upcoming `break` command that wants
to interrupt the rebase with exit code 0 (and naturally wants to keep
the state directory intact when doing so).

While at it, remove the `case` arm for the interactive rebase that is
now skipped in favor of the short-cut to the built-in rebase.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-10-11 14:18:47 +09:00
.github
block-sha1
builtin builtin rebase: prepare for builtin rebase -i 2018-10-11 14:18:47 +09:00
ci
compat Merge branch 'nd/command-list' 2018-07-24 14:50:50 -07:00
contrib Merge branch 'ds/commit-graph-fsck' 2018-08-02 15:30:40 -07:00
Documentation Fifth batch for 2.19 cycle 2018-08-02 15:38:09 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools mergetools: add support for guiffy 2018-04-06 08:11:39 +09:00
negotiator Merge branch 'jt/fetch-negotiator-skipping' 2018-08-02 15:30:46 -07:00
perl
po
ppc
refs Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
sha1collisiondetection@19d97bf5af
sha1dc
t Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
templates
vcs-svn
xdiff xdiff/xdiffi.c: remove unneeded function declarations 2018-07-17 11:25:31 -07:00
.clang-format
.gitattributes
.gitignore Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
.gitmodules
.mailmap .mailmap: merge different spellings of names 2018-06-29 09:29:44 -07:00
.travis.yml
.tsan-suppressions
abspath.c
aclocal.m4
advice.c Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
advice.h Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
alias.c
alias.h
alloc.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
alloc.h
apply.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
apply.h
archive-tar.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
archive-zip.c
archive.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
bisect.h
blame.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
blame.h
blob.c blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
blob.h blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
branch.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
branch.h
builtin.h Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
bulk-checkin.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bulk-checkin.h
bundle.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bundle.h
cache-tree.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
cache-tree.h
cache.h Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
chdir-notify.c
chdir-notify.h
check_bindir
check-builtins.sh
check-racy.c
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
commit-graph.h commit-graph: add repo arg to graph readers 2018-07-17 15:47:48 -07:00
commit-slab-decl.h
commit-slab-impl.h commit-slabs: remove realloc counter outside of slab struct 2018-06-29 10:43:40 -07:00
commit-slab.h
commit.c merge-base --fork-point: extract libified function 2018-10-11 14:12:45 +09:00
commit.h merge-base --fork-point: extract libified function 2018-10-11 14:12:45 +09:00
common-main.c
config.c Merge branch 'jt/commit-graph-per-object-store' 2018-08-02 15:30:47 -07:00
config.h Merge branch 'jk/fsck-gitmodules-gently' 2018-08-02 15:30:39 -07:00
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h fixup! connect.h: avoid forward declaration of an enum 2018-07-09 14:35:39 -07:00
connected.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
connected.h fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
convert.c Merge branch 'bb/pedantic' 2018-07-24 14:50:47 -07:00
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c Merge branch 'jk/has-uncommitted-changes-fix' 2018-08-02 15:30:38 -07:00
diff-no-index.c
diff.c Merge branch 'sb/diff-color-move-more' 2018-08-02 15:30:40 -07:00
diff.h Merge branch 'sb/diff-color-move-more' 2018-08-02 15:30:40 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'tz/exclude-doc-smallfixes' 2018-07-18 12:20:34 -07:00
dir.h
editor.c editor: add a function to launch the sequence editor 2018-08-10 11:56:22 -07:00
entry.c
environment.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
exec-cmd.c
exec-cmd.h
fast-import.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
fetch-negotiator.c negotiator/skipping: skip commits during fetch 2018-07-16 14:51:12 -07:00
fetch-negotiator.h negotiator/skipping: skip commits during fetch 2018-07-16 14:51:12 -07:00
fetch-object.c fetch-pack: put shallow info in output parameter 2018-06-28 09:33:29 -07:00
fetch-object.h
fetch-pack.c Merge branch 'jt/fetch-negotiator-skipping' 2018-08-02 15:30:46 -07:00
fetch-pack.h Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
fmt-merge-msg.h
fsck.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
fsck.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'pw/add-p-recount' 2018-06-28 12:53:32 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh Merge branch 'mb/filter-branch-optim' 2018-07-18 12:20:32 -07:00
git-instaweb.sh
git-legacy-rebase.sh Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--common.sh rebase: refactor common shell functions into their own file 2018-08-06 13:08:01 -07:00
git-rebase--merge.sh Merge branch 'en/rebase-i-microfixes' 2018-07-18 12:20:33 -07:00
git-rebase--preserve-merges.sh Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jm/send-email-tls-auth-on-batch' 2018-08-02 15:30:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'sb/submodule-core-worktree' 2018-07-18 12:20:28 -07:00
git-svn.perl
GIT-VERSION-GEN
git-web--browse.sh
git.c Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
git.rc
gpg-interface.c gpg-interface: make parse_gpg_output static and remove from interface header 2018-07-11 10:05:22 -07:00
gpg-interface.h gpg-interface: make parse_gpg_output static and remove from interface header 2018-07-11 10:05:22 -07:00
graph.c
graph.h
grep.c Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
grep.h Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c hex: switch to using the_hash_algo 2018-07-16 14:27:39 -07:00
http-backend.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
http-fetch.c
http-push.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
http-walker.c
http.c
http.h
ident.c
imap-send.c
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
line-log.h
line-range.c
line-range.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
list-objects-filter.h
list-objects.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
match-trees.c
mem-pool.c block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
mem-pool.h block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'en/dirty-merge-fixes' 2018-08-02 15:30:45 -07:00
merge-recursive.h
merge.c Merge branch 'en/dirty-merge-fixes' 2018-08-02 15:30:45 -07:00
mergesort.c
mergesort.h
name-hash.c
notes-cache.c commit: add repository argument to lookup_commit_reference_gently 2018-06-29 10:43:39 -07:00
notes-cache.h
notes-merge.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
notes-merge.h
notes-utils.c commit: add repository argument to lookup_commit 2018-06-29 10:43:39 -07:00
notes-utils.h
notes.c
notes.h
object-store.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
object.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
object.h Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c Merge branch 'jt/remove-pack-bitmap-global' 2018-07-18 12:20:30 -07:00
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c object: add repository argument to parse_object 2018-06-29 10:43:38 -07:00
packfile.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
pager.c
parse-options-cb.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
path.h Merge branch 'bb/pedantic' 2018-07-24 14:50:47 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
reachable.c tree: add repository argument to lookup_tree 2018-06-29 10:43:38 -07:00
reachable.h
read-cache.c Merge branch 'en/dirty-merge-fixes' 2018-08-02 15:30:45 -07:00
README.md
rebase-interactive.c rebase -i: remove unused modes and functions 2018-08-29 13:38:18 -07:00
rebase-interactive.h rebase -i: remove unused modes and functions 2018-08-29 13:38:18 -07:00
ref-filter.c Merge branch 'jt/commit-graph-per-object-store' 2018-08-02 15:30:47 -07:00
ref-filter.h
reflog-walk.c object: add repository argument to parse_object 2018-06-29 10:43:38 -07:00
reflog-walk.h
refs.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
refs.h
refspec.c Merge branch 'ab/refspec-init-fix' 2018-06-28 12:53:29 -07:00
refspec.h
RelNotes
remote-curl.c
remote-testsvn.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
remote.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
remote.h fetch-pack: implement ref-in-want 2018-06-28 09:33:30 -07:00
replace-object.c
replace-object.h
repository.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
repository.h Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
rerere.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
rerere.h
resolve-undo.c block alloc: add lifecycle APIs for cache_entry structs 2018-07-03 10:58:27 -07:00
resolve-undo.h
revision.c Merge branch 'jt/tags-to-promised-blobs-fix' 2018-08-02 15:30:46 -07:00
revision.h Merge branch 'jt/partial-clone-fsck-connectivity' 2018-07-24 14:50:47 -07:00
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
sequencer.h rebase -i: rewrite write_basic_state() in C 2018-08-29 13:38:18 -07:00
serve.c
serve.h
server-info.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c block alloc: allocate cache entries from mem_pool 2018-07-03 10:58:27 -07:00
split-index.h
strbuf.c builtin rebase: support --continue 2018-09-06 11:55:58 -07:00
strbuf.h Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c 2018-10-11 14:18:19 +09:00
streaming.c
streaming.h
string-list.c string-list.c: avoid conversion from void * to function pointer 2018-07-09 14:37:50 -07:00
string-list.h
sub-process.c
sub-process.h
submodule-config.c Merge branch 'jk/fsck-gitmodules-gently' 2018-08-02 15:30:39 -07:00
submodule-config.h submodule-config: make 'config_from_gitmodules' private 2018-06-26 12:56:12 -07:00
submodule.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
submodule.h
symlinks.c
tag.c Merge branch 'jt/tags-to-promised-blobs-fix' 2018-08-02 15:30:46 -07:00
tag.h tag.c: allow deref_tag to handle arbitrary repositories 2018-06-29 10:43:40 -07:00
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
transport-internal.h fetch-pack: put shallow info in output parameter 2018-06-28 09:33:29 -07:00
transport.c Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
transport.h Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
tree-diff.c
tree-walk.c Merge branch 'bc/object-id' 2018-08-02 15:30:39 -07:00
tree-walk.h
tree.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
tree.h tree: allow lookup_tree to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
unicode-width.h unicode: update the width tables to Unicode 11 2018-07-09 14:02:51 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
unpack-trees.h
upload-pack.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c userdiff: support new keywords in PHP hunk header 2018-07-06 14:59:28 -07:00
userdiff.h
utf8.c utf8.c: avoid char overflow 2018-07-09 14:38:12 -07:00
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
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 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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-.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://public-inbox.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