[GSoC PATCH v2 0/2] repo: add -z and objects.format

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi!

This v2 contains small fixes pointed in the last version:

1. Adding two extra spaces in the usage string

2. Use `object.format` instead of `objects.format`

Here's the range-diff versus v1:

1:  4cb193f59c ! 1:  3ea40b1572 repo: add the flag -z as an alias for --format=nul
    @@ Documentation/git-repo.adoc: git-repo - Retrieve information about the repositor
      --------
      [synopsis]
     -git repo info [--format=(keyvalue|nul)] [<key>...]
    -+git repo info [--format=(keyvalue|nul)|-z] [<key>...]
    ++git repo info [--format=(keyvalue|nul) | -z] [<key>...]

      DESCRIPTION
      -----------
    @@ Documentation/git-repo.adoc: THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHAN
      COMMANDS
      --------
     -`info [--format=(keyvalue|nul)] [<key>...]`::
    -+`info [--format=(keyvalue|nul)|-z] [<key>...]`::
    ++`info [--format=(keyvalue|nul) | -z] [<key>...]`::
      	Retrieve metadata-related information about the current repository. Only
      	the requested data will be returned based on their keys (see "INFO KEYS"
      	section below).
    @@ builtin/repo.c

      static const char *const repo_usage[] = {
     -	"git repo info [--format=(keyvalue|nul)] [<key>...]",
    -+	"git repo info [--format=(keyvalue|nul)|-z] [<key>...]",
    ++	"git repo info [--format=(keyvalue|nul) | -z] [<key>...]",
      	NULL
      };

2:  37087dcc17 ! 2:  1d062e690e repo: add the field objects.format
    @@ Documentation/git-repo.adoc: values that they return:
      `layout.shallow`::
      	`true` if this is a shallow repository, otherwise `false`.

    -+`objects.format`::
    ++`object.format`::
     +	The object format (hash algorithm) used in the repository.
     +
      `references.format`::
    @@ builtin/repo.c: static int get_layout_shallow(struct repository *repo, struct st
      	return 0;
      }

    -+static int get_objects_format(struct repository *repo, struct strbuf *buf)
    ++static int get_object_format(struct repository *repo, struct strbuf *buf)
     +{
     +	strbuf_addstr(buf, repo->hash_algo->name);
     +	return 0;
    @@ builtin/repo.c: static int get_references_format(struct repository *repo, struct
      static const struct field repo_info_fields[] = {
      	{ "layout.bare", get_layout_bare },
      	{ "layout.shallow", get_layout_shallow },
    -+	{ "objects.format", get_objects_format},
    ++	{ "object.format", get_object_format },
      	{ "references.format", get_references_format },
      };

    @@ t/t1900-repo.sh: test_expect_success 'setup remote' '
      test_repo_info 'shallow repository = true is retrieved correctly' \
      	'git clone --depth 1 "file://$PWD/remote"' 'shallow' 'layout.shallow' 'true'

    -+test_repo_info 'objects.format = sha1 is retrieved correctly' \
    -+	'git init --object-format=sha1' 'sha1' 'objects.format' 'sha1'
    ++test_repo_info 'object.format = sha1 is retrieved correctly' \
    ++	'git init --object-format=sha1' 'sha1' 'object.format' 'sha1'
     +
    -+test_repo_info 'objects.format = sha256 is retrieved correctly' \
    -+	'git init --object-format=sha256' 'sha256' 'objects.format' 'sha256'
    ++test_repo_info 'object.format = sha256 is retrieved correctly' \
    ++	'git init --object-format=sha256' 'sha256' 'object.format' 'sha256'
     +
      test_expect_success 'values returned in order requested' '
      	cat >expect <<-\EOF &&

Lucas Seiki Oshiro (2):
  repo: add the flag -z as an alias for --format=nul
  repo: add the field objects.format

 Documentation/git-repo.adoc |  9 +++++++--
 builtin/repo.c              | 24 +++++++++++++++++++-----
 t/t1900-repo.sh             | 18 ++++++++++++++++++
 3 files changed, 44 insertions(+), 7 deletions(-)

-- 
2.39.5 (Apple Git-154)





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux