X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/5699e0cfd59c6a6b30776efeab8b96fbdc586fa7..421ab13a2aa652d6b07ecc1a270a8b1ce5be451d:/tig.c?ds=sidebyside

diff --git a/tig.c b/tig.c
index 371377a..fa2a708 100644
--- a/tig.c
+++ b/tig.c
@@ -27,10 +27,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
 
-#include <sys/types.h>
 #include <regex.h>
 
 #include <locale.h>
@@ -421,6 +422,7 @@ static char opt_codeset[20]		= "UTF-8";
 static iconv_t opt_iconv		= ICONV_NONE;
 static char opt_search[SIZEOF_STR]	= "";
 static char opt_cdup[SIZEOF_STR]	= "";
+static char opt_git_dir[SIZEOF_STR]	= "";
 
 enum option_type {
 	OPT_NONE,
@@ -1151,7 +1153,7 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen)
 
 	if (status == ERR) {
 		fprintf(stderr, "Error on line %d, near '%.*s': %s\n",
-			config_lineno, optlen, opt, config_msg);
+			config_lineno, (int) optlen, opt, config_msg);
 		config_errors = TRUE;
 	}
 
@@ -1287,8 +1289,8 @@ static struct view views[] = {
 	VIEW_(LOG,    "log",    &pager_ops,  ref_head),
 	VIEW_(TREE,   "tree",   &tree_ops,   ref_commit),
 	VIEW_(BLOB,   "blob",   &blob_ops,   ref_blob),
-	VIEW_(HELP,   "help",   &help_ops,  ""),
-	VIEW_(PAGER,  "pager",  &pager_ops,  ""),
+	VIEW_(HELP,   "help",   &help_ops,   ""),
+	VIEW_(PAGER,  "pager",  &pager_ops,  "stdin"),
 	VIEW_(STATUS, "status", &status_ops, ""),
 };
 
@@ -1392,7 +1394,7 @@ update_view_title(struct view *view)
 
 		if (minsize < view->width)
 			refsize = view->width - minsize + 7;
-		string_format_from(buf, &bufpos, " %.*s", refsize, view->ref);
+		string_format_from(buf, &bufpos, " %.*s", (int) refsize, view->ref);
 	}
 
 	if (statelen && bufpos < view->width) {
@@ -2150,7 +2152,7 @@ view_driver(struct view *view, enum request request)
 		break;
 
 	case REQ_VIEW_PAGER:
-		if (!VIEW(REQ_VIEW_PAGER)->lines) {
+		if (!opt_pipe && !VIEW(REQ_VIEW_PAGER)->lines) {
 			report("No pager content, press %s to run command from prompt",
 			       get_key(REQ_PROMPT));
 			break;
@@ -2903,9 +2905,7 @@ error_out:
 #define STATUS_DIFF_INDEX_CMD "git diff-index -z --cached HEAD"
 #define STATUS_DIFF_FILES_CMD "git diff-files -z"
 #define STATUS_LIST_OTHER_CMD \
-	"_git_exclude=$(git rev-parse --git-dir)/info/exclude;" \
-	"test -f \"$_git_exclude\" && exclude=\"--exclude-from=$_git_exclude\";" \
-	"git ls-files -z --others --exclude-per-directory=.gitignore \"$exclude\"" \
+	"git ls-files -z --others --exclude-per-directory=.gitignore"
 
 /* First parse staged info using git-diff-index(1), then parse unstaged
  * info using git-diff-files(1), and finally untracked files using
@@ -2913,6 +2913,9 @@ error_out:
 static bool
 status_open(struct view *view)
 {
+	struct stat statbuf;
+	char exclude[SIZEOF_STR];
+	char cmd[SIZEOF_STR];
 	size_t i;
 
 	for (i = 0; i < view->lines; i++)
@@ -2924,9 +2927,22 @@ status_open(struct view *view)
 	if (!realloc_lines(view, view->line_size + 6))
 		return FALSE;
 
+	if (!string_format(exclude, "%s/info/exclude", opt_git_dir))
+		return FALSE;
+
+	string_copy(cmd, STATUS_LIST_OTHER_CMD);
+
+	if (stat(exclude, &statbuf) >= 0) {
+		size_t cmdsize = strlen(cmd);
+
+		if (!string_format_from(cmd, &cmdsize, " %s", "--exclude-from=") ||
+		    sq_quote(cmd, cmdsize, exclude) >= sizeof(cmd))
+			return FALSE;
+	}
+
 	if (!status_run(view, STATUS_DIFF_INDEX_CMD, TRUE, LINE_STAT_STAGED) ||
 	    !status_run(view, STATUS_DIFF_FILES_CMD, TRUE, LINE_STAT_UNSTAGED) ||
-	    !status_run(view, STATUS_LIST_OTHER_CMD, FALSE, LINE_STAT_UNTRACKED))
+	    !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED))
 		return FALSE;
 
 	return TRUE;
@@ -4061,15 +4077,19 @@ load_repo_config(void)
 static int
 read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 {
-	if (!opt_cdup[0])
+	if (!opt_git_dir[0])
+		string_ncopy(opt_git_dir, name, namelen);
+	else
 		string_ncopy(opt_cdup, name, namelen);
 	return OK;
 }
 
+/* XXX: The line outputted by "--show-cdup" can be empty so the option
+ * must be the last one! */
 static int
 load_repo_info(void)
 {
-	return read_properties(popen("git rev-parse --show-cdup", "r"),
+	return read_properties(popen("git rev-parse --git-dir --show-cdup 2>/dev/null", "r"),
 			       "=", read_repo_info);
 }
 
@@ -4158,6 +4178,13 @@ main(int argc, char *argv[])
 		string_ncopy(opt_codeset, codeset, strlen(codeset));
 	}
 
+	if (load_repo_info() == ERR)
+		die("Failed to load repo info.");
+
+	/* Require a git repository unless when running in pager mode. */
+	if (!opt_git_dir[0])
+		die("Not a git repository");
+
 	if (load_options() == ERR)
 		die("Failed to load user config.");
 
@@ -4166,9 +4193,6 @@ main(int argc, char *argv[])
 	if (load_repo_config() == ERR)
 		die("Failed to load repo config.");
 
-	if (load_repo_info() == ERR)
-		die("Failed to load repo info.");
-
 	if (!parse_options(argc, argv))
 		return 0;
 
@@ -4181,10 +4205,6 @@ main(int argc, char *argv[])
 	if (load_refs() == ERR)
 		die("Failed to load refs.");
 
-	/* Require a git repository unless when running in pager mode. */
-	if (refs_size == 0 && opt_request != REQ_VIEW_PAGER)
-		die("Not a git repository");
-
 	for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
 		view->cmd_env = getenv(view->cmd_env);