{"thread":{"id":"11092","subject":"[PATCH 1/2] Resurrect peek-remote","startedAt":"2007-12-02T07:45:58Z","lastAt":"2007-12-02T07:45:59Z","messageCount":2,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"61629","messageId":"1196581559-1614-1-git-send-email-gitster@pobox.com","threadId":"11092","inReplyTo":null,"subject":"[PATCH 1/2] Resurrect peek-remote","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-02T07:45:58Z","receivedAt":"2007-12-02T07:45:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"8951d7c1f1ae38f34617b6c2490bf65e73e371f7 (Build in ls-remote) made\npeek-remote as a synonym to ls-remote by enhancing the latter, but\nat the same time actually _removed_ it, before we officially gave\nremoval notice.  This was bad.\n\nResurrect it for v1.5.4.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Makefile |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex a7e44a3..c35c870 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -259,7 +259,7 @@ EXTRA_PROGRAMS =\n BUILT_INS = \\\n \tgit-format-patch$X git-show$X git-whatchanged$X git-cherry$X \\\n \tgit-get-tar-commit-id$X git-init$X git-repo-config$X \\\n-\tgit-fsck-objects$X git-cherry-pick$X \\\n+\tgit-fsck-objects$X git-cherry-pick$X git-peek-remote$X \\\n \t$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))\n \n # what 'all' will build and 'install' will install, in gitexecdir\n-- \n1.5.3.6.2090.g4ece0\n"},{"id":"61630","messageId":"1196581559-1614-2-git-send-email-gitster@pobox.com","threadId":"11092","inReplyTo":"1196581559-1614-1-git-send-email-gitster@pobox.com","subject":"[PATCH 2/2] Consolidate command list to one.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-02T07:45:59Z","receivedAt":"2007-12-02T07:45:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The categorized list of commands in git(7) and the list of common\ncommands in \"git help\" output were maintained separately, which was\ninsane.  This consolidates them to a single command-list.txt file.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/Makefile      |    4 +-\n Documentation/cmd-list.perl |  138 +-----------------------------------------\n Makefile                    |    8 +-\n command-list.txt            |  128 +++++++++++++++++++++++++++++++++++++++\n generate-cmdlist.sh         |   25 +-------\n 5 files changed, 140 insertions(+), 163 deletions(-)\n create mode 100644 command-list.txt\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex d886641..de11ee0 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -122,9 +122,9 @@ cmds_txt = cmds-ancillaryinterrogators.txt \\\n \n $(cmds_txt): cmd-list.made\n \n-cmd-list.made: cmd-list.perl $(MAN1_TXT)\n+cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)\n \t$(RM) $@\n-\tperl ./cmd-list.perl\n+\tperl ./cmd-list.perl ../command-list.txt\n \tdate >$@\n \n git.7 git.html: git.txt\ndiff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl\nindex b709551..93b84b1 100755\n--- a/Documentation/cmd-list.perl\n+++ b/Documentation/cmd-list.perl\n@@ -28,8 +28,8 @@ sub format_one {\n \t}\n \tif (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) {\n \t\tprint $out \"gitlink:$name\\[1\\]::\\n\\t\";\n-\t\tif ($attr) {\n-\t\t\tprint $out \"($attr) \";\n+\t\tif ($attr =~ / deprecated /) {\n+\t\t\tprint $out \"(deprecated) \";\n \t\t}\n \t\tprint $out \"$text.\\n\\n\";\n \t}\n@@ -39,12 +39,12 @@ sub format_one {\n }\n \n my %cmds = ();\n-while (<DATA>) {\n+for (sort <>) {\n \tnext if /^#/;\n \n \tchomp;\n \tmy ($name, $cat, $attr) = /^(\\S+)\\s+(.*?)(?:\\s+(.*))?$/;\n-\tpush @{$cmds{$cat}}, [$name, $attr];\n+\tpush @{$cmds{$cat}}, [$name, \" $attr \"];\n }\n \n for my $cat (qw(ancillaryinterrogators\n@@ -71,133 +71,3 @@ for my $cat (qw(ancillaryinterrogators\n \t\trename \"$out+\", \"$out\";\n \t}\n }\n-\n-# The following list is sorted with \"sort -d\" to make it easier\n-# to find entry in the resulting git.html manual page.\n-__DATA__\n-git-add                                 mainporcelain\n-git-am                                  mainporcelain\n-git-annotate                            ancillaryinterrogators\n-git-apply                               plumbingmanipulators\n-git-archimport                          foreignscminterface\n-git-archive                             mainporcelain\n-git-bisect                              mainporcelain\n-git-blame                               ancillaryinterrogators\n-git-branch                              mainporcelain\n-git-bundle                              mainporcelain\n-git-cat-file                            plumbinginterrogators\n-git-check-attr                          purehelpers\n-git-checkout                            mainporcelain\n-git-checkout-index                      plumbingmanipulators\n-git-check-ref-format                    purehelpers\n-git-cherry                              ancillaryinterrogators\n-git-cherry-pick                         mainporcelain\n-git-citool                              mainporcelain\n-git-clean                               mainporcelain\n-git-clone                               mainporcelain\n-git-commit                              mainporcelain\n-git-commit-tree                         plumbingmanipulators\n-git-config                              ancillarymanipulators\n-git-count-objects                       ancillaryinterrogators\n-git-cvsexportcommit                     foreignscminterface\n-git-cvsimport                           foreignscminterface\n-git-cvsserver                           foreignscminterface\n-git-daemon                              synchingrepositories\n-git-describe                            mainporcelain\n-git-diff                                mainporcelain\n-git-diff-files                          plumbinginterrogators\n-git-diff-index                          plumbinginterrogators\n-git-diff-tree                           plumbinginterrogators\n-git-fast-import\t\t\t\tancillarymanipulators\n-git-fetch                               mainporcelain\n-git-fetch-pack                          synchingrepositories\n-git-filter-branch                       ancillarymanipulators\n-git-fmt-merge-msg                       purehelpers\n-git-for-each-ref                        plumbinginterrogators\n-git-format-patch                        mainporcelain\n-git-fsck\t                        ancillaryinterrogators\n-git-gc                                  mainporcelain\n-git-get-tar-commit-id                   ancillaryinterrogators\n-git-grep                                mainporcelain\n-git-gui                                 mainporcelain\n-git-hash-object                         plumbingmanipulators\n-git-http-fetch                          synchelpers\n-git-http-push                           synchelpers\n-git-imap-send                           foreignscminterface\n-git-index-pack                          plumbingmanipulators\n-git-init                                mainporcelain\n-git-instaweb                            ancillaryinterrogators\n-gitk                                    mainporcelain\n-git-log                                 mainporcelain\n-git-lost-found                          ancillarymanipulators\tdeprecated\n-git-ls-files                            plumbinginterrogators\n-git-ls-remote                           plumbinginterrogators\n-git-ls-tree                             plumbinginterrogators\n-git-mailinfo                            purehelpers\n-git-mailsplit                           purehelpers\n-git-merge                               mainporcelain\n-git-merge-base                          plumbinginterrogators\n-git-merge-file                          plumbingmanipulators\n-git-merge-index                         plumbingmanipulators\n-git-merge-one-file                      purehelpers\n-git-mergetool                           ancillarymanipulators\n-git-merge-tree                          ancillaryinterrogators\n-git-mktag                               plumbingmanipulators\n-git-mktree                              plumbingmanipulators\n-git-mv                                  mainporcelain\n-git-name-rev                            plumbinginterrogators\n-git-pack-objects                        plumbingmanipulators\n-git-pack-redundant                      plumbinginterrogators\n-git-pack-refs                           ancillarymanipulators\n-git-parse-remote                        synchelpers\n-git-patch-id                            purehelpers\n-git-peek-remote                         purehelpers\tdeprecated\n-git-prune                               ancillarymanipulators\n-git-prune-packed                        plumbingmanipulators\n-git-pull                                mainporcelain\n-git-push                                mainporcelain\n-git-quiltimport                         foreignscminterface\n-git-read-tree                           plumbingmanipulators\n-git-rebase                              mainporcelain\n-git-receive-pack                        synchelpers\n-git-reflog                              ancillarymanipulators\n-git-relink                              ancillarymanipulators\n-git-remote                              ancillarymanipulators\n-git-repack                              ancillarymanipulators\n-git-request-pull                        foreignscminterface\n-git-rerere                              ancillaryinterrogators\n-git-reset                               mainporcelain\n-git-revert                              mainporcelain\n-git-rev-list                            plumbinginterrogators\n-git-rev-parse                           ancillaryinterrogators\n-git-rm                                  mainporcelain\n-git-runstatus                           ancillaryinterrogators\n-git-send-email                          foreignscminterface\n-git-send-pack                           synchingrepositories\n-git-shell                               synchelpers\n-git-shortlog                            mainporcelain\n-git-show                                mainporcelain\n-git-show-branch                         ancillaryinterrogators\n-git-show-index                          plumbinginterrogators\n-git-show-ref                            plumbinginterrogators\n-git-sh-setup                            purehelpers\n-git-stash                               mainporcelain\n-git-status                              mainporcelain\n-git-stripspace                          purehelpers\n-git-submodule                           mainporcelain\n-git-svn                                 foreignscminterface\n-git-symbolic-ref                        plumbingmanipulators\n-git-tag                                 mainporcelain\n-git-tar-tree                            plumbinginterrogators\tdeprecated\n-git-unpack-file                         plumbinginterrogators\n-git-unpack-objects                      plumbingmanipulators\n-git-update-index                        plumbingmanipulators\n-git-update-ref                          plumbingmanipulators\n-git-update-server-info                  synchingrepositories\n-git-upload-archive                      synchelpers\n-git-upload-pack                         synchelpers\n-git-var                                 plumbinginterrogators\n-git-verify-pack                         plumbinginterrogators\n-git-verify-tag                          ancillaryinterrogators\n-git-whatchanged                         ancillaryinterrogators\n-git-write-tree                          plumbingmanipulators\ndiff --git a/Makefile b/Makefile\nindex c35c870..d5d2c7c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -796,7 +796,7 @@ git-merge-subtree$X: git-merge-recursive$X\n $(BUILT_INS): git$X\n \t$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@\n \n-common-cmds.h: ./generate-cmdlist.sh\n+common-cmds.h: ./generate-cmdlist.sh command-list.txt\n \n common-cmds.h: $(wildcard Documentation/git-*.txt)\n \t$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@\n@@ -1138,7 +1138,7 @@ check-docs::\n \t\tesac ; \\\n \t\ttest -f \"Documentation/$$v.txt\" || \\\n \t\techo \"no doc: $$v\"; \\\n-\t\tsed -e '1,/^__DATA__/d' Documentation/cmd-list.perl | \\\n+\t\tsed -e '/^#/d' command-list.txt | \\\n \t\tgrep -q \"^$$v[ \t]\" || \\\n \t\tcase \"$$v\" in \\\n \t\tgit) ;; \\\n@@ -1146,9 +1146,9 @@ check-docs::\n \t\tesac ; \\\n \tdone; \\\n \t( \\\n-\t\tsed -e '1,/^__DATA__/d' \\\n+\t\tsed -e '/^#/d' \\\n \t\t    -e 's/[ \t].*//' \\\n-\t\t    -e 's/^/listed /' Documentation/cmd-list.perl; \\\n+\t\t    -e 's/^/listed /' command-list.txt; \\\n \t\tls -1 Documentation/git*txt | \\\n \t\tsed -e 's|Documentation/|documented |' \\\n \t\t    -e 's/\\.txt//'; \\\ndiff --git a/command-list.txt b/command-list.txt\nnew file mode 100644\nindex 0000000..d30e869\n--- /dev/null\n+++ b/command-list.txt\n@@ -0,0 +1,128 @@\n+# List of known git commands.\n+# command name\t\t\t\tcategory [deprecated] [common]\n+git-add                                 mainporcelain common\n+git-am                                  mainporcelain\n+git-annotate                            ancillaryinterrogators\n+git-apply                               plumbingmanipulators\n+git-archimport                          foreignscminterface\n+git-archive                             mainporcelain\n+git-bisect                              mainporcelain common\n+git-blame                               ancillaryinterrogators\n+git-branch                              mainporcelain common\n+git-bundle                              mainporcelain\n+git-cat-file                            plumbinginterrogators\n+git-check-attr                          purehelpers\n+git-checkout                            mainporcelain common\n+git-checkout-index                      plumbingmanipulators\n+git-check-ref-format                    purehelpers\n+git-cherry                              ancillaryinterrogators\n+git-cherry-pick                         mainporcelain\n+git-citool                              mainporcelain\n+git-clean                               mainporcelain\n+git-clone                               mainporcelain common\n+git-commit                              mainporcelain common\n+git-commit-tree                         plumbingmanipulators\n+git-config                              ancillarymanipulators\n+git-count-objects                       ancillaryinterrogators\n+git-cvsexportcommit                     foreignscminterface\n+git-cvsimport                           foreignscminterface\n+git-cvsserver                           foreignscminterface\n+git-daemon                              synchingrepositories\n+git-describe                            mainporcelain\n+git-diff                                mainporcelain common\n+git-diff-files                          plumbinginterrogators\n+git-diff-index                          plumbinginterrogators\n+git-diff-tree                           plumbinginterrogators\n+git-fast-import\t\t\t\tancillarymanipulators\n+git-fetch                               mainporcelain common\n+git-fetch-pack                          synchingrepositories\n+git-filter-branch                       ancillarymanipulators\n+git-fmt-merge-msg                       purehelpers\n+git-for-each-ref                        plumbinginterrogators\n+git-format-patch                        mainporcelain\n+git-fsck\t                        ancillaryinterrogators\n+git-gc                                  mainporcelain\n+git-get-tar-commit-id                   ancillaryinterrogators\n+git-grep                                mainporcelain common\n+git-gui                                 mainporcelain\n+git-hash-object                         plumbingmanipulators\n+git-http-fetch                          synchelpers\n+git-http-push                           synchelpers\n+git-imap-send                           foreignscminterface\n+git-index-pack                          plumbingmanipulators\n+git-init                                mainporcelain common\n+git-instaweb                            ancillaryinterrogators\n+gitk                                    mainporcelain\n+git-log                                 mainporcelain common\n+git-lost-found                          ancillarymanipulators\tdeprecated\n+git-ls-files                            plumbinginterrogators\n+git-ls-remote                           plumbinginterrogators\n+git-ls-tree                             plumbinginterrogators\n+git-mailinfo                            purehelpers\n+git-mailsplit                           purehelpers\n+git-merge                               mainporcelain common\n+git-merge-base                          plumbinginterrogators\n+git-merge-file                          plumbingmanipulators\n+git-merge-index                         plumbingmanipulators\n+git-merge-one-file                      purehelpers\n+git-mergetool                           ancillarymanipulators\n+git-merge-tree                          ancillaryinterrogators\n+git-mktag                               plumbingmanipulators\n+git-mktree                              plumbingmanipulators\n+git-mv                                  mainporcelain common\n+git-name-rev                            plumbinginterrogators\n+git-pack-objects                        plumbingmanipulators\n+git-pack-redundant                      plumbinginterrogators\n+git-pack-refs                           ancillarymanipulators\n+git-parse-remote                        synchelpers\n+git-patch-id                            purehelpers\n+git-peek-remote                         purehelpers\tdeprecated\n+git-prune                               ancillarymanipulators\n+git-prune-packed                        plumbingmanipulators\n+git-pull                                mainporcelain common\n+git-push                                mainporcelain common\n+git-quiltimport                         foreignscminterface\n+git-read-tree                           plumbingmanipulators\n+git-rebase                              mainporcelain common\n+git-receive-pack                        synchelpers\n+git-reflog                              ancillarymanipulators\n+git-relink                              ancillarymanipulators\n+git-remote                              ancillarymanipulators\n+git-repack                              ancillarymanipulators\n+git-request-pull                        foreignscminterface\n+git-rerere                              ancillaryinterrogators\n+git-reset                               mainporcelain common\n+git-revert                              mainporcelain\n+git-rev-list                            plumbinginterrogators\n+git-rev-parse                           ancillaryinterrogators\n+git-rm                                  mainporcelain common\n+git-runstatus                           ancillaryinterrogators\n+git-send-email                          foreignscminterface\n+git-send-pack                           synchingrepositories\n+git-shell                               synchelpers\n+git-shortlog                            mainporcelain\n+git-show                                mainporcelain common\n+git-show-branch                         ancillaryinterrogators\n+git-show-index                          plumbinginterrogators\n+git-show-ref                            plumbinginterrogators\n+git-sh-setup                            purehelpers\n+git-stash                               mainporcelain\n+git-status                              mainporcelain common\n+git-stripspace                          purehelpers\n+git-submodule                           mainporcelain\n+git-svn                                 foreignscminterface\n+git-symbolic-ref                        plumbingmanipulators\n+git-tag                                 mainporcelain common\n+git-tar-tree                            plumbinginterrogators\tdeprecated\n+git-unpack-file                         plumbinginterrogators\n+git-unpack-objects                      plumbingmanipulators\n+git-update-index                        plumbingmanipulators\n+git-update-ref                          plumbingmanipulators\n+git-update-server-info                  synchingrepositories\n+git-upload-archive                      synchelpers\n+git-upload-pack                         synchelpers\n+git-var                                 plumbinginterrogators\n+git-verify-pack                         plumbinginterrogators\n+git-verify-tag                          ancillaryinterrogators\n+git-whatchanged                         ancillaryinterrogators\n+git-write-tree                          plumbingmanipulators\ndiff --git a/generate-cmdlist.sh b/generate-cmdlist.sh\nindex 1ba27ec..a2913c2 100755\n--- a/generate-cmdlist.sh\n+++ b/generate-cmdlist.sh\n@@ -9,29 +9,8 @@ struct cmdname_help\n \n static struct cmdname_help common_cmds[] = {\"\n \n-sort <<\\EOF |\n-add\n-bisect\n-branch\n-checkout\n-clone\n-commit\n-diff\n-fetch\n-grep\n-init\n-log\n-merge\n-mv\n-pull\n-push\n-rebase\n-reset\n-rm\n-show\n-status\n-tag\n-EOF\n+sed -n -e 's/^git-\\([^ \t]*\\)[ \t].* common.*/\\1/p' command-list.txt |\n+sort |\n while read cmd\n do\n      sed -n '\n-- \n1.5.3.6.2090.g4ece0\n"}]}