rugged 1.6.3 → 1.9.0

data/vendor/libgit2/include/git2/types.h

@@ -81,13 +81,18 @@ typedef enum {
 	GIT_OBJECT_REF_DELTA = 7  /**< A delta, base is given by object id. */
 } git_object_t;
 
-/** An open object database handle. */
+/**
+ * An object database stores the objects (commit, trees, blobs, tags,
+ * etc) for a repository.
+ */
 typedef struct git_odb git_odb;
 
 /** A custom backend in an ODB */
 typedef struct git_odb_backend git_odb_backend;
 
-/** An object read from the ODB */
+/**
+ * A "raw" object read from the object database.
+ */
 typedef struct git_odb_object git_odb_object;
 
 /** A stream to read/write from the ODB */
@@ -194,7 +199,18 @@ typedef struct git_reference_iterator  git_reference_iterator;
 /** Transactional interface to references */
 typedef struct git_transaction git_transaction;
 
-/** Annotated commits, the input to merge and rebase. */
+/**
+ * Annotated commits are commits with additional metadata about how the
+ * commit was resolved, which can be used for maintaining the user's
+ * "intent" through commands like merge and rebase.
+ *
+ * For example, if a user wants to conceptually "merge `HEAD`", then the
+ * commit portion of an annotated commit will point to the `HEAD` commit,
+ * but the _annotation_ will denote the ref `HEAD`. This allows git to
+ * perform the internal bookkeeping so that the system knows both the
+ * content of what is being merged but also how the content was looked up
+ * so that it can be recorded in the reflog appropriately.
+ */
 typedef struct git_annotated_commit git_annotated_commit;
 
 /** Representation of a status collection */

data/vendor/libgit2/include/git2/version.h

@@ -7,23 +7,31 @@
 #ifndef INCLUDE_git_version_h__
 #define INCLUDE_git_version_h__
 
+/**
+ * @file git2/version.h
+ * @brief The version of libgit2
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
 /**
  * The version string for libgit2.  This string follows semantic
  * versioning (v2) guidelines.
  */
-#define LIBGIT2_VERSION        "1.6.3"
+#define LIBGIT2_VERSION           "1.9.0"
 
 /** The major version number for this version of libgit2. */
-#define LIBGIT2_VER_MAJOR      1
+#define LIBGIT2_VERSION_MAJOR      1
 
 /** The minor version number for this version of libgit2. */
-#define LIBGIT2_VER_MINOR      6
+#define LIBGIT2_VERSION_MINOR      9
 
 /** The revision ("teeny") version number for this version of libgit2. */
-#define LIBGIT2_VER_REVISION   3
+#define LIBGIT2_VERSION_REVISION   0
 
 /** The Windows DLL patch number for this version of libgit2. */
-#define LIBGIT2_VER_PATCH      0
+#define LIBGIT2_VERSION_PATCH      0
 
 /**
  * The prerelease string for this version of libgit2.  For development
@@ -31,9 +39,37 @@
  * a prerelease name like "beta" or "rc1".  For final releases, this will
  * be `NULL`.
  */
-#define LIBGIT2_VER_PRERELEASE NULL
+#define LIBGIT2_VERSION_PRERELEASE NULL
+
+/**
+ * The library ABI soversion for this version of libgit2. This should
+ * only be changed when the library has a breaking ABI change, and so
+ * may not reflect the library's API version number.
+ */
+#define LIBGIT2_SOVERSION         "1.9"
+
+/**
+ * An integer value representing the libgit2 version number. For example,
+ * libgit2 1.6.3 is 1060300.
+ */
+#define LIBGIT2_VERSION_NUMBER (    \
+    (LIBGIT2_VERSION_MAJOR * 1000000) + \
+    (LIBGIT2_VERSION_MINOR * 10000) +   \
+    (LIBGIT2_VERSION_REVISION * 100))
+
+/**
+ * Compare the libgit2 version against a given version. Evaluates to true
+ * if the given major, minor, and revision values are greater than or equal
+ * to the currently running libgit2 version. For example:
+ *
+ *  #if LIBGIT2_VERSION_CHECK(1, 6, 3)
+ *  # error libgit2 version is >= 1.6.3
+ *  #endif
+ */
+#define LIBGIT2_VERSION_CHECK(major, minor, revision) \
+	(LIBGIT2_VERSION_NUMBER >= ((major)*1000000)+((minor)*10000)+((revision)*100))
 
-/** The library ABI soversion for this version of libgit2. */
-#define LIBGIT2_SOVERSION      "1.6"
+/** @} */
+GIT_END_DECL
 
 #endif

data/vendor/libgit2/include/git2/worktree.h

@@ -11,11 +11,12 @@
 #include "buffer.h"
 #include "types.h"
 #include "strarray.h"
+#include "checkout.h"
 
 /**
- * @file git2/worktrees.h
- * @brief Git worktree related functions
- * @defgroup git_commit Git worktree related functions
+ * @file git2/worktree.h
+ * @brief Additional working directories for a repository
+ * @defgroup git_commit Additional working directories for a repository
  * @ingroup Git
  * @{
  */
@@ -85,8 +86,9 @@ GIT_EXTERN(int) git_worktree_validate(const git_worktree *wt);
 typedef struct git_worktree_add_options {
 	unsigned int version;
 
-	int lock; /**< lock newly created worktree */
-	git_reference *ref; /**< reference to use for the new worktree HEAD */
+	int lock;		/**< lock newly created worktree */
+	int checkout_existing;	/**< allow checkout of existing branch matching worktree name */
+	git_reference *ref;	/**< reference to use for the new worktree HEAD */
 
 	/**
 	 * Options for the checkout.
@@ -94,8 +96,12 @@ typedef struct git_worktree_add_options {
 	git_checkout_options checkout_options;
 } git_worktree_add_options;
 
+/** Current version for the `git_worktree_add_options` structure */
 #define GIT_WORKTREE_ADD_OPTIONS_VERSION 1
-#define GIT_WORKTREE_ADD_OPTIONS_INIT {GIT_WORKTREE_ADD_OPTIONS_VERSION,0,NULL,GIT_CHECKOUT_OPTIONS_INIT}
+
+/** Static constructor for `git_worktree_add_options` */
+#define GIT_WORKTREE_ADD_OPTIONS_INIT { GIT_WORKTREE_ADD_OPTIONS_VERSION, \
+	0, 0, NULL, GIT_CHECKOUT_OPTIONS_INIT }
 
 /**
  * Initialize git_worktree_add_options structure
@@ -208,7 +214,10 @@ typedef struct git_worktree_prune_options {
 	uint32_t flags;
 } git_worktree_prune_options;
 
+/** Current version for the `git_worktree_prune_options` structure */
 #define GIT_WORKTREE_PRUNE_OPTIONS_VERSION 1
+
+/** Static constructor for `git_worktree_prune_options` */
 #define GIT_WORKTREE_PRUNE_OPTIONS_INIT {GIT_WORKTREE_PRUNE_OPTIONS_VERSION,0}
 
 /**
@@ -237,7 +246,9 @@ GIT_EXTERN(int) git_worktree_prune_options_init(
  *
  * If the worktree is not valid and not locked or if the above
  * flags have been passed in, this function will return a
- * positive value.
+ * positive value. If the worktree is not prunable, an error
+ * message will be set (visible in `giterr_last`) with details about
+ * why.
  *
  * @param wt Worktree to check.
  * @param opts The prunable options.
@@ -263,4 +274,5 @@ GIT_EXTERN(int) git_worktree_prune(git_worktree *wt,
 
 /** @} */
 GIT_END_DECL
+
 #endif

data/vendor/libgit2/src/CMakeLists.txt

@@ -41,8 +41,8 @@ include(SelectHTTPSBackend)
 include(SelectHashes)
 include(SelectHTTPParser)
 include(SelectRegex)
+include(SelectXdiff)
 include(SelectSSH)
-include(SelectWinHTTP)
 include(SelectZlib)
 
 #
@@ -58,20 +58,43 @@ add_feature_info(futimens GIT_USE_FUTIMENS "futimens support")
 
 # qsort
 
-check_prototype_definition(qsort_r
-	"void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, int (*compar)(void *, const void *, const void *))"
-	"" "stdlib.h" GIT_QSORT_R_BSD)
+# old-style FreeBSD qsort_r() has the 'context' parameter as the first argument
+# of the comparison function:
+check_prototype_definition_safe(qsort_r
+	"void (qsort_r)(void *base, size_t nmemb, size_t size, void *context, int (*compar)(void *, const void *, const void *))"
+	"" "stdlib.h" GIT_QSORT_BSD)
+
+# GNU or POSIX qsort_r() has the 'context' parameter as the last argument of the
+# comparison function:
+check_prototype_definition_safe(qsort_r
+	"void (qsort_r)(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *context)"
+	"" "stdlib.h" GIT_QSORT_GNU)
+
+# C11 qsort_s() has the 'context' parameter as the last argument of the
+# comparison function, and returns an error status:
+check_prototype_definition_safe(qsort_s
+	"errno_t (qsort_s)(void *base, rsize_t nmemb, rsize_t size, int (*compar)(const void *, const void *, void *), void *context)"
+	"0" "stdlib.h" GIT_QSORT_C11)
+
+# MSC qsort_s() has the 'context' parameter as the first argument of the
+# comparison function, and as the last argument of qsort_s():
+check_prototype_definition_safe(qsort_s
+	"void (qsort_s)(void *base, size_t num, size_t width, int (*compare )(void *, const void *, const void *), void *context)"
+	"" "stdlib.h" GIT_QSORT_MSC)
 
-check_prototype_definition(qsort_r
-	"void qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *arg)"
-	"" "stdlib.h" GIT_QSORT_R_GNU)
+# random / entropy data
 
-check_function_exists(qsort_s GIT_QSORT_S)
+check_symbol_exists(getentropy unistd.h GIT_RAND_GETENTROPY)
+check_symbol_exists(getloadavg stdlib.h GIT_RAND_GETLOADAVG)
 
-# random / entropy data
+# poll
 
-check_function_exists(getentropy GIT_RAND_GETENTROPY)
-check_function_exists(getloadavg GIT_RAND_GETLOADAVG)
+if(WIN32)
+	set(GIT_IO_WSAPOLL 1)
+else()
+	check_symbol_exists(poll poll.h GIT_IO_POLL)
+	check_symbol_exists(select sys/select.h GIT_IO_SELECT)
+endif()
 
 # determine architecture of the machine
 
@@ -104,7 +127,8 @@ endif()
 # realtime support
 
 check_library_exists(rt clock_gettime "time.h" NEED_LIBRT)
-if(NEED_LIBRT)
+
+if(NEED_LIBRT AND NOT CMAKE_SYSTEM_NAME MATCHES "iOS")
 	list(APPEND LIBGIT2_SYSTEM_LIBS rt)
 	list(APPEND LIBGIT2_PC_LIBS "-lrt")
 endif()
@@ -112,7 +136,8 @@ endif()
 # platform libraries
 
 if(WIN32)
-	list(APPEND LIBGIT2_SYSTEM_LIBS ws2_32)
+	list(APPEND LIBGIT2_SYSTEM_LIBS "ws2_32" "secur32")
+	list(APPEND LIBGIT2_PC_LIBS "-lws2_32" "-lsecur32")
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
@@ -160,7 +185,7 @@ add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix")
 
 # iconv
 if(USE_ICONV)
-	find_package(Iconv)
+	find_package(IntlIconv)
 endif()
 if(ICONV_FOUND)
 	set(GIT_USE_ICONV 1)
@@ -177,7 +202,7 @@ add_feature_info(iconv GIT_USE_ICONV "iconv encoding conversion support")
 add_subdirectory(libgit2)
 add_subdirectory(util)
 
-if(BUILD_CLI)
+if(BUILD_CLI AND NOT CMAKE_SYSTEM_NAME MATCHES "iOS")
 	add_subdirectory(cli)
 endif()
 

data/vendor/libgit2/src/cli/CMakeLists.txt

@@ -4,7 +4,8 @@ set(CLI_INCLUDES
 	"${libgit2_SOURCE_DIR}/src/util"
 	"${libgit2_SOURCE_DIR}/src/cli"
 	"${libgit2_SOURCE_DIR}/include"
-	"${LIBGIT2_DEPENDENCY_INCLUDES}")
+	"${LIBGIT2_DEPENDENCY_INCLUDES}"
+	"${LIBGIT2_SYSTEM_INCLUDES}")
 
 if(WIN32 AND NOT CYGWIN)
 	file(GLOB CLI_SRC_OS win32/*.c)
@@ -39,7 +40,6 @@ add_executable(git2_cli ${CLI_SRC_C} ${CLI_SRC_OS} ${CLI_OBJECTS}
 	${LIBGIT2_DEPENDENCY_OBJECTS})
 target_link_libraries(git2_cli ${CLI_LIBGIT2_LIBRARY} ${LIBGIT2_SYSTEM_LIBS})
 
-set_target_properties(git2_cli PROPERTIES C_STANDARD 90)
 set_target_properties(git2_cli PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
 set_target_properties(git2_cli PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
 

data/vendor/libgit2/src/cli/cmd.c

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "cli.h"
+#include "common.h"
 #include "cmd.h"
 
 const cli_cmd_spec *cli_cmd_spec_byname(const char *name)

data/vendor/libgit2/src/cli/cmd.h

@@ -25,9 +25,13 @@ extern const cli_cmd_spec cli_cmds[];
 extern const cli_cmd_spec *cli_cmd_spec_byname(const char *name);
 
 /* Commands */
+extern int cmd_blame(int argc, char **argv);
 extern int cmd_cat_file(int argc, char **argv);
 extern int cmd_clone(int argc, char **argv);
+extern int cmd_config(int argc, char **argv);
 extern int cmd_hash_object(int argc, char **argv);
 extern int cmd_help(int argc, char **argv);
+extern int cmd_index_pack(int argc, char **argv);
+extern int cmd_init(int argc, char **argv);
 
 #endif /* CLI_cmd_h__ */

data/vendor/libgit2/src/cli/cmd_blame.c

@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <stdio.h>
+#include <git2.h>
+#include "common.h"
+#include "cmd.h"
+#include "error.h"
+#include "sighandler.h"
+#include "progress.h"
+
+#include "fs_path.h"
+#include "futils.h"
+#include "date.h"
+#include "hashmap.h"
+
+#define COMMAND_NAME "blame"
+
+static char *file;
+static int porcelain, line_porcelain;
+
+static const cli_opt_spec opts[] = {
+	CLI_COMMON_OPT,
+
+	{ CLI_OPT_TYPE_SWITCH,    "porcelain",      'p', &porcelain, 1,
+	  CLI_OPT_USAGE_DEFAULT,   NULL,            "show machine readable output" },
+	{ CLI_OPT_TYPE_SWITCH,    "line-porcelain",  0,  &line_porcelain, 1,
+	  CLI_OPT_USAGE_DEFAULT,   NULL,            "show individual lines in machine readable output" },
+	{ CLI_OPT_TYPE_LITERAL },
+	{ CLI_OPT_TYPE_ARG,       "file",            0,  &file, 0,
+	  CLI_OPT_USAGE_REQUIRED, "file",           "file to blame" },
+
+	{ 0 }
+};
+
+static void print_help(void)
+{
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, 0);
+	printf("\n");
+
+	printf("Show the origin of each line of a file.\n");
+	printf("\n");
+
+	printf("Options:\n");
+
+	cli_opt_help_fprint(stdout, opts);
+}
+
+static int strintlen(size_t n)
+{
+	int len = 1;
+
+	while (n > 10) {
+		n /= 10;
+		len++;
+
+		if (len == INT_MAX)
+			break;
+	}
+
+	return len;
+}
+
+static int fmt_date(git_str *out, git_time_t time, int offset)
+{
+	time_t t;
+	struct tm gmt;
+
+	GIT_ASSERT_ARG(out);
+
+	t = (time_t)(time + offset * 60);
+
+	if (p_gmtime_r(&t, &gmt) == NULL)
+		return -1;
+
+	return git_str_printf(out, "%.4u-%02u-%02u %02u:%02u:%02u %+03d%02d",
+		gmt.tm_year + 1900, gmt.tm_mon + 1, gmt.tm_mday,
+		gmt.tm_hour, gmt.tm_min, gmt.tm_sec,
+		offset / 60, offset % 60);
+}
+
+static int print_standard(git_blame *blame)
+{
+	size_t max_line_number = 0;
+	int max_lineno_len, max_line_len, max_author_len = 0, max_path_len = 0;
+	const char *last_path = NULL;
+	const git_blame_line *line;
+	bool paths_differ = false;
+	git_str date_str = GIT_STR_INIT;
+	size_t i;
+	int ret = 0;
+
+	/* Compute the maximum size of things */
+	for (i = 0; i < git_blame_hunkcount(blame); i++) {
+		const git_blame_hunk *hunk = git_blame_hunk_byindex(blame, i);
+		size_t hunk_author_len = strlen(hunk->orig_signature->name);
+		size_t hunk_path_len = strlen(hunk->orig_path);
+		size_t hunk_max_line_number =
+			hunk->orig_start_line_number + hunk->lines_in_hunk;
+
+		if (hunk_max_line_number > max_line_number)
+			max_line_number = hunk_max_line_number;
+
+		if (hunk_author_len > INT_MAX)
+			max_author_len = INT_MAX;
+		else if ((int)hunk_author_len > max_author_len)
+			max_author_len = (int)hunk_author_len;
+
+		if (hunk_path_len > INT_MAX)
+			hunk_path_len = INT_MAX;
+		else if ((int)hunk_path_len > max_path_len)
+			max_path_len = (int)hunk_path_len;
+
+		if (!paths_differ && last_path != NULL &&
+		    strcmp(last_path, hunk->orig_path) != 0) {
+			paths_differ = true;
+		}
+
+		last_path = hunk->orig_path;
+	}
+
+	max_lineno_len = strintlen(max_line_number);
+
+	max_author_len--;
+
+	for (i = 1; i < git_blame_linecount(blame); i++) {
+		const git_blame_hunk *hunk = git_blame_hunk_byline(blame, i);
+		int oid_abbrev;
+
+		if (!hunk)
+			break;
+
+		oid_abbrev = hunk->boundary ? 7 : 8;
+		printf("%s%.*s ", hunk->boundary ? "^" : "",
+			oid_abbrev, git_oid_tostr_s(&hunk->orig_commit_id));
+
+		if (paths_differ)
+			printf("%-*.*s ", max_path_len, max_path_len, hunk->orig_path);
+
+		git_str_clear(&date_str);
+		if (fmt_date(&date_str,
+				hunk->orig_signature->when.time,
+				hunk->orig_signature->when.offset) < 0) {
+			ret = cli_error_git();
+			goto done;
+		}
+
+		if ((line = git_blame_line_byindex(blame, i)) == NULL) {
+			ret = cli_error_git();
+			goto done;
+		}
+
+		max_line_len = (int)min(line->len, INT_MAX);
+
+		printf("(%-*.*s %s %*" PRIuZ ") %.*s" ,
+			max_author_len, max_author_len, hunk->orig_signature->name,
+			date_str.ptr,
+			max_lineno_len, i,
+			max_line_len, line->ptr);
+		printf("\n");
+	}
+
+done:
+	git_str_dispose(&date_str);
+	return ret;
+}
+
+GIT_INLINE(uint32_t) oid_hashcode(const git_oid *oid)
+{
+	uint32_t hash;
+	memcpy(&hash, oid->id, sizeof(uint32_t));
+	return hash;
+}
+
+GIT_HASHSET_SETUP(git_blame_commitmap, const git_oid *, oid_hashcode, git_oid_equal);
+
+static int print_porcelain(git_blame *blame)
+{
+	git_blame_commitmap seen_ids = GIT_HASHSET_INIT;
+	size_t i, j;
+
+	for (i = 0; i < git_blame_hunkcount(blame); i++) {
+		const git_blame_line *line;
+		const git_blame_hunk *hunk = git_blame_hunk_byindex(blame, i);
+
+		for (j = 0; j < hunk->lines_in_hunk; j++) {
+			size_t line_number = hunk->final_start_line_number + j;
+			bool seen = git_blame_commitmap_contains(&seen_ids, &hunk->orig_commit_id);
+
+			printf("%s %" PRIuZ " %" PRIuZ,
+				git_oid_tostr_s(&hunk->orig_commit_id),
+				hunk->orig_start_line_number + j,
+				hunk->final_start_line_number + j);
+
+			if (!j)
+				printf(" %" PRIuZ, hunk->lines_in_hunk);
+
+			printf("\n");
+
+			if ((!j && !seen) || line_porcelain) {
+				printf("author %s\n", hunk->orig_signature->name);
+				printf("author-mail <%s>\n", hunk->orig_signature->email);
+				printf("author-time %" PRId64 "\n", hunk->orig_signature->when.time);
+				printf("author-tz %+03d%02d\n",
+					hunk->orig_signature->when.offset / 60,
+					hunk->orig_signature->when.offset % 60);
+
+				printf("committer %s\n", hunk->orig_committer->name);
+				printf("committer-mail <%s>\n", hunk->orig_committer->email);
+				printf("committer-time %" PRId64 "\n", hunk->orig_committer->when.time);
+				printf("committer-tz %+03d%02d\n",
+					hunk->orig_committer->when.offset / 60,
+					hunk->orig_committer->when.offset % 60);
+
+				printf("summary %s\n", hunk->summary);
+
+				/* TODO: previous */
+
+				printf("filename %s\n", hunk->orig_path);
+			}
+
+			if ((line = git_blame_line_byindex(blame, line_number)) == NULL)
+				return cli_error_git();
+
+			printf("\t%.*s\n", (int)min(line->len, INT_MAX),
+				line->ptr);
+
+			if (!seen)
+				git_blame_commitmap_add(&seen_ids, &hunk->orig_commit_id);
+		}
+	}
+
+	git_blame_commitmap_dispose(&seen_ids);
+	return 0;
+}
+
+int cmd_blame(int argc, char **argv)
+{
+	cli_repository_open_options open_opts = { argv + 1, argc - 1 };
+	git_blame_options blame_opts = GIT_BLAME_OPTIONS_INIT;
+	git_repository *repo = NULL;
+	git_str workdir_path = GIT_STR_INIT;
+	git_blame *blame = NULL;
+	cli_opt invalid_opt;
+	int ret = 0;
+
+	blame_opts.flags |= GIT_BLAME_USE_MAILMAP;
+
+	if (cli_opt_parse(&invalid_opt, opts, argv + 1, argc - 1, CLI_OPT_PARSE_GNU))
+		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
+
+	if (cli_opt__show_help) {
+		print_help();
+		return 0;
+	}
+
+	if (!file) {
+		ret = cli_error_usage("you must specify a file to blame");
+		goto done;
+	}
+
+	if (cli_repository_open(&repo, &open_opts) < 0)
+		return cli_error_git();
+
+	if ((ret = cli_resolve_path(&workdir_path, repo, file)) != 0)
+		goto done;
+
+	if (git_blame_file(&blame, repo, workdir_path.ptr, &blame_opts) < 0) {
+		ret = cli_error_git();
+		goto done;
+	}
+
+	if (porcelain || line_porcelain)
+		ret = print_porcelain(blame);
+	else
+		ret = print_standard(blame);
+
+done:
+	git_str_dispose(&workdir_path);
+	git_blame_free(blame);
+	git_repository_free(repo);
+	return ret;
+}

data/vendor/libgit2/src/cli/cmd_cat_file.c

@@ -6,7 +6,7 @@
  */
 
 #include <git2.h>
-#include "cli.h"
+#include "common.h"
 #include "cmd.h"
 
 #define COMMAND_NAME "cat-file"
@@ -19,14 +19,11 @@ typedef enum {
 	DISPLAY_TYPE
 } display_t;
 
-static int show_help;
 static int display = DISPLAY_CONTENT;
 static char *type_name, *object_spec;
 
 static const cli_opt_spec opts[] = {
-	{ CLI_OPT_TYPE_SWITCH,    "help",    0, &show_help,   1,
-	  CLI_OPT_USAGE_HIDDEN | CLI_OPT_USAGE_STOP_PARSING, NULL,
-	  "display help about the " COMMAND_NAME " command" },
+	CLI_COMMON_OPT,
 
 	{ CLI_OPT_TYPE_SWITCH,     NULL,    't', &display,    DISPLAY_TYPE,
 	  CLI_OPT_USAGE_REQUIRED,  NULL,    "display the type of the object" },
@@ -45,7 +42,7 @@ static const cli_opt_spec opts[] = {
 
 static void print_help(void)
 {
-	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts);
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, 0);
 	printf("\n");
 
 	printf("Display the content for the given object in the repository.\n");
@@ -139,6 +136,7 @@ static int print_pretty(git_object *object)
 
 int cmd_cat_file(int argc, char **argv)
 {
+	cli_repository_open_options open_opts = { argv + 1, argc - 1};
 	git_repository *repo = NULL;
 	git_object *object = NULL;
 	git_object_t type;
@@ -148,12 +146,12 @@ int cmd_cat_file(int argc, char **argv)
 	if (cli_opt_parse(&invalid_opt, opts, argv + 1, argc - 1, CLI_OPT_PARSE_GNU))
 		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
 
-	if (show_help) {
+	if (cli_opt__show_help) {
 		print_help();
 		return 0;
 	}
 
-	if (git_repository_open_ext(&repo, ".", GIT_REPOSITORY_OPEN_FROM_ENV, NULL) < 0)
+	if (cli_repository_open(&repo, &open_opts) < 0)
 		return cli_error_git();
 
 	if ((giterr = git_revparse_single(&object, repo, object_spec)) < 0) {