Commit fa82bb70 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'jk/show-index'

Modernize a less often used command.

* jk/show-index:
  show-index: update documentation for index v2
  make show-index a builtin
parents 93b74a7c fb3010c3
......@@ -14,13 +14,27 @@ SYNOPSIS
DESCRIPTION
-----------
Read the idx file for a Git packfile created with
'git pack-objects' command from the standard input, and
dump its contents.
Read the `.idx` file for a Git packfile (created with
linkgit:git-pack-objects[1] or linkgit:git-index-pack[1]) from the
standard input, and dump its contents. The output consists of one object
per line, with each line containing two or three space-separated
columns:
The information it outputs is subset of what you can get from
'git verify-pack -v'; this command only shows the packfile
offset and SHA-1 of each object.
- the first column is the offset in bytes of the object within the
corresponding packfile
- the second column is the object id of the object
- if the index version is 2 or higher, the third column contains the
CRC32 of the object data
The objects are output in the order in which they are found in the index
file, which should be (in a correctly constructed file) sorted by object
id.
Note that you can get more information on a packfile by calling
linkgit:git-verify-pack[1]. However, as this command considers only the
index file itself, it's both faster and more flexible.
GIT
---
......
......@@ -689,7 +689,6 @@ PROGRAM_OBJS += http-backend.o
PROGRAM_OBJS += imap-send.o
PROGRAM_OBJS += sh-i18n--envsubst.o
PROGRAM_OBJS += shell.o
PROGRAM_OBJS += show-index.o
PROGRAM_OBJS += remote-testsvn.o
# Binary suffix, set to .exe for Windows builds
......@@ -1077,6 +1076,7 @@ BUILTIN_OBJS += builtin/send-pack.o
BUILTIN_OBJS += builtin/serve.o
BUILTIN_OBJS += builtin/shortlog.o
BUILTIN_OBJS += builtin/show-branch.o
BUILTIN_OBJS += builtin/show-index.o
BUILTIN_OBJS += builtin/show-ref.o
BUILTIN_OBJS += builtin/stripspace.o
BUILTIN_OBJS += builtin/submodule--helper.o
......
......@@ -220,6 +220,7 @@ extern int cmd_serve(int argc, const char **argv, const char *prefix);
extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
extern int cmd_show(int argc, const char **argv, const char *prefix);
extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
extern int cmd_show_index(int argc, const char **argv, const char *prefix);
extern int cmd_status(int argc, const char **argv, const char *prefix);
extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
extern int cmd_submodule__helper(int argc, const char **argv, const char *prefix);
......
#include "builtin.h"
#include "cache.h"
#include "pack.h"
static const char show_index_usage[] =
"git show-index";
int cmd_main(int argc, const char **argv)
int cmd_show_index(int argc, const char **argv, const char *prefix)
{
int i;
unsigned nr;
......
......@@ -537,6 +537,7 @@ static struct cmd_struct commands[] = {
{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
{ "show", cmd_show, RUN_SETUP },
{ "show-branch", cmd_show_branch, RUN_SETUP },
{ "show-index", cmd_show_index },
{ "show-ref", cmd_show_ref, RUN_SETUP },
{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment