swh:1:snp:6df5a50b8107b6bbe1e51d0239d816a7503c536a
Revision 16652170bf80542fd77de75fb88da2f7761f65c4 authored by Junio C Hamano on 27 September 2006, 19:34:37 UTC, committed by Junio C Hamano on 27 September 2006, 19:34:37 UTC
This script creates two separate histories, A and B, each of which does: (A0, B0): create fileA and subdir/fileB (A1, B1): modify fileA (A2, B2): modify subdir/fileB and then grafts them together to make B0 a child of A2. So the final history looks like (time flows from top to bottom): true parent touches subdir? A0 none yes (creates it) A1 A0 no A2 A1 yes B0 none yes (different from what's in A2) B1 B0 no B2 B1 yes "git rev-list --parents --pretty=raw B2" would give "fake" parents on the "commit " header lines while "parent " header lines show the parent as recorded in the commit object (i.e. B0 appears to have A2 as its parent on "commit " header but there is no "parent A2" header line in it). When you have path limiters, we simplify history to omit commits that do not affect the specified paths. So "git rev-list --parents --pretty=raw B2 subdir" would return "B2 B0 A2 A0" (because B1 and A1 do not touch the path). When it does so, the "commit " header lines have "fake" parents (i.e. B2 appears to have B0 as its parent on "commit " header), but you can still get the true parents by looking at "parent " header. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 4a0641b
Tip revision: 4fd6c5e44459e6444c2cd93383660134c95aabd1 authored by Junio C Hamano on 23 September 2022, 18:07:49 UTC
Merge branch 'ac/bitmap-lookup-table'
Merge branch 'ac/bitmap-lookup-table'
Tip revision: 4fd6c5e
File | Mode | Size |
---|---|---|
Documentation | ||
arm | ||
compat | ||
contrib | ||
gitweb | ||
mozilla-sha1 | ||
ppc | ||
t | ||
templates | ||
xdiff | ||
.gitignore | -rw-r--r-- | 2.0 KB |
COPYING | -rw-r--r-- | 18.3 KB |
GIT-VERSION-GEN | -rwxr-xr-x | 747 bytes |
INSTALL | -rw-r--r-- | 4.7 KB |
Makefile | -rw-r--r-- | 25.4 KB |
README | -rw-r--r-- | 24.7 KB |
alloc.c | -rw-r--r-- | 1.4 KB |
archive-tar.c | -rw-r--r-- | 8.1 KB |
archive-zip.c | -rw-r--r-- | 8.3 KB |
archive.h | -rw-r--r-- | 1.1 KB |
base85.c | -rw-r--r-- | 2.9 KB |
blame.c | -rw-r--r-- | 20.3 KB |
blob.c | -rw-r--r-- | 1.2 KB |
blob.h | -rw-r--r-- | 311 bytes |
builtin-add.c | -rw-r--r-- | 3.0 KB |
builtin-apply.c | -rw-r--r-- | 64.2 KB |
builtin-archive.c | -rw-r--r-- | 5.7 KB |
builtin-cat-file.c | -rw-r--r-- | 3.2 KB |
builtin-check-ref-format.c | -rw-r--r-- | 282 bytes |
builtin-checkout-index.c | -rw-r--r-- | 7.6 KB |
builtin-commit-tree.c | -rw-r--r-- | 3.3 KB |
builtin-count-objects.c | -rw-r--r-- | 2.8 KB |
builtin-diff-files.c | -rw-r--r-- | 1.3 KB |
builtin-diff-index.c | -rw-r--r-- | 1.0 KB |
builtin-diff-stages.c | -rw-r--r-- | 2.5 KB |
builtin-diff-tree.c | -rw-r--r-- | 3.2 KB |
builtin-diff.c | -rw-r--r-- | 8.6 KB |
builtin-fmt-merge-msg.c | -rw-r--r-- | 7.8 KB |
builtin-grep.c | -rw-r--r-- | 15.9 KB |
builtin-init-db.c | -rw-r--r-- | 8.2 KB |
builtin-log.c | -rw-r--r-- | 11.1 KB |
builtin-ls-files.c | -rw-r--r-- | 11.4 KB |
builtin-ls-tree.c | -rw-r--r-- | 3.5 KB |
builtin-mailinfo.c | -rw-r--r-- | 17.3 KB |
builtin-mailsplit.c | -rw-r--r-- | 4.2 KB |
builtin-mv.c | -rw-r--r-- | 7.3 KB |
builtin-name-rev.c | -rw-r--r-- | 5.4 KB |
builtin-pack-objects.c | -rw-r--r-- | 38.4 KB |
builtin-prune-packed.c | -rw-r--r-- | 1.5 KB |
builtin-prune.c | -rw-r--r-- | 5.5 KB |
builtin-push.c | -rw-r--r-- | 6.3 KB |
builtin-read-tree.c | -rw-r--r-- | 5.9 KB |
builtin-repo-config.c | -rw-r--r-- | 4.7 KB |
builtin-rev-list.c | -rw-r--r-- | 6.3 KB |
builtin-rev-parse.c | -rw-r--r-- | 7.6 KB |
builtin-rm.c | -rw-r--r-- | 3.1 KB |
builtin-runstatus.c | -rw-r--r-- | 798 bytes |
builtin-show-branch.c | -rw-r--r-- | 18.2 KB |
builtin-stripspace.c | -rw-r--r-- | 1.0 KB |
builtin-symbolic-ref.c | -rw-r--r-- | 816 bytes |
builtin-tar-tree.c | -rw-r--r-- | 2.1 KB |
builtin-unpack-objects.c | -rw-r--r-- | 6.8 KB |
builtin-update-index.c | -rw-r--r-- | 16.6 KB |
builtin-update-ref.c | -rw-r--r-- | 1.3 KB |
builtin-upload-archive.c | -rw-r--r-- | 4.2 KB |
builtin-verify-pack.c | -rw-r--r-- | 1.6 KB |
builtin-write-tree.c | -rw-r--r-- | 2.1 KB |
builtin.h | -rw-r--r-- | 4.2 KB |
cache-tree.c | -rw-r--r-- | 12.5 KB |
cache-tree.h | -rw-r--r-- | 921 bytes |
cache.h | -rw-r--r-- | 15.4 KB |
check-racy.c | -rw-r--r-- | 517 bytes |
color.c | -rw-r--r-- | 3.2 KB |
color.h | -rw-r--r-- | 376 bytes |
combine-diff.c | -rw-r--r-- | 24.1 KB |
commit.c | -rw-r--r-- | 22.6 KB |
commit.h | -rw-r--r-- | 3.2 KB |
config.c | -rw-r--r-- | 15.6 KB |
config.mak.in | -rw-r--r-- | 953 bytes |
configure.ac | -rw-r--r-- | 12.4 KB |
connect.c | -rw-r--r-- | 16.1 KB |
convert-objects.c | -rw-r--r-- | 7.4 KB |
copy.c | -rw-r--r-- | 692 bytes |
csum-file.c | -rw-r--r-- | 2.9 KB |
csum-file.h | -rw-r--r-- | 566 bytes |
ctype.c | -rw-r--r-- | 890 bytes |
daemon.c | -rw-r--r-- | 22.8 KB |
date.c | -rw-r--r-- | 16.2 KB |
delta.h | -rw-r--r-- | 3.2 KB |
describe.c | -rw-r--r-- | 3.7 KB |
diff-delta.c | -rw-r--r-- | 14.0 KB |
diff-lib.c | -rw-r--r-- | 8.7 KB |
diff.c | -rw-r--r-- | 63.5 KB |
diff.h | -rw-r--r-- | 6.3 KB |
diffcore-break.c | -rw-r--r-- | 8.5 KB |
diffcore-delta.c | -rw-r--r-- | 5.1 KB |
diffcore-order.c | -rw-r--r-- | 2.2 KB |
diffcore-pickaxe.c | -rw-r--r-- | 3.2 KB |
diffcore-rename.c | -rw-r--r-- | 12.8 KB |
diffcore.h | -rw-r--r-- | 3.7 KB |
dir.c | -rw-r--r-- | 8.9 KB |
dir.h | -rw-r--r-- | 1.3 KB |
dump-cache-tree.c | -rw-r--r-- | 1.5 KB |
entry.c | -rw-r--r-- | 4.1 KB |
environment.c | -rw-r--r-- | 2.1 KB |
exec_cmd.c | -rw-r--r-- | 2.8 KB |
exec_cmd.h | -rw-r--r-- | 295 bytes |
fetch-clone.c | -rw-r--r-- | 6.4 KB |
fetch-pack.c | -rw-r--r-- | 11.9 KB |
fetch.c | -rw-r--r-- | 6.5 KB |
fetch.h | -rw-r--r-- | 1.6 KB |
fsck-objects.c | -rw-r--r-- | 13.7 KB |
generate-cmdlist.sh | -rwxr-xr-x | 558 bytes |
git-am.sh | -rwxr-xr-x | 10.8 KB |
git-annotate.perl | -rwxr-xr-x | 14.8 KB |
git-applymbox.sh | -rwxr-xr-x | 2.8 KB |
git-applypatch.sh | -rwxr-xr-x | 5.4 KB |
git-archimport.perl | -rwxr-xr-x | 34.2 KB |
git-bisect.sh | -rwxr-xr-x | 5.7 KB |
git-branch.sh | -rwxr-xr-x | 2.6 KB |
git-checkout.sh | -rwxr-xr-x | 4.9 KB |
git-cherry.sh | -rwxr-xr-x | 1.8 KB |
git-clean.sh | -rwxr-xr-x | 1.5 KB |
git-clone.sh | -rwxr-xr-x | 9.9 KB |
git-commit.sh | -rwxr-xr-x | 14.5 KB |
git-compat-util.h | -rw-r--r-- | 4.2 KB |
git-cvsexportcommit.perl | -rwxr-xr-x | 8.2 KB |
git-cvsimport.perl | -rwxr-xr-x | 23.4 KB |
git-cvsserver.perl | -rwxr-xr-x | 89.4 KB |
git-fetch.sh | -rwxr-xr-x | 10.3 KB |
git-instaweb.sh | -rwxr-xr-x | 4.9 KB |
git-lost-found.sh | -rwxr-xr-x | 468 bytes |
git-ls-remote.sh | -rwxr-xr-x | 2.1 KB |
git-merge-octopus.sh | -rwxr-xr-x | 2.4 KB |
git-merge-one-file.sh | -rwxr-xr-x | 2.7 KB |
git-merge-ours.sh | -rwxr-xr-x | 356 bytes |
git-merge-recursive.py | -rwxr-xr-x | 30.8 KB |
git-merge-resolve.sh | -rwxr-xr-x | 955 bytes |
git-merge-stupid.sh | -rwxr-xr-x | 1.4 KB |
git-merge.sh | -rwxr-xr-x | 8.1 KB |
git-p4import.py | -rw-r--r-- | 10.5 KB |
git-parse-remote.sh | -rwxr-xr-x | 5.4 KB |
git-pull.sh | -rwxr-xr-x | 2.6 KB |
git-quiltimport.sh | -rwxr-xr-x | 3.0 KB |
git-rebase.sh | -rwxr-xr-x | 8.0 KB |
git-relink.perl | -rwxr-xr-x | 4.0 KB |
git-repack.sh | -rwxr-xr-x | 2.4 KB |
git-request-pull.sh | -rwxr-xr-x | 844 bytes |
git-rerere.perl | -rwxr-xr-x | 4.8 KB |
git-reset.sh | -rwxr-xr-x | 1.4 KB |
git-resolve.sh | -rwxr-xr-x | 2.6 KB |
git-revert.sh | -rwxr-xr-x | 4.0 KB |
git-send-email.perl | -rwxr-xr-x | 15.0 KB |
git-sh-setup.sh | -rwxr-xr-x | 1014 bytes |
git-shortlog.perl | -rwxr-xr-x | 4.0 KB |
git-svn.perl | -rwxr-xr-x | 87.2 KB |
git-svnimport.perl | -rwxr-xr-x | 23.1 KB |
git-tag.sh | -rwxr-xr-x | 2.2 KB |
git-verify-tag.sh | -rwxr-xr-x | 703 bytes |
git.c | -rw-r--r-- | 9.1 KB |
git.spec.in | -rw-r--r-- | 6.3 KB |
gitMergeCommon.py | -rw-r--r-- | 6.9 KB |
gitk | -rwxr-xr-x | 170.1 KB |
grep.c | -rw-r--r-- | 10.4 KB |
grep.h | -rw-r--r-- | 1.5 KB |
hash-object.c | -rw-r--r-- | 1.8 KB |
help.c | -rw-r--r-- | 4.8 KB |
http-fetch.c | -rw-r--r-- | 32.4 KB |
http-push.c | -rw-r--r-- | 66.2 KB |
http.c | -rw-r--r-- | 11.1 KB |
http.h | -rw-r--r-- | 2.4 KB |
ident.c | -rw-r--r-- | 5.1 KB |
imap-send.c | -rw-r--r-- | 28.4 KB |
index-pack.c | -rw-r--r-- | 11.6 KB |
interpolate.c | -rw-r--r-- | 1.7 KB |
interpolate.h | -rw-r--r-- | 433 bytes |
list-objects.c | -rw-r--r-- | 3.3 KB |
list-objects.h | -rw-r--r-- | 382 bytes |
local-fetch.c | -rw-r--r-- | 6.1 KB |
lockfile.c | -rw-r--r-- | 1.5 KB |
log-tree.c | -rw-r--r-- | 8.7 KB |
log-tree.h | -rw-r--r-- | 386 bytes |
merge-base.c | -rw-r--r-- | 1.2 KB |
merge-file.c | -rw-r--r-- | 3.3 KB |
merge-index.c | -rw-r--r-- | 2.7 KB |
merge-recursive.c | -rw-r--r-- | 34.5 KB |
merge-tree.c | -rw-r--r-- | 7.8 KB |
mktag.c | -rw-r--r-- | 3.9 KB |
mktree.c | -rw-r--r-- | 3.1 KB |
object-refs.c | -rw-r--r-- | 3.0 KB |
object.c | -rw-r--r-- | 5.1 KB |
object.h | -rw-r--r-- | 2.1 KB |
pack-check.c | -rw-r--r-- | 4.2 KB |
pack-redundant.c | -rw-r--r-- | 14.3 KB |
pack.h | -rw-r--r-- | 519 bytes |
pager.c | -rw-r--r-- | 973 bytes |
patch-delta.c | -rw-r--r-- | 2.1 KB |
patch-id.c | -rw-r--r-- | 1.6 KB |
path-list.c | -rw-r--r-- | 2.3 KB |
path-list.h | -rw-r--r-- | 603 bytes |
path.c | -rw-r--r-- | 6.0 KB |
peek-remote.c | -rw-r--r-- | 1.3 KB |
pkt-line.c | -rw-r--r-- | 2.4 KB |
pkt-line.h | -rw-r--r-- | 348 bytes |
quote.c | -rw-r--r-- | 7.0 KB |
quote.h | -rw-r--r-- | 1.8 KB |
read-cache.c | -rw-r--r-- | 24.8 KB |
receive-pack.c | -rw-r--r-- | 8.1 KB |
refs.c | -rw-r--r-- | 12.2 KB |
refs.h | -rw-r--r-- | 1.6 KB |
revision.c | -rw-r--r-- | 28.6 KB |
revision.h | -rw-r--r-- | 2.9 KB |
rsh.c | -rw-r--r-- | 1.8 KB |
rsh.h | -rw-r--r-- | 159 bytes |
run-command.c | -rw-r--r-- | 1.5 KB |
run-command.h | -rw-r--r-- | 523 bytes |
send-pack.c | -rw-r--r-- | 9.8 KB |
server-info.c | -rw-r--r-- | 5.1 KB |
setup.c | -rw-r--r-- | 6.2 KB |
sha1_file.c | -rw-r--r-- | 43.1 KB |
sha1_name.c | -rw-r--r-- | 12.5 KB |
shell.c | -rw-r--r-- | 1.1 KB |
show-index.c | -rw-r--r-- | 593 bytes |
sideband.c | -rw-r--r-- | 1.9 KB |
sideband.h | -rw-r--r-- | 348 bytes |
ssh-fetch.c | -rw-r--r-- | 3.6 KB |
ssh-pull.c | -rw-r--r-- | 154 bytes |
ssh-push.c | -rw-r--r-- | 155 bytes |
ssh-upload.c | -rw-r--r-- | 2.8 KB |
strbuf.c | -rw-r--r-- | 807 bytes |
strbuf.h | -rw-r--r-- | 216 bytes |
tag.c | -rw-r--r-- | 2.6 KB |
tag.h | -rw-r--r-- | 471 bytes |
tar.h | -rw-r--r-- | 644 bytes |
test-date.c | -rw-r--r-- | 416 bytes |
test-delta.c | -rw-r--r-- | 1.8 KB |
test-sha1.c | -rw-r--r-- | 815 bytes |
test-sha1.sh | -rwxr-xr-x | 1.9 KB |
trace.c | -rw-r--r-- | 3.9 KB |
tree-diff.c | -rw-r--r-- | 5.7 KB |
tree-walk.c | -rw-r--r-- | 4.3 KB |
tree-walk.h | -rw-r--r-- | 863 bytes |
tree.c | -rw-r--r-- | 5.0 KB |
tree.h | -rw-r--r-- | 860 bytes |
unpack-file.c | -rw-r--r-- | 812 bytes |
unpack-trees.c | -rw-r--r-- | 18.0 KB |
unpack-trees.h | -rw-r--r-- | 865 bytes |
update-server-info.c | -rw-r--r-- | 457 bytes |
upload-pack.c | -rw-r--r-- | 10.9 KB |
usage.c | -rw-r--r-- | 1.5 KB |
var.c | -rw-r--r-- | 1.3 KB |
write_or_die.c | -rw-r--r-- | 831 bytes |
wt-status.c | -rw-r--r-- | 7.0 KB |
wt-status.h | -rw-r--r-- | 451 bytes |
xdiff-interface.c | -rw-r--r-- | 2.2 KB |
xdiff-interface.h | -rw-r--r-- | 446 bytes |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...