diff options
117 files changed, 1060 insertions, 364 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 01fad8ea5d..aecae676de 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -59,13 +59,13 @@ clean: rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html %.html : %.txt - asciidoc -b xhtml11 -d manpage $< + asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< %.1 %.7 : %.xml xmlto man $< %.xml : %.txt - asciidoc -b docbook -d manpage $< + asciidoc -b docbook -d manpage -f asciidoc.conf $< git.html: git.txt ../README diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf new file mode 100644 index 0000000000..baefb2f0da --- /dev/null +++ b/Documentation/asciidoc.conf @@ -0,0 +1,21 @@ +## gitlink: macro +# +# Usage: gitlink:command[manpage-section] +# +# Note, {0} is the manpage section, while {target} is the command. +# +# Show GIT link as: <command>(<section>); if section is defined, else just show +# the command. + +ifdef::backend-docbook[] +[gitlink-inlinemacro] +{0%{target}} +{0#<citerefentry>} +{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>} +{0#</citerefentry>} +endif::backend-docbook[] + +ifdef::backend-xhtml11[] +[gitlink-inlinemacro] +<a href="{target}.html">{target}{0?({0})}</a> +endif::backend-xhtml11[] diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index beb450075b..ae1ea762f5 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -29,5 +29,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 391d6f5c2f..4f7e1195de 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -72,5 +72,5 @@ Documentation by Junio C Hamano GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index f6d857cda4..5022643ad1 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -67,7 +67,7 @@ OPTIONS SEE ALSO -------- -link:git-applypatch.html[git-applypatch]. +gitlink:git-applypatch[1]. Author @@ -80,5 +80,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-applypatch.txt b/Documentation/git-applypatch.txt index b8946321d3..4046360217 100644 --- a/Documentation/git-applypatch.txt +++ b/Documentation/git-applypatch.txt @@ -46,5 +46,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index fa0779b39e..6054731741 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -78,5 +78,5 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kern GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index f10df535a5..b124b0751c 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -96,5 +96,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 914c0e6a5a..a2a0cfb7be 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -35,5 +35,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 2131a29993..44983b692d 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -57,5 +57,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt index bb15214c98..1ba6fb2d9c 100644 --- a/Documentation/git-checkout-index.txt +++ b/Documentation/git-checkout-index.txt @@ -102,5 +102,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 3bc7743ef6..f753c149a5 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -39,5 +39,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 38a4875248..e6a8c87853 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -53,5 +53,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 9ff7bc25c1..af87966e51 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -38,5 +38,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-clone-pack.txt b/Documentation/git-clone-pack.txt index 0dc89a9072..83d17a055f 100644 --- a/Documentation/git-clone-pack.txt +++ b/Documentation/git-clone-pack.txt @@ -61,5 +61,5 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index cff87ea1dc..bd53ef430d 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -56,5 +56,5 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 5536668813..705be4e334 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -75,7 +75,7 @@ Your sysadmin must hate you!:: See Also -------- -link:git-write-tree.html[git-write-tree] +gitlink:git-write-tree[1] Author @@ -88,5 +88,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index afcf6ef858..790a8eb0dd 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -69,4 +69,4 @@ Junio C Hamano <junkio@cox.net> GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-convert-objects.txt b/Documentation/git-convert-objects.txt index b1bc1c5752..6ce62dc672 100644 --- a/Documentation/git-convert-objects.txt +++ b/Documentation/git-convert-objects.txt @@ -26,5 +26,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt index 824852c7a1..36888d98bf 100644 --- a/Documentation/git-count-objects.txt +++ b/Documentation/git-count-objects.txt @@ -24,5 +24,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index edf952122f..cd01994877 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -105,5 +105,5 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 5fc45f2158..348a7cacd7 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -42,5 +42,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 72c7a718f5..eb9fb74259 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -40,5 +40,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt index 26f5f3950a..047e39272f 100644 --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -35,7 +35,7 @@ OPTIONS See Also -------- -The section on generating patches in link:git-diff-index.html[git-diff-index] +The section on generating patches in gitlink:git-diff-index[1] Author @@ -49,5 +49,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 12bfcb3243..56ed673eda 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -130,5 +130,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt index 2084c7041f..276d7bdc43 100644 --- a/Documentation/git-diff-stages.txt +++ b/Documentation/git-diff-stages.txt @@ -38,4 +38,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 9ec4b29ff7..5aa4adcc4c 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -126,5 +126,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index fc37ea7412..cadaf59455 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -48,5 +48,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-export.txt b/Documentation/git-export.txt index d2d0dc498e..2666a1eb05 100644 --- a/Documentation/git-export.txt +++ b/Documentation/git-export.txt @@ -27,5 +27,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index 59afa14a30..1d281820cf 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -66,4 +66,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 8c1cc07048..0906510002 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -44,4 +44,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index b314c3a0f2..a1483ffd0f 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -65,5 +65,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt index 2b8640439b..715defd2f6 100644 --- a/Documentation/git-fsck-objects.txt +++ b/Documentation/git-fsck-objects.txt @@ -141,5 +141,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt index 0eb5e2889c..30b1fbf6e7 100644 --- a/Documentation/git-get-tar-commit-id.txt +++ b/Documentation/git-get-tar-commit-id.txt @@ -33,5 +33,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index c275ae26fd..5f082167c1 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -43,5 +43,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 4dd06f7c89..935cc66b38 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -40,5 +40,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt index 9cd862e03d..c034272568 100644 --- a/Documentation/git-http-fetch.txt +++ b/Documentation/git-http-fetch.txt @@ -38,5 +38,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt index fb8b52253e..ef2d04a612 100644 --- a/Documentation/git-init-db.txt +++ b/Documentation/git-init-db.txt @@ -37,5 +37,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt index aad7d99af1..ccf9735924 100644 --- a/Documentation/git-local-fetch.txt +++ b/Documentation/git-local-fetch.txt @@ -40,5 +40,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index d1c24f7b0c..2a0e5aceab 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -41,5 +41,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 9c5ef8e7a4..591f4ed462 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -1,6 +1,5 @@ git-ls-files(1) =============== -v0.1, May 2005 NAME ---- @@ -10,8 +9,8 @@ git-ls-files - Information about files in the cache/working directory SYNOPSIS -------- 'git-ls-files' [-z] [-t] - (--[cached|deleted|others|ignored|stage|unmerged|killed])\* - (-[c|d|o|i|s|u|k])\* + (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])\* + (-[c|d|o|i|s|u|k|m])\* [-x <pattern>|--exclude=<pattern>] [-X <file>|--exclude-from=<file>] [--exclude-per-directory=<file>] @@ -33,6 +32,9 @@ OPTIONS -d|--deleted:: Show deleted files in the output +-m|--modified:: + Show modified files in the output + -o|--others:: Show other files in the output @@ -71,6 +73,7 @@ OPTIONS H cached M unmerged R removed/deleted + C modifed/changed K to be killed ? other @@ -180,7 +183,7 @@ An example: See Also -------- -link:git-read-tree.html[git-read-tree] +gitlink:git-read-tree[1] Author @@ -193,5 +196,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index c3152b17e7..89bd609d65 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -60,5 +60,5 @@ Written by Junio C Hamano <junkio@cox.net> GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt index fdb215ec60..0d159fd5cc 100644 --- a/Documentation/git-ls-tree.txt +++ b/Documentation/git-ls-tree.txt @@ -51,5 +51,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index eb3a3d1be7..dc7d725ea1 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -61,5 +61,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt index 789d3a9f1e..557d2e9056 100644 --- a/Documentation/git-mailsplit.txt +++ b/Documentation/git-mailsplit.txt @@ -32,5 +32,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 1e27bf2301..e4692163ea 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -30,5 +30,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 1b99f2b3cd..5caee90adc 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -85,5 +85,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index b84d14d8b6..712739777b 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -27,5 +27,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a48697ff34..dca363dd5e 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -49,4 +49,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt index 708f4ef8da..44ed4b5408 100644 --- a/Documentation/git-mktag.txt +++ b/Documentation/git-mktag.txt @@ -44,5 +44,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-octopus.txt b/Documentation/git-octopus.txt index 7a9cc542d3..881c317ac5 100644 --- a/Documentation/git-octopus.txt +++ b/Documentation/git-octopus.txt @@ -35,5 +35,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 5ce195c5a4..970150a128 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -80,5 +80,5 @@ git-repack(1) git-prune-packed(1) GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt index 7ee0145ea5..fc27afe26d 100644 --- a/Documentation/git-parse-remote.txt +++ b/Documentation/git-parse-remote.txt @@ -45,4 +45,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index b6fa2a8b39..3e560a37e8 100644 --- a/Documentation/git-patch-id.txt +++ b/Documentation/git-patch-id.txt @@ -33,5 +33,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt index 90075403dc..c1527f1bcf 100644 --- a/Documentation/git-peek-remote.txt +++ b/Documentation/git-peek-remote.txt @@ -49,5 +49,5 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt index 3fca275bc5..0cb19b0058 100644 --- a/Documentation/git-prune-packed.txt +++ b/Documentation/git-prune-packed.txt @@ -38,5 +38,5 @@ git-pack-objects(1) git-repack(1) GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt index f368427547..d1676cbfc8 100644 --- a/Documentation/git-prune.txt +++ b/Documentation/git-prune.txt @@ -39,5 +39,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 235a036b9d..c35d2eb54c 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -37,5 +37,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index b8993eba08..809ac8ba06 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -32,5 +32,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index d9c5a13125..0639bd04b2 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -9,7 +9,7 @@ git-read-tree - Reads tree information into the directory cache SYNOPSIS -------- -'git-read-tree' (<tree-ish> | [-m [-u]] <tree-ish1> [<tree-ish2> [<tree-ish3>]]) +'git-read-tree' (<tree-ish> | [-m [-u|-i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]]) DESCRIPTION @@ -35,6 +35,16 @@ OPTIONS After a successful merge, update the files in the work tree with the result of the merge. +-i:: + Usually a merge requires the index file as well as the + files in the working tree are up to date with the + current head commit, in order not to lose local + changes. This flag disables the check with the working + tree and is meant to be used when creating a merge of + trees that are not directly related to the current + working tree status into a temporary index file. + + <tree-ish#>:: The id of the tree object(s) to be read/merged. @@ -251,7 +261,7 @@ updated to the result of the merge. See Also -------- -link:git-write-tree.html[git-write-tree]; link:git-ls-files.html[git-ls-files] +gitlink:git-write-tree[1]; gitlink:git-ls-files[1] Author @@ -264,5 +274,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 09bd3289e9..16c158f439 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -31,5 +31,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt index 2c6065fcb1..fb4b76b6c2 100644 --- a/Documentation/git-receive-pack.txt +++ b/Documentation/git-receive-pack.txt @@ -80,7 +80,7 @@ OPTIONS SEE ALSO -------- -link:git-send-pack.html[git-send-pack] +gitlink:git-send-pack[1] Author @@ -93,4 +93,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt index 25975ae402..62405358fc 100644 --- a/Documentation/git-relink.txt +++ b/Documentation/git-relink.txt @@ -33,5 +33,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-rename.txt b/Documentation/git-rename.txt index 2c24bfa2ee..21928dc071 100644 --- a/Documentation/git-rename.txt +++ b/Documentation/git-rename.txt @@ -29,5 +29,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index d8e3ad0933..2e95e111f3 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -55,5 +55,5 @@ git-pack-objects(1) git-prune-packed(1) GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt index 27a66acc4a..2463ec91d5 100644 --- a/Documentation/git-request-pull.txt +++ b/Documentation/git-request-pull.txt @@ -36,5 +36,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a6567c4e26..31ec2076e7 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -41,5 +41,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index d058318194..7d3eb79033 100644 --- a/Documentation/git-resolve.txt +++ b/Documentation/git-resolve.txt @@ -33,5 +33,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 32c06a1662..02ee93ee41 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -95,5 +95,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 067e4f0025..e2d94ff335 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -122,5 +122,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-rev-tree.txt b/Documentation/git-rev-tree.txt index 2ec7ed073b..aa98f64b94 100644 --- a/Documentation/git-rev-tree.txt +++ b/Documentation/git-rev-tree.txt @@ -84,5 +84,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index a3f9a5655b..47476586d9 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -44,5 +44,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index fa11efc83c..a2763bd74f 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -75,5 +75,5 @@ Documentation by Ryan Anderson GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index 5ed25f54d1..1837fb79c7 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -108,4 +108,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt index fcf2cdfd54..a02a2b051c 100644 --- a/Documentation/git-sh-setup.txt +++ b/Documentation/git-sh-setup.txt @@ -30,5 +30,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 6968ca6060..a852e9b865 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -27,5 +27,5 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 39e0682ee7..5b80d5aa2a 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -117,4 +117,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt index beefe947af..72720ada22 100644 --- a/Documentation/git-show-index.txt +++ b/Documentation/git-show-index.txt @@ -32,5 +32,5 @@ Documentation by Junio C Hamano GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt index 4ef03f6c61..e3887ace09 100644 --- a/Documentation/git-ssh-fetch.txt +++ b/Documentation/git-ssh-fetch.txt @@ -48,5 +48,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt index f1aa0df5d1..b625019812 100644 --- a/Documentation/git-ssh-upload.txt +++ b/Documentation/git-ssh-upload.txt @@ -44,5 +44,5 @@ Documentation by Daniel Barkalow GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 886fb7c02c..6d49a5aa0d 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -42,5 +42,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt index 4f82efb4f9..528a1b6ce3 100644 --- a/Documentation/git-stripspace.txt +++ b/Documentation/git-stripspace.txt @@ -29,5 +29,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 0e1be72470..1e0d4f5f46 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -36,4 +36,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt index 9323dddfa7..480a0cf0ba 100644 --- a/Documentation/git-tar-tree.txt +++ b/Documentation/git-tar-tree.txt @@ -35,5 +35,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt index 2f2130d511..3903b2d99b 100644 --- a/Documentation/git-unpack-file.txt +++ b/Documentation/git-unpack-file.txt @@ -33,5 +33,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt index a42a75e077..9b982d996f 100644 --- a/Documentation/git-unpack-objects.txt +++ b/Documentation/git-unpack-objects.txt @@ -35,5 +35,5 @@ Documentation by Junio C Hamano GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 54b5f24c17..8d55659ede 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -122,5 +122,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt index 39222c3b4c..2efd5400a7 100644 --- a/Documentation/git-update-server-info.txt +++ b/Documentation/git-update-server-info.txt @@ -55,5 +55,5 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt index be597a1787..98815b6a10 100644 --- a/Documentation/git-upload-pack.txt +++ b/Documentation/git-upload-pack.txt @@ -37,4 +37,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index ebe87d6847..31f80a8b30 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -43,8 +43,8 @@ Your sysadmin must hate you!:: See Also -------- -link:git-commit-tree.html[git-commit-tree] -link:git-tag.html[git-tag] +gitlink:git-commit-tree[1] +gitlink:git-tag[1] Author ------ @@ -56,5 +56,5 @@ Documentation by Eric Biederman and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index d1043eb8df..a99172ca1e 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -45,5 +45,5 @@ Documentation by Junio C Hamano GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.txt index 98db1b363b..b8a73c47af 100644 --- a/Documentation/git-verify-tag.txt +++ b/Documentation/git-verify-tag.txt @@ -28,5 +28,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index 742005353a..056a9697c6 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -57,5 +57,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt index 5cd54ab587..71e16d128a 100644 --- a/Documentation/git-write-tree.txt +++ b/Documentation/git-write-tree.txt @@ -39,5 +39,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/git.txt b/Documentation/git.txt index bec562e30e..228f2fc3dd 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -21,8 +21,8 @@ at the link:tutorial.html[tutorial] document. The <<Discussion>> section below contains much useful definition and clarification info - read that first. And of the commands, I suggest -reading link:git-update-index.html[git-update-index] and -link:git-read-tree.html[git-read-tree] first - I wish I had! +reading gitlink:git-update-index[1] and +gitlink:git-read-tree[1] first - I wish I had! If you are migrating from CVS, link:cvs-migration.html[cvs migration] document may be helpful after you finish the tutorial. @@ -55,104 +55,104 @@ SCMs layered over git. Manipulation commands ~~~~~~~~~~~~~~~~~~~~~ -link:git-apply.html[git-apply]:: +gitlink:git-apply[1]:: Reads a "diff -up1" or git generated patch file and applies it to the working tree. -link:git-checkout-index.html[git-checkout-index]:: +gitlink:git-checkout-index[1]:: Copy files from the cache to the working directory Previously this command was known as git-checkout-cache. -link:git-commit-tree.html[git-commit-tree]:: +gitlink:git-commit-tree[1]:: Creates a new commit object -link:git-hash-object.html[git-hash-object]:: +gitlink:git-hash-object[1]:: Computes the object ID from a file. -link:git-init-db.html[git-init-db]:: +gitlink:git-init-db[1]:: Creates an empty git object database -link:git-merge-index.html[git-merge-index]:: +gitlink:git-merge-index[1]:: Runs a merge for files needing merging Previously this command was known as git-merge-cache. -link:git-mktag.html[git-mktag]:: +gitlink:git-mktag[1]:: Creates a tag object -link:git-pack-objects.html[git-pack-objects]:: +gitlink:git-pack-objects[1]:: Creates a packed archive of objects. -link:git-prune-packed.html[git-prune-packed]:: +gitlink:git-prune-packed[1]:: Remove extra objects that are already in pack files. -link:git-read-tree.html[git-read-tree]:: +gitlink:git-read-tree[1]:: Reads tree information into the directory cache -link:git-unpack-objects.html[git-unpack-objects]:: +gitlink:git-unpack-objects[1]:: Unpacks objects out of a packed archive. -link:git-update-index.html[git-update-index]:: +gitlink:git-update-index[1]:: Modifies the index or directory cache Previously this command was known as git-update-cache. -link:git-write-tree.html[git-write-tree]:: +gitlink:git-write-tree[1]:: Creates a tree from the current cache Interrogation commands ~~~~~~~~~~~~~~~~~~~~~~ -link:git-cat-file.html[git-cat-file]:: +gitlink:git-cat-file[1]:: Provide content or type information for repository objects -link:git-diff-index.html[git-diff-index]:: +gitlink:git-diff-index[1]:: Compares content and mode of blobs between the cache and repository Previously this command was known as git-diff-cache. -link:git-diff-files.html[git-diff-files]:: +gitlink:git-diff-files[1]:: Compares files in the working tree and the cache -link:git-diff-stages.html[git-diff-stages]:: +gitlink:git-diff-stages[1]:: Compares two "merge stages" in the index file. -link:git-diff-tree.html[git-diff-tree]:: +gitlink:git-diff-tree[1]:: Compares the content and mode of blobs found via two tree objects -link:git-export.html[git-export]:: +gitlink:git-export[1]:: Exports each commit and a diff against each of its parents -link:git-fsck-objects.html[git-fsck-objects]:: +gitlink:git-fsck-objects[1]:: Verifies the connectivity and validity of the objects in the database Previously this command was known as git-fsck-cache. -link:git-ls-files.html[git-ls-files]:: +gitlink:git-ls-files[1]:: Information about files in the cache/working directory -link:git-ls-tree.html[git-ls-tree]:: +gitlink:git-ls-tree[1]:: Displays a tree object in human readable form -link:git-merge-base.html[git-merge-base]:: +gitlink:git-merge-base[1]:: Finds as good a common ancestor as possible for a merge -link:git-rev-list.html[git-rev-list]:: +gitlink:git-rev-list[1]:: Lists commit objects in reverse chronological order -link:git-rev-tree.html[git-rev-tree]:: +gitlink:git-rev-tree[1]:: Provides the revision tree for one or more commits -link:git-show-index.html[git-show-index]:: +gitlink:git-show-index[1]:: Displays contents of a pack idx file. -link:git-tar-tree.html[git-tar-tree]:: +gitlink:git-tar-tree[1]:: Creates a tar archive of the files in the named tree -link:git-unpack-file.html[git-unpack-file]:: +gitlink:git-unpack-file[1]:: Creates a temporary file with a blob's contents -link:git-var.html[git-var]:: +gitlink:git-var[1]:: Displays a git logical variable -link:git-verify-pack.html[git-verify-pack]:: +gitlink:git-verify-pack[1]:: Validates packed GIT archive files The interrogate commands may create files - and you can force them to @@ -162,43 +162,43 @@ touch the working file set - but in general they don't Synching repositories ~~~~~~~~~~~~~~~~~~~~~ -link:git-clone-pack.html[git-clone-pack]:: +gitlink:git-clone-pack[1]:: Clones a repository into the current repository (engine for ssh and local transport) -link:git-fetch-pack.html[git-fetch-pack]:: +gitlink:git-fetch-pack[1]:: Updates from a remote repository. -link:git-http-fetch.html[git-http-fetch]:: +gitlink:git-http-fetch[1]:: Downloads a remote GIT repository via HTTP Previously this command was known as git-http-pull. -link:git-local-fetch.html[git-local-fetch]:: +gitlink:git-local-fetch[1]:: Duplicates another GIT repository on a local system Previously this command was known as git-local-pull. -link:git-peek-remote.html[git-peek-remote]:: +gitlink:git-peek-remote[1]:: Lists references on a remote repository using upload-pack protocol. -link:git-receive-pack.html[git-receive-pack]:: +gitlink:git-receive-pack[1]:: Invoked by 'git-send-pack' to receive what is pushed to it. -link:git-send-pack.html[git-send-pack]:: +gitlink:git-send-pack[1]:: Pushes to a remote repository, intelligently. -link:git-ssh-fetch.html[git-ssh-fetch]:: +gitlink:git-ssh-fetch[1]:: Pulls from a remote repository over ssh connection Previously this command was known as git-ssh-pull. -link:git-ssh-upload.html[git-ssh-upload]:: +gitlink:git-ssh-upload[1]:: Helper "server-side" program used by git-ssh-fetch Previously this command was known as git-ssh-push. -link:git-update-server-info.html[git-update-server-info]:: +gitlink:git-update-server-info[1]:: Updates auxiliary information on a dumb server to help clients discover references and packs on it. -link:git-upload-pack.html[git-upload-pack]:: +gitlink:git-upload-pack[1]:: Invoked by 'git-clone-pack' and 'git-fetch-pack' to push what are asked for. @@ -206,114 +206,114 @@ link:git-upload-pack.html[git-upload-pack]:: Porcelain-ish Commands ---------------------- -link:git-add.html[git-add]:: +gitlink:git-add[1]:: Add paths to the index file. Previously this command was known as git-add-script. -link:git-applymbox.html[git-applymbox]:: +gitlink:git-applymbox[1]:: Apply patches from a mailbox. -link:git-bisect.html[git-bisect]:: +gitlink:git-bisect[1]:: Find the change that introduced a bug. Previously this command was known as git-bisect-script. -link:git-branch.html[git-branch]:: +gitlink:git-branch[1]:: Create and Show branches. Previously this command was known as git-branch-script. -link:git-checkout.html[git-checkout]:: +gitlink:git-checkout[1]:: Checkout and switch to a branch. Previously this command was known as git-checkout-script. -link:git-cherry-pick.html[git-cherry-pick]:: +gitlink:git-cherry-pick[1]:: Cherry-pick the effect of an existing commit. Previously this command was known as git-cherry-pick-script. -link:git-clone.html[git-clone]:: +gitlink:git-clone[1]:: Clones a repository into a new directory. Previously this command was known as git-clone-script. -link:git-commit.html[git-commit]:: +gitlink:git-commit[1]:: Record changes to the repository. Previously this command was known as git-commit-script. -link:git-diff.html[git-diff]:: +gitlink:git-diff[1]:: Show changes between commits, commit and working tree, etc. Previously this command was known as git-diff-script. -link:git-fetch.html[git-fetch]:: +gitlink:git-fetch[1]:: Download from a remote repository via various protocols. Previously this command was known as git-fetch-script. -link:git-format-patch.html[git-format-patch]:: +gitlink:git-format-patch[1]:: Prepare patches for e-mail submission. Previously this command was known as git-format-patch-script. -link:git-grep.html[git-grep]:: +gitlink:git-grep[1]:: Print lines matching a pattern -link:git-log.html[git-log]:: +gitlink:git-log[1]:: Shows commit logs. Previously this command was known as git-log-script. -link:git-ls-remote.html[git-ls-remote]:: +gitlink:git-ls-remote[1]:: Shows references in a remote or local repository. Previously this command was known as git-ls-remote-script. -link:git-merge.html[git-merge]:: +gitlink:git-merge[1]:: Grand unified merge driver. -link:git-octopus.html[git-octopus]:: +gitlink:git-octopus[1]:: Merge more than two commits. Previously this command was known as git-octopus-script. -link:git-pull.html[git-pull]:: +gitlink:git-pull[1]:: Fetch from and merge with a remote repository. Previously this command was known as git-pull-script. -link:git-push.html[git-push]:: +gitlink:git-push[1]:: Update remote refs along with associated objects. Previously this command was known as git-push-script. -link:git-rebase.html[git-rebase]:: +gitlink:git-rebase[1]:: Rebase local commits to new upstream head. Previously this command was known as git-rebase-script. -link:git-rename.html[git-rename]:: +gitlink:git-rename[1]:: Rename files and directories. Previously this command was known as git-rename-script. -link:git-repack.html[git-repack]:: +gitlink:git-repack[1]:: Pack unpacked objects in a repository. Previously this command was known as git-repack-script. -link:git-reset.html[git-reset]:: +gitlink:git-reset[1]:: Reset current HEAD to the specified state. Previously this command was known as git-reset-script. -link:git-resolve.html[git-resolve]:: +gitlink:git-resolve[1]:: Merge two commits. Previously this command was known as git-resolve-script. -link:git-revert.html[git-revert]:: +gitlink:git-revert[1]:: Revert an existing commit. Previously this command was known as git-revert-script. -link:git-shortlog.html[git-shortlog]:: +gitlink:git-shortlog[1]:: Summarizes 'git log' output. -link:git-show-branch.html[git-show-branch]:: +gitlink:git-show-branch[1]:: Show branches and their commits. -link:git-status.html[git-status]:: +gitlink:git-status[1]:: Shows the working tree status. Previously this command was known as git-status-script. -link:git-verify-tag.html[git-verify-tag]:: +gitlink:git-verify-tag[1]:: Check the GPG signature of tag. Previously this command was known as git-verify-tag-script. -link:git-whatchanged.html[git-whatchanged]:: +gitlink:git-whatchanged[1]:: Shows commit logs and differences they introduce. @@ -321,92 +321,92 @@ Ancillary Commands ------------------ Manipulators: -link:git-applypatch.html[git-applypatch]:: +gitlink:git-applypatch[1]:: Apply one patch extracted from an e-mail. -link:git-archimport.html[git-archimport]:: +gitlink:git-archimport[1]:: Import an arch repository into git. Previously this command was known as git-archimport-script. -link:git-convert-objects.html[git-convert-objects]:: +gitlink:git-convert-objects[1]:: Converts old-style GIT repository Previously this command was known as git-convert-cache. -link:git-cvsimport.html[git-cvsimport]:: +gitlink:git-cvsimport[1]:: Salvage your data out of another SCM people love to hate. Previously this command was known as git-cvsimport-script. -link:git-merge-one-file.html[git-merge-one-file]:: +gitlink:git-merge-one-file[1]:: The standard helper program to use with "git-merge-index" Previously this command was known as git-merge-one-file-script. -link:git-prune.html[git-prune]:: +gitlink:git-prune[1]:: Prunes all unreachable objects from the object database Previously this command was known as git-prune-script. -link:git-relink.html[git-relink]:: +gitlink:git-relink[1]:: Hardlink common objects in local repositories. Previously this command was known as git-relink-script. -link:git-sh-setup.html[git-sh-setup]:: +gitlink:git-sh-setup[1]:: Common git shell script setup code. Previously this command was known as git-sh-setup-script. -link:git-tag.html[git-tag]:: +gitlink:git-tag[1]:: An example script to create a tag object signed with GPG Previously this command was known as git-tag-script. Interrogators: -link:git-cherry.html[git-cherry]:: +gitlink:git-cherry[1]:: Find commits not merged upstream. -link:git-count-objects.html[git-count-objects]:: +gitlink:git-count-objects[1]:: Count unpacked number of objects and their disk consumption. Previously this command was known as git-count-objects-script. -link:git-daemon.html[git-daemon]:: +gitlink:git-daemon[1]:: A really simple server for GIT repositories. -link:git-diff-helper.html[git-diff-helper]:: +gitlink:git-diff-helper[1]:: Generates patch format output for git-diff-* -link:git-get-tar-commit-id.html[git-get-tar-commit-id]:: +gitlink:git-get-tar-commit-id[1]:: Extract commit ID from an archive created using git-tar-tree. -link:git-mailinfo.html[git-mailinfo]:: +gitlink:git-mailinfo[1]:: Extracts patch from a single e-mail message. -link:git-mailsplit.html[git-mailsplit]:: +gitlink:git-mailsplit[1]:: git-mailsplit. -link:git-patch-id.html[git-patch-id]:: +gitlink:git-patch-id[1]:: Compute unique ID for a patch. -link:git-parse-remote.html[git-parse-remote]:: +gitlink:git-parse-remote[1]:: Routines to help parsing $GIT_DIR/remotes/ Previously this command was known as git-parse-remote-script. -link:git-request-pull.html[git-request-pull]:: +gitlink:git-request-pull[1]:: git-request-pull. Previously this command was known as git-request-pull-script. -link:git-rev-parse.html[git-rev-parse]:: +gitlink:git-rev-parse[1]:: Pick out and massage parameters. -link:git-send-email.html[git-send-email]:: +gitlink:git-send-email[1]:: Send patch e-mails out of "format-patch --mbox" output. Previously this command was known as git-send-email-script. -link:git-stripspace.html[git-stripspace]:: +gitlink:git-stripspace[1]:: Filter out empty lines. Commands not yet documented --------------------------- -link:gitk.html[gitk]:: +gitlink:gitk[1]:: gitk. @@ -511,16 +511,16 @@ git Commits 'GIT_AUTHOR_DATE':: 'GIT_COMMITTER_NAME':: 'GIT_COMMITTER_EMAIL':: - see link:git-commit-tree.html[git-commit-tree] + see gitlink:git-commit-tree[1] git Diffs ~~~~~~~~~ 'GIT_DIFF_OPTS':: 'GIT_EXTERNAL_DIFF':: see the "generating patches" section in : - link:git-diff-index.html[git-diff-index]; - link:git-diff-files.html[git-diff-files]; - link:git-diff-tree.html[git-diff-tree] + gitlink:git-diff-index[1]; + gitlink:git-diff-files[1]; + gitlink:git-diff-tree[1] Discussion[[Discussion]] ------------------------ @@ -536,5 +536,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 8e2f479f25..e5ef6d6f47 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -34,5 +34,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 928a22cd78..307cc07919 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -859,7 +859,12 @@ All of them have plus `+` characters in the first column, which means they are now part of the `master` branch. Only the "Some work" commit has the plus `+` character in the second column, because `mybranch` has not been merged to incorporate these -commits from the master branch. +commits from the master branch. The string inside brackets +before the commit log message is a short name you can use to +name the commit. In the above example, 'master' and 'mybranch' +are branch heads. 'master~1' is the first parent of 'master' +branch head. Please see 'git-rev-parse' documentation if you +see more complex cases. Now, let's pretend you are the one who did all the work in `mybranch`, and the fruit of your hard work has finally been merged @@ -1356,4 +1361,101 @@ fast forward. You need to pull and merge those other changes back before you push your work when it happens. +Bundling your work together +--------------------------- + +It is likely that you will be working on more than one thing at +a time. It is easy to use those more-or-less independent tasks +using branches with git. + +We have already seen how branches work in a previous example, +with "fun and work" example using two branches. The idea is the +same if there are more than two branches. Let's say you started +out from "master" head, and have some new code in the "master" +branch, and two independent fixes in the "commit-fix" and +"diff-fix" branches: + +------------ +$ git show-branch +! [commit-fix] Fix commit message normalization. + ! [diff-fix] Fix rename detection. + * [master] Release candidate #1 +--- + + [diff-fix] Fix rename detection. + + [diff-fix~1] Better common substring algorithm. ++ [commit-fix] Fix commit message normalization. + + [master] Release candidate #1 ++++ [diff-fix~2] Pretty-print messages. +------------ + +Both fixes are tested well, and at this point, you want to merge +in both of them. You could merge in 'diff-fix' first and then +'commit-fix' next, like this: + +------------ +$ git resolve master diff-fix 'Merge fix in diff-fix' +$ git resolve master commit-fix 'Merge fix in commit-fix' +------------ + +Which would result in: + +------------ +$ git show-branch +! [commit-fix] Fix commit message normalization. + ! [diff-fix] Fix rename detection. + * [master] Merge fix in commit-fix +--- + + [master] Merge fix in commit-fix ++ + [commit-fix] Fix commit message normalization. + + [master~1] Merge fix in diff-fix + ++ [diff-fix] Fix rename detection. + ++ [diff-fix~1] Better common substring algorithm. + + [master~2] Release candidate #1 ++++ [master~3] Pretty-print messages. +------------ + +However, there is no particular reason to merge in one branch +first and the other next, when what you have are a set of truly +independent changes (if the order mattered, then they are not +independent by definition). You could instead merge those two +branches into the current branch at once. First let's undo what +we just did and start over. We would want to get the master +branch before these two merges by resetting it to 'master~2': + +------------ +$ git reset --hard master~2 +------------ + +You can make sure 'git show-branch' matches the state before +those two 'git resolve' you just did. Then, instead of running +two 'git resolve' commands in a row, you would pull these two +branch heads (this is known as 'making an Octopus'): + +------------ +$ git pull . commit-fix diff-fix +$ git show-branch +! [commit-fix] Fix commit message normalization. + ! [diff-fix] Fix rename detection. + * [master] Octopus merge of branches 'diff-fix' and 'commit-fix' +--- + + [master] Octopus merge of branches 'diff-fix' and 'commit-fix' ++ + [commit-fix] Fix commit message normalization. + ++ [diff-fix] Fix rename detection. + ++ [diff-fix~1] Better common substring algorithm. + + [master~1] Release candidate #1 ++++ [master~2] Pretty-print messages. +------------ + +Note that you should not do Octopus because you can. An octopus +is a valid thing to do and often makes it easier to view the +commit history if you are pulling more than two independent +changes at the same time. However, if you have merge conflicts +with any of the branches you are merging in and need to hand +resolve, that is an indication that the development happened in +those branches were not independent after all, and you should +merge two at a time, documenting how you resolved the conflicts, +and the reason why you preferred changes made in one side over +the other. Otherwise it would make the project history harder +to follow, not easier. + [ to be continued.. cvsimports ] @@ -14,6 +14,9 @@ # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. # +# Define ARM_SHA1 environment variable when running make to make use of +# a bundled SHA1 routine optimized for ARM. +# # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). # # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). @@ -162,6 +165,9 @@ ifeq ($(shell uname -s),SunOS) NEEDS_NSL = YesPlease PLATFORM_DEFINES += -D__EXTENSIONS__ endif +ifneq (,$(findstring arm,$(shell uname -m))) + ARM_SHA1 = YesPlease +endif ifndef SHELL_PATH SHELL_PATH = /bin/sh @@ -191,18 +197,6 @@ ifdef NEEDS_LIBICONV else LIB_4_ICONV = endif -ifdef MOZILLA_SHA1 - SHA1_HEADER = "mozilla-sha1/sha1.h" - LIB_OBJS += mozilla-sha1/sha1.o -else - ifdef PPC_SHA1 - SHA1_HEADER = "ppc/sha1.h" - LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o - else - SHA1_HEADER = <openssl/sha.h> - LIBS += $(LIB_4_CRYPTO) - endif -endif ifdef NEEDS_SOCKET LIBS += -lsocket SIMPLE_LIB += -lsocket @@ -216,6 +210,24 @@ ifdef NO_STRCASESTR LIB_OBJS += compat/strcasestr.o endif +ifdef PPC_SHA1 + SHA1_HEADER = "ppc/sha1.h" + LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o +else +ifdef ARM_SHA1 + SHA1_HEADER = "arm/sha1.h" + LIB_OBJS += arm/sha1.o arm/sha1_arm.o +else +ifdef MOZILLA_SHA1 + SHA1_HEADER = "mozilla-sha1/sha1.h" + LIB_OBJS += mozilla-sha1/sha1.o +else + SHA1_HEADER = <openssl/sha.h> + LIBS += $(LIB_4_CRYPTO) +endif +endif +endif + DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)' SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ @@ -104,8 +104,8 @@ object. The object is totally independent of its location in the directory tree, and renaming a file does not change the object that file is associated with in any way. -A blob is typically created when link:git-update-index.html[git-update-index] -is run, and its data can be accessed by link:git-cat-file.html[git-cat-file]. +A blob is typically created when gitlink:git-update-index[1] +is run, and its data can be accessed by gitlink:git-cat-file[1]. Tree Object ~~~~~~~~~~~ @@ -143,9 +143,9 @@ involved), you can see trivial renames or permission changes by noticing that the blob stayed the same. However, renames with data changes need a smarter "diff" implementation. -A tree is created with link:git-write-tree.html[git-write-tree] and -its data can be accessed by link:git-ls-tree.html[git-ls-tree]. -Two trees can be compared with link:git-diff-tree.html[git-diff-tree]. +A tree is created with gitlink:git-write-tree[1] and +its data can be accessed by gitlink:git-ls-tree[1]. +Two trees can be compared with gitlink:git-diff-tree[1]. Commit Object ~~~~~~~~~~~~~ @@ -169,8 +169,8 @@ implicit in the trees involved (the result tree, and the result trees of the parents), and describing that makes no sense in this idiotic file manager. -A commit is created with link:git-commit-tree.html[git-commit-tree] and -its data can be accessed by link:git-cat-file.html[git-cat-file]. +A commit is created with gitlink:git-commit-tree[1] and +its data can be accessed by gitlink:git-cat-file[1]. Trust ~~~~~ @@ -215,10 +215,10 @@ Note that despite the tag features, "git" itself only handles content integrity; the trust framework (and signature provision and verification) has to come from outside. -A tag is created with link:git-mktag.html[git-mktag], -its data can be accessed by link:git-cat-file.html[git-cat-file], +A tag is created with gitlink:git-mktag[1], +its data can be accessed by gitlink:git-cat-file[1], and the signature can be verified by -link:git-verify-tag.html[git-verify-tag]. +gitlink:git-verify-tag[1]. The "index" aka "Current Directory Cache" @@ -286,7 +286,7 @@ main combinations: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You update the index with information from the working directory with -the link:git-update-index.html[git-update-index] command. You +the gitlink:git-update-index[1] command. You generally update the index information by just specifying the filename you want to update, like so: @@ -404,7 +404,7 @@ last committed state was. You can examine the data represented in the object database and the index with various helper tools. For every object, you can use -link:git-cat-file.html[git-cat-file] to examine details about the +gitlink:git-cat-file[1] to examine details about the object: git-cat-file -t <objectname> diff --git a/arm/sha1.c b/arm/sha1.c new file mode 100644 index 0000000000..11b1a048b4 --- /dev/null +++ b/arm/sha1.c @@ -0,0 +1,82 @@ +/* + * SHA-1 implementation optimized for ARM + * + * Copyright: (C) 2005 by Nicolas Pitre <nico@cam.org> + * Created: September 17, 2005 + */ + +#include <string.h> +#include "sha1.h" + +extern void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W); + +void SHA1_Init(SHA_CTX *c) +{ + c->len = 0; + c->hash[0] = 0x67452301; + c->hash[1] = 0xefcdab89; + c->hash[2] = 0x98badcfe; + c->hash[3] = 0x10325476; + c->hash[4] = 0xc3d2e1f0; +} + +void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n) +{ + uint32_t workspace[80]; + unsigned int partial; + unsigned long done; + + partial = c->len & 0x3f; + c->len += n; + if ((partial + n) >= 64) { + if (partial) { + done = 64 - partial; + memcpy(c->buffer + partial, p, done); + sha_transform(c->hash, c->buffer, workspace); + partial = 0; + } else + done = 0; + while (n >= done + 64) { + sha_transform(c->hash, p + done, workspace); + done += 64; + } + } else + done = 0; + if (n - done) + memcpy(c->buffer + partial, p + done, n - done); +} + +void SHA1_Final(unsigned char *hash, SHA_CTX *c) +{ + uint64_t bitlen; + uint32_t bitlen_hi, bitlen_lo; + unsigned int i, offset, padlen; + unsigned char bits[8]; + static const unsigned char padding[64] = { 0x80, }; + + bitlen = c->len << 3; + offset = c->len & 0x3f; + padlen = ((offset < 56) ? 56 : (64 + 56)) - offset; + SHA1_Update(c, padding, padlen); + + bitlen_hi = bitlen >> 32; + bitlen_lo = bitlen & 0xffffffff; + bits[0] = bitlen_hi >> 24; + bits[1] = bitlen_hi >> 16; + bits[2] = bitlen_hi >> 8; + bits[3] = bitlen_hi; + bits[4] = bitlen_lo >> 24; + bits[5] = bitlen_lo >> 16; + bits[6] = bitlen_lo >> 8; + bits[7] = bitlen_lo; + SHA1_Update(c, bits, 8); + + for (i = 0; i < 5; i++) { + uint32_t v = c->hash[i]; + hash[0] = v >> 24; + hash[1] = v >> 16; + hash[2] = v >> 8; + hash[3] = v; + hash += 4; + } +} diff --git a/arm/sha1.h b/arm/sha1.h new file mode 100644 index 0000000000..3952646349 --- /dev/null +++ b/arm/sha1.h @@ -0,0 +1,18 @@ +/* + * SHA-1 implementation optimized for ARM + * + * Copyright: (C) 2005 by Nicolas Pitre <nico@cam.org> + * Created: September 17, 2005 + */ + +#include <stdint.h> + +typedef struct sha_context { + uint64_t len; + uint32_t hash[5]; + unsigned char buffer[64]; +} SHA_CTX; + +void SHA1_Init(SHA_CTX *c); +void SHA1_Update(SHA_CTX *c, const void *p, unsigned long n); +void SHA1_Final(unsigned char *hash, SHA_CTX *c); diff --git a/arm/sha1_arm.S b/arm/sha1_arm.S new file mode 100644 index 0000000000..da92d20e84 --- /dev/null +++ b/arm/sha1_arm.S @@ -0,0 +1,184 @@ +/* + * SHA transform optimized for ARM + * + * Copyright: (C) 2005 by Nicolas Pitre <nico@cam.org> + * Created: September 17, 2005 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + + .text + .globl sha_transform + +/* + * void sha_transform(uint32_t *hash, const unsigned char *data, uint32_t *W); + * + * note: the "data" pointer may be unaligned. + */ + +sha_transform: + + stmfd sp!, {r4 - r8, lr} + + @ for (i = 0; i < 16; i++) + @ W[i] = ntohl(((uint32_t *)data)[i]); */ + +#ifdef __ARMEB__ + mov r4, r0 + mov r0, r2 + mov r2, #64 + bl memcpy + mov r2, r0 + mov r0, r4 +#else + mov r3, r2 + mov lr, #16 +1: ldrb r4, [r1], #1 + ldrb r5, [r1], #1 + ldrb r6, [r1], #1 + ldrb r7, [r1], #1 + subs lr, lr, #1 + orr r5, r5, r4, lsl #8 + orr r6, r6, r5, lsl #8 + orr r7, r7, r6, lsl #8 + str r7, [r3], #4 + bne 1b +#endif + + @ for (i = 0; i < 64; i++) + @ W[i+16] = ror(W[i+13] ^ W[i+8] ^ W[i+2] ^ W[i], 31); + + sub r3, r2, #4 + mov lr, #64 +2: ldr r4, [r3, #4]! + subs lr, lr, #1 + ldr r5, [r3, #8] + ldr r6, [r3, #32] + ldr r7, [r3, #52] + eor r4, r4, r5 + eor r4, r4, r6 + eor r4, r4, r7 + mov r4, r4, ror #31 + str r4, [r3, #64] + bne 2b + + /* + * The SHA functions are: + * + * f1(B,C,D) = (D ^ (B & (C ^ D))) + * f2(B,C,D) = (B ^ C ^ D) + * f3(B,C,D) = ((B & C) | (D & (B | C))) + * + * Then the sub-blocks are processed as follows: + * + * A' = ror(A, 27) + f(B,C,D) + E + K + *W++ + * B' = A + * C' = ror(B, 2) + * D' = C + * E' = D + * + * We therefore unroll each loop 5 times to avoid register shuffling. + * Also the ror for C (and also D and E which are successivelyderived + * from it) is applied in place to cut on an additional mov insn for + * each round. + */ + + .macro sha_f1, A, B, C, D, E + ldr r3, [r2], #4 + eor ip, \C, \D + add \E, r1, \E, ror #2 + and ip, \B, ip, ror #2 + add \E, \E, \A, ror #27 + eor ip, ip, \D, ror #2 + add \E, \E, r3 + add \E, \E, ip + .endm + + .macro sha_f2, A, B, C, D, E + ldr r3, [r2], #4 + add \E, r1, \E, ror #2 + eor ip, \B, \C, ror #2 + add \E, \E, \A, ror #27 + eor ip, ip, \D, ror #2 + add \E, \E, r3 + add \E, \E, ip + .endm + + .macro sha_f3, A, B, C, D, E + ldr r3, [r2], #4 + add \E, r1, \E, ror #2 + orr ip, \B, \C, ror #2 + add \E, \E, \A, ror #27 + and ip, ip, \D, ror #2 + add \E, \E, r3 + and r3, \B, \C, ror #2 + orr ip, ip, r3 + add \E, \E, ip + .endm + + ldmia r0, {r4 - r8} + + mov lr, #4 + ldr r1, .L_sha_K + 0 + + /* adjust initial values */ + mov r6, r6, ror #30 + mov r7, r7, ror #30 + mov r8, r8, ror #30 + +3: subs lr, lr, #1 + sha_f1 r4, r5, r6, r7, r8 + sha_f1 r8, r4, r5, r6, r7 + sha_f1 r7, r8, r4, r5, r6 + sha_f1 r6, r7, r8, r4, r5 + sha_f1 r5, r6, r7, r8, r4 + bne 3b + + ldr r1, .L_sha_K + 4 + mov lr, #4 + +4: subs lr, lr, #1 + sha_f2 r4, r5, r6, r7, r8 + sha_f2 r8, r4, r5, r6, r7 + sha_f2 r7, r8, r4, r5, r6 + sha_f2 r6, r7, r8, r4, r5 + sha_f2 r5, r6, r7, r8, r4 + bne 4b + + ldr r1, .L_sha_K + 8 + mov lr, #4 + +5: subs lr, lr, #1 + sha_f3 r4, r5, r6, r7, r8 + sha_f3 r8, r4, r5, r6, r7 + sha_f3 r7, r8, r4, r5, r6 + sha_f3 r6, r7, r8, r4, r5 + sha_f3 r5, r6, r7, r8, r4 + bne 5b + + ldr r1, .L_sha_K + 12 + mov lr, #4 + +6: subs lr, lr, #1 + sha_f2 r4, r5, r6, r7, r8 + sha_f2 r8, r4, r5, r6, r7 + sha_f2 r7, r8, r4, r5, r6 + sha_f2 r6, r7, r8, r4, r5 + sha_f2 r5, r6, r7, r8, r4 + bne 6b + + ldmia r0, {r1, r2, r3, ip, lr} + add r4, r1, r4 + add r5, r2, r5 + add r6, r3, r6, ror #2 + add r7, ip, r7, ror #2 + add r8, lr, r8, ror #2 + stmia r0, {r4 - r8} + + ldmfd sp!, {r4 - r8, pc} + +.L_sha_K: + .word 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 + @@ -161,6 +161,7 @@ extern int remove_cache_entry_at(int pos); extern int remove_file_from_cache(char *path); extern int ce_same_name(struct cache_entry *a, struct cache_entry *b); extern int ce_match_stat(struct cache_entry *ce, struct stat *st); +extern int ce_modified(struct cache_entry *ce, struct stat *st); extern int ce_path_match(const struct cache_entry *ce, const char **pathspec); extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); @@ -241,7 +242,7 @@ extern void *read_object_with_reference(const unsigned char *sha1, unsigned char *sha1_ret); const char *show_date(unsigned long time, int timezone); -void parse_date(const char *date, char *buf, int bufsize); +int parse_date(const char *date, char *buf, int bufsize); void datestamp(char *buf, int bufsize); extern int setup_ident(void); diff --git a/compat/subprocess.py b/compat/subprocess.py index d115e87cc6..93323dfc0a 100644 --- a/compat/subprocess.py +++ b/compat/subprocess.py @@ -24,6 +24,9 @@ # OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Use of this file within git is permitted under GPLv2. +# r"""subprocess - Subprocesses with accessible I/O streams @@ -388,7 +388,7 @@ static int match_tz(const char *date, int *offp) /* Gr. strptime is crap for this; it doesn't have a way to require RFC2822 (i.e. English) day/month names, and it doesn't work correctly with %z. */ -void parse_date(const char *date, char *result, int maxlen) +int parse_date(const char *date, char *result, int maxlen) { struct tm tm; int offset, sign, tm_gmt; @@ -431,7 +431,7 @@ void parse_date(const char *date, char *result, int maxlen) offset = (then - mktime(&tm)) / 60; if (then == -1) - return; + return -1; if (!tm_gmt) then -= offset * 60; @@ -442,7 +442,7 @@ void parse_date(const char *date, char *result, int maxlen) sign = '-'; } - snprintf(result, maxlen, "%lu %c%02d%02d", then, sign, offset/60, offset % 60); + return snprintf(result, maxlen, "%lu %c%02d%02d", then, sign, offset/60, offset % 60); } void datestamp(char *buf, int bufsize) diff --git a/fsck-objects.c b/fsck-objects.c index 0c5c430ed1..6cb0f29be8 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -20,6 +20,35 @@ static int check_strict = 0; static int keep_cache_objects = 0; static unsigned char head_sha1[20]; + +static void objreport(struct object *obj, const char *severity, + const char *err, va_list params) +{ + fprintf(stderr, "%s in %s %s: ", + severity, obj->type, sha1_to_hex(obj->sha1)); + vfprintf(stderr, err, params); + fputs("\n", stderr); +} + +int objerror(struct object *obj, const char *err, ...) +{ + va_list params; + va_start(params, err); + objreport(obj, "error", err, params); + va_end(params); + return -1; +} + +int objwarning(struct object *obj, const char *err, ...) +{ + va_list params; + va_start(params, err); + objreport(obj, "warning", err, params); + va_end(params); + return -1; +} + + static void check_connectivity(void) { int i; @@ -162,31 +191,19 @@ static int fsck_tree(struct tree *item) retval = 0; if (has_full_path) { - fprintf(stderr, "warning: git-fsck-objects: tree %s " - "has full pathnames in it\n", - sha1_to_hex(item->object.sha1)); + objwarning(&item->object, "contains full pathnames"); } if (has_zero_pad) { - fprintf(stderr, "warning: git-fsck-objects: tree %s " - "has zero-padded file modes in it\n", - sha1_to_hex(item->object.sha1)); + objwarning(&item->object, "contains zero-padded file modes"); } if (has_bad_modes) { - fprintf(stderr, "warning: git-fsck-objects: tree %s " - "has bad file modes in it\n", - sha1_to_hex(item->object.sha1)); + objwarning(&item->object, "contains bad file modes"); } if (has_dup_entries) { - fprintf(stderr, "error: git-fsck-objects: tree %s " - "has duplicate file entries\n", - sha1_to_hex(item->object.sha1)); - retval = -1; + retval = objerror(&item->object, "contains duplicate file entries"); } if (not_properly_sorted) { - fprintf(stderr, "error: git-fsck-objects: tree %s " - "is not properly sorted\n", - sha1_to_hex(item->object.sha1)); - retval = -1; + retval = objerror(&item->object, "not properly sorted"); } return retval; } @@ -194,24 +211,24 @@ static int fsck_tree(struct tree *item) static int fsck_commit(struct commit *commit) { char *buffer = commit->buffer; - unsigned char sha1[20]; + unsigned char tree_sha1[20], sha1[20]; if (memcmp(buffer, "tree ", 5)) - return -1; - if (get_sha1_hex(buffer+5, sha1) || buffer[45] != '\n') - return -1; + return objerror(&commit->object, "invalid format - expected 'tree' line"); + if (get_sha1_hex(buffer+5, tree_sha1) || buffer[45] != '\n') + return objerror(&commit->object, "invalid 'tree' line format - bad sha1"); buffer += 46; while (!memcmp(buffer, "parent ", 7)) { if (get_sha1_hex(buffer+7, sha1) || buffer[47] != '\n') - return -1; + return objerror(&commit->object, "invalid 'parent' line format - bad sha1"); buffer += 48; } if (memcmp(buffer, "author ", 7)) - return -1; + return objerror(&commit->object, "invalid format - expected 'author' line"); free(commit->buffer); commit->buffer = NULL; if (!commit->tree) - return -1; + return objerror(&commit->object, "could not load commit's tree %s", tree_sha1); if (!commit->parents && show_root) printf("root %s\n", sha1_to_hex(commit->object.sha1)); if (!commit->date) @@ -225,8 +242,7 @@ static int fsck_tag(struct tag *tag) struct object *tagged = tag->tagged; if (!tagged) { - printf("bad object in tag %s\n", sha1_to_hex(tag->object.sha1)); - return -1; + return objerror(&tag->object, "could not load tagged object"); } if (!show_tags) return 0; @@ -240,7 +256,7 @@ static int fsck_sha1(unsigned char *sha1) { struct object *obj = parse_object(sha1); if (!obj) - return -1; + return error("%s: object not found", sha1_to_hex(sha1)); if (obj->type == blob_type) return 0; if (obj->type == tree_type) @@ -249,7 +265,8 @@ static int fsck_sha1(unsigned char *sha1) return fsck_commit((struct commit *) obj); if (obj->type == tag_type) return fsck_tag((struct tag *) obj); - return -1; + /* By now, parse_object() would've returned NULL instead. */ + return objerror(obj, "unknown type '%s' (internal fsck error)", obj->type); } /* @@ -285,8 +302,7 @@ static void fsck_sha1_list(void) unsigned char *sha1 = entry->sha1; sha1_list.entry[i] = NULL; - if (fsck_sha1(sha1) < 0) - fprintf(stderr, "bad sha1 entry '%s'\n", sha1_to_hex(sha1)); + fsck_sha1(sha1); free(entry); } sha1_list.nr = 0; @@ -479,9 +495,7 @@ int main(int argc, char **argv) for (i = 0; i < num; i++) { unsigned char sha1[20]; nth_packed_object_sha1(p, i, sha1); - if (fsck_sha1(sha1) < 0) - fprintf(stderr, "bad sha1 entry '%s'\n", sha1_to_hex(sha1)); - + fsck_sha1(sha1); } } } @@ -505,7 +519,7 @@ int main(int argc, char **argv) heads++; continue; } - error("expected sha1, got %s", arg); + error("invalid parameter: expected sha1, got '%s'", arg); } /* diff --git a/git-clone.sh b/git-clone.sh index bfb8fd6285..44135f489d 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -152,7 +152,8 @@ yes,yes) # Look at objects/info/alternates for rsync -- http will # support it natively and git native ones will do it on the # remote end. Not having that file is not a crime. - rsync -q "$repo/objects/info/alternates" "$D/.git/TMP_ALT" || + rsync -q "$repo/objects/info/alternates" \ + "$D/.git/TMP_ALT" 2>/dev/null || rm -f "$D/.git/TMP_ALT" if test -f "$D/.git/TMP_ALT" then diff --git a/git-fetch.sh b/git-fetch.sh index 72f17ab6c9..cbfa27de90 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -58,21 +58,25 @@ append_fetch_head () { # remote-nick is the URL given on the command line (or a shorthand) # remote-name is the $GIT_DIR relative refs/ path we computed # for this refspec. + remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') && + remote_="$remote_1_" + case "$remote_" in + . | ./) where_= ;; + *) where_=" of $remote_" ;; + esac case "$remote_name_" in HEAD) note_= ;; refs/heads/*) note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')" - note_="branch '$note_' of " ;; + note_="branch '$note_'" ;; refs/tags/*) note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')" - note_="tag '$note_' of " ;; + note_="tag '$note_'" ;; *) - note_="$remote_name of " ;; + note_="$remote_name" ;; esac - remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') && - remote_="$remote_1_" - note_="$note_$remote_" + note_="$note_$where_" # 2.6.11-tree tag would not be happy to be fed to resolve. if git-cat-file commit "$head_" >/dev/null 2>&1 @@ -193,8 +197,9 @@ do # Look at objects/info/alternates for rsync -- http will # support it natively and git native ones will do it on the remote # end. Not having that file is not a crime. - rsync -q "$remote/objects/info/alternates" "$GIT_DIR/TMP_ALT" || - rm -f "$GIT_DIR/TMP_ALT" + rsync -q "$remote/objects/info/alternates" \ + "$GIT_DIR/TMP_ALT" 2>/dev/null || + rm -f "$GIT_DIR/TMP_ALT" if test -f "$GIT_DIR/TMP_ALT" then resolve_alternates "$remote" <"$GIT_DIR/TMP_ALT" | diff --git a/git-pull.sh b/git-pull.sh index 8cf39e7f64..0c137f1971 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,6 +6,38 @@ . git-sh-setup || die "Not a git archive" +usage () { + die "git pull [-n] [-s strategy]... <repo> <head>..." +} + +strategy_args= no_summary= +while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac +do + case "$1" in + -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ + --no-summa|--no-summar|--no-summary) + no_summary=-n ;; + -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ + --strateg=*|--strategy=*|\ + -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) + case "$#,$1" in + *,*=*) + strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; + 1,*) + usage ;; + *) + strategy="$2" + shift ;; + esac + strategy_args="${strategy_args}-s $strategy " + ;; + -*) + usage + ;; + esac + shift +done + orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?" git-fetch --update-head-ok "$@" || exit 1 @@ -25,22 +57,87 @@ then fi merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ') -merge_name=$( - perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \ - "$GIT_DIR"/FETCH_HEAD -) + +case "$merge_head" in +?*' '?*) + merge_name="Octopus merge of "$( + perl -e ' + my @src; + my %src; + + sub andjoin { + my ($label, $labels, $stuff, $src) = @_; + my $l = scalar @$stuff; + my $m = ""; + if ($l == 0) { + return ""; + } + if ($l == 1) { + $m = "$label $stuff->[0]"; + } + else { + $m = ("$labels " . + join (", ", @{$stuff}[0..$l-2]) . + " and $stuff->[-1]"); + } + if ($src ne ".") { + $m .= " from $src"; + } + return $m; + } + + while (<>) { + my ($bname, $tname, $gname, $src); + s/^[0-9a-f]* //; + if (s/ of (.*)$//) { + $src = $1; + } else { + $src = "."; + } + if (! exists $src{$src}) { + push @src, $src; + $src{$src} = { BRANCH => [], TAG => [], GENERIC => [] }; + } + if (/^branch (.*)$/) { + push @{$src{$src}{BRANCH}}, $1; + } + elsif (/^tag (.*)$/) { + push @{$src{$src}{TAG}}, $1; + } + else { + push @{$src{$src}{GENERIC}}, $1; + } + } + my @msg; + for my $src (@src) { + my $bag = $src{$src}{BRANCH}; + if (@{$bag}) { + push @msg, andjoin("branch", "branches", $bag, $src); + } + $bag = $src{$src}{TAG}; + if (@{$bag}) { + push @msg, andjoin("tag", "tags", $bag, $src); + } + $bag = $src{$src}{GENERIC}; + if (@{$bag}) { + push @msg, andjoin("commit", "commits", $bag, $src); + } + } + print join("; ", @msg); + ' "$GIT_DIR"/FETCH_HEAD + ) + ;; +*) + merge_name="Merge "$(sed -e 's/^[0-9a-f]* //' \ + "$GIT_DIR"/FETCH_HEAD) + ;; +esac case "$merge_head" in '') echo >&2 "No changes." exit 0 ;; -*' '?*) - echo >&2 "Pulling more than one heads; making an Octopus." - exec git-octopus - ;; esac -git-resolve \ - "$(cat "$GIT_DIR"/HEAD)" \ - $merge_head "Merge $merge_name" +git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head @@ -15,6 +15,40 @@ static char real_email[1000]; static char real_name[1000]; static char real_date[50]; +static void copy_gecos(struct passwd *w, char *name, int sz) +{ + char *src, *dst; + int len, nlen; + + nlen = strlen(w->pw_name); + + /* Traditionally GECOS field had office phone numbers etc, separated + * with commas. Also & stands for capitalized form of the login name. + */ + + for (len = 0, dst = name, src = w->pw_gecos; len < sz; src++) { + int ch = *src; + if (ch != '&') { + *dst++ = ch; + if (ch == 0 || ch == ',') + break; + len++; + continue; + } + if (len + nlen < sz) { + /* Sorry, Mr. McDonald... */ + *dst++ = toupper(*w->pw_name); + memcpy(dst, w->pw_name + 1, nlen - 1); + dst += nlen - 1; + } + } + if (len < sz) + name[len] = 0; + else + die("Your parents must have hated you!"); + +} + int setup_ident(void) { int len; @@ -24,10 +58,7 @@ int setup_ident(void) die("You don't exist. Go away!"); /* Get the name ("gecos") */ - len = strlen(pw->pw_gecos); - if (len >= sizeof(real_name)) - die("Your parents must have hated you!"); - memcpy(real_name, pw->pw_gecos, len+1); + copy_gecos(pw, real_name, sizeof(real_name)); /* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */ len = strlen(pw->pw_name); diff --git a/ls-files.c b/ls-files.c index e53d245884..e3f43ecca1 100644 --- a/ls-files.c +++ b/ls-files.c @@ -16,6 +16,7 @@ static int show_others = 0; static int show_ignored = 0; static int show_stage = 0; static int show_unmerged = 0; +static int show_modified = 0; static int show_killed = 0; static int line_terminator = '\n'; @@ -28,6 +29,7 @@ static const char *tag_unmerged = ""; static const char *tag_removed = ""; static const char *tag_other = ""; static const char *tag_killed = ""; +static const char *tag_modified = ""; static char *exclude_per_dir = NULL; @@ -443,15 +445,18 @@ static void show_files(void) show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce); } } - if (show_deleted) { + if (show_deleted | show_modified) { for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; struct stat st; + int err; if (excluded(ce->name) != show_ignored) continue; - if (!lstat(ce->name, &st)) - continue; - show_ce_entry(tag_removed, ce); + err = lstat(ce->name, &st); + if (show_deleted && err) + show_ce_entry(tag_removed, ce); + if (show_modified && ce_modified(ce, &st)) + show_ce_entry(tag_modified, ce); } } } @@ -523,7 +528,7 @@ static void verify_pathspec(void) } static const char ls_files_usage[] = - "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* " + "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed|modified])* " "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] " "[ --exclude-per-directory=<filename> ]"; @@ -547,6 +552,7 @@ int main(int argc, char **argv) tag_cached = "H "; tag_unmerged = "M "; tag_removed = "R "; + tag_modified = "C "; tag_other = "? "; tag_killed = "K "; continue; @@ -559,6 +565,10 @@ int main(int argc, char **argv) show_deleted = 1; continue; } + if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) { + show_modified = 1; + continue; + } if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) { show_others = 1; continue; @@ -630,7 +640,8 @@ int main(int argc, char **argv) } /* With no flags, we default to showing the cached files */ - if (!(show_stage | show_deleted | show_others | show_unmerged | show_killed)) + if (!(show_stage | show_deleted | show_others | show_unmerged | + show_killed | show_modified)) show_cached = 1; read_cache(); diff --git a/read-cache.c b/read-cache.c index 6eff4c8401..ef6fd79e20 100644 --- a/read-cache.c +++ b/read-cache.c @@ -83,6 +83,83 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st) return changed; } +static int ce_compare_data(struct cache_entry *ce, struct stat *st) +{ + int match = -1; + int fd = open(ce->name, O_RDONLY); + + if (fd >= 0) { + unsigned char sha1[20]; + if (!index_fd(sha1, fd, st, 0, NULL)) + match = memcmp(sha1, ce->sha1, 20); + close(fd); + } + return match; +} + +static int ce_compare_link(struct cache_entry *ce, unsigned long expected_size) +{ + int match = -1; + char *target; + void *buffer; + unsigned long size; + char type[10]; + int len; + + target = xmalloc(expected_size); + len = readlink(ce->name, target, expected_size); + if (len != expected_size) { + free(target); + return -1; + } + buffer = read_sha1_file(ce->sha1, type, &size); + if (!buffer) { + free(target); + return -1; + } + if (size == expected_size) + match = memcmp(buffer, target, size); + free(buffer); + free(target); + return match; +} + +int ce_modified(struct cache_entry *ce, struct stat *st) +{ + int changed; + changed = ce_match_stat(ce, st); + if (!changed) + return 0; + + /* + * If the mode or type has changed, there's no point in trying + * to refresh the entry - it's not going to match + */ + if (changed & (MODE_CHANGED | TYPE_CHANGED)) + return changed; + + /* Immediately after read-tree or update-index --cacheinfo, + * the length field is zero. For other cases the ce_size + * should match the SHA1 recorded in the index entry. + */ + if ((changed & DATA_CHANGED) && ce->ce_size != htonl(0)) + return changed; + + switch (st->st_mode & S_IFMT) { + case S_IFREG: + if (ce_compare_data(ce, st)) + return changed | DATA_CHANGED; + break; + case S_IFLNK: + if (ce_compare_link(ce, st->st_size)) + return changed | DATA_CHANGED; + break; + default: + return changed | TYPE_CHANGED; + } + return 0; +} + int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2) { diff --git a/read-tree.c b/read-tree.c index 6a5c08c4c6..ca808739db 100644 --- a/read-tree.c +++ b/read-tree.c @@ -655,7 +655,7 @@ int main(int argc, char **argv) die("failed to unpack tree object %s", arg); stage++; } - if (update && !merge) + if ((update||index_only) && !merge) usage(read_tree_usage); if (merge && !fn) { if (stage < 2) diff --git a/rev-list.c b/rev-list.c index e41d5a045c..523fda07e1 100644 --- a/rev-list.c +++ b/rev-list.c @@ -86,7 +86,7 @@ static int filter_commit(struct commit * commit) return CONTINUE; if (max_age != -1 && (commit->date < max_age)) { stop_traversal=1; - return merge_order?CONTINUE:STOP; + return CONTINUE; } if (max_count != -1 && !max_count--) return STOP; @@ -374,6 +374,8 @@ static struct commit_list *limit_list(struct commit_list *list) struct commit *commit = pop_most_recent_commit(&list, SEEN); struct object *obj = &commit->object; + if (max_age != -1 && (commit->date < max_age)) + obj->flags |= UNINTERESTING; if (unpacked && has_sha1_pack(obj->sha1)) obj->flags |= UNINTERESTING; if (obj->flags & UNINTERESTING) { @@ -382,6 +384,8 @@ static struct commit_list *limit_list(struct commit_list *list) break; continue; } + if (min_age != -1 && (commit->date > min_age)) + continue; p = &commit_list_insert(commit, p)->next; } if (tree_objects) @@ -494,10 +498,12 @@ int main(int argc, char **argv) } if (!strncmp(arg, "--max-age=", 10)) { max_age = atoi(arg + 10); + limited = 1; continue; } if (!strncmp(arg, "--min-age=", 10)) { min_age = atoi(arg + 10); + limited = 1; continue; } if (!strcmp(arg, "--header")) { diff --git a/rev-parse.c b/rev-parse.c index 0f5630f95c..507b531dce 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -6,6 +6,7 @@ #include "cache.h" #include "commit.h" #include "refs.h" +#include "quote.h" #define DO_REVS 1 #define DO_NOREV 2 @@ -125,6 +126,30 @@ static int show_reference(const char *refname, const unsigned char *sha1) return 0; } +static void show_datestring(const char *flag, const char *datestr) +{ + FILE *date; + static char buffer[100]; + static char cmd[1000]; + int len; + + /* date handling requires both flags and revs */ + if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS)) + return; + len = strlen(flag); + memcpy(buffer, flag, len); + + snprintf(cmd, sizeof(cmd), "date --date=%s +%%s", sq_quote(datestr)); + date = popen(cmd, "r"); + if (!date || !fgets(buffer + len, sizeof(buffer) - len, date)) + die("git-rev-list: bad date string"); + pclose(date); + len = strlen(buffer); + if (buffer[len-1] == '\n') + buffer[--len] = 0; + show(buffer); +} + int main(int argc, char **argv) { int i, as_is = 0, verify = 0; @@ -207,6 +232,22 @@ int main(int argc, char **argv) printf("%s/.git\n", cwd); continue; } + if (!strncmp(arg, "--since=", 8)) { + show_datestring("--max-age=", arg+8); + continue; + } + if (!strncmp(arg, "--after=", 8)) { + show_datestring("--max-age=", arg+8); + continue; + } + if (!strncmp(arg, "--before=", 9)) { + show_datestring("--min-age=", arg+9); + continue; + } + if (!strncmp(arg, "--until=", 8)) { + show_datestring("--min-age=", arg+8); + continue; + } if (verify) die("Needed a single revision"); show_flag(arg); diff --git a/t/t3010-ls-files-killed.sh b/t/t3010-ls-files-killed-modified.sh index 2e18baae5a..5fc1976711 100755 --- a/t/t3010-ls-files-killed.sh +++ b/t/t3010-ls-files-killed-modified.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-ls-files -k flag test. +test_description='git-ls-files -k and -m flags test. This test prepares the following in the cache: @@ -24,6 +24,16 @@ and the following on the filesystem: git-ls-files -k should report that existing filesystem objects except path4, path5 and path6/file6 to be killed. + +Also for modification test, the cache and working tree have: + + path7 - an empty file, modified to a non-empty file. + path8 - a non-empty file, modified to an empty file. + path9 - an empty file, cache dirtied. + path10 - a non-empty file, cache dirtied. + +We should report path0, path1, path2/file2, path3/file3, path7 and path8 +modified without reporting path9 and path10. ' . ./test-lib.sh @@ -32,11 +42,15 @@ ln -s xyzzy path1 mkdir path2 path3 date >path2/file2 date >path3/file3 +: >path7 +date >path8 +: >path9 +date >path10 test_expect_success \ 'git-update-index --add to add various paths.' \ - "git-update-index --add -- path0 path1 path?/file?" + "git-update-index --add -- path0 path1 path?/file? path7 path8 path9 path10" -rm -fr path? +rm -fr path? ;# leave path10 alone date >path2 ln -s frotz path3 ln -s nitfol path5 @@ -44,6 +58,10 @@ mkdir path0 path1 path6 date >path0/file0 date >path1/file1 date >path6/file6 +date >path7 +: >path8 +: >path9 +touch path10 test_expect_success \ 'git-ls-files -k to show killed files.' \ @@ -58,4 +76,21 @@ EOF test_expect_success \ 'validate git-ls-files -k output.' \ 'diff .output .expected' + +test_expect_success \ + 'git-ls-files -m to show modified files.' \ + 'git-ls-files -m >.output' +cat >.expected <<EOF +path0 +path1 +path2/file2 +path3/file3 +path7 +path8 +EOF + +test_expect_success \ + 'validate git-ls-files -m output.' \ + 'diff .output .expected' + test_done diff --git a/update-index.c b/update-index.c index 8fe015b499..cb0265bdf7 100644 --- a/update-index.c +++ b/update-index.c @@ -112,47 +112,6 @@ static int add_file_to_cache(char *path) return 0; } -static int compare_data(struct cache_entry *ce, struct stat *st) -{ - int match = -1; - int fd = open(ce->name, O_RDONLY); - - if (fd >= 0) { - unsigned char sha1[20]; - if (!index_fd(sha1, fd, st, 0, NULL)) - match = memcmp(sha1, ce->sha1, 20); - close(fd); - } - return match; -} - -static int compare_link(struct cache_entry *ce, unsigned long expected_size) -{ - int match = -1; - char *target; - void *buffer; - unsigned long size; - char type[10]; - int len; - - target = xmalloc(expected_size); - len = readlink(ce->name, target, expected_size); - if (len != expected_size) { - free(target); - return -1; - } - buffer = read_sha1_file(ce->sha1, type, &size); - if (!buffer) { - free(target); - return -1; - } - if (size == expected_size) - match = memcmp(buffer, target, size); - free(buffer); - free(target); - return match; -} - /* * "refresh" does not calculate a new sha1 file or bring the * cache up-to-date for mode/content changes. But what it @@ -177,26 +136,9 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce) if (!changed) return ce; - /* - * If the mode or type has changed, there's no point in trying - * to refresh the entry - it's not going to match - */ - if (changed & (MODE_CHANGED | TYPE_CHANGED)) + if (ce_modified(ce, &st)) return ERR_PTR(-EINVAL); - switch (st.st_mode & S_IFMT) { - case S_IFREG: - if (compare_data(ce, &st)) - return ERR_PTR(-EINVAL); - break; - case S_IFLNK: - if (compare_link(ce, st.st_size)) - return ERR_PTR(-EINVAL); - break; - default: - return ERR_PTR(-EINVAL); - } - size = ce_size(ce); updated = xmalloc(size); memcpy(updated, ce, size); |