Detect working trees and disable the status view when it is missing

In the process, make any call to report() before a view has been
set end up in die() to avoid problems with uninitialized views.

diff --git a/tig.c b/tig.c
index 3a9bc2d0b83e185165917ee2425f6e2caca1a96f..cc7f6b8d3d7a78f2757b2d7f81162d3996bda29a 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -440,6 +440,7 @@ 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]    = "";
 static char opt_search[SIZEOF_STR]     = "";
 static char opt_cdup[SIZEOF_STR]       = "";
 static char opt_git_dir[SIZEOF_STR]    = "";

+static char opt_is_inside_work_tree    = -1; /* set to TRUE or FALSE */

 static char opt_editor[SIZEOF_STR]     = "";
 
 enum option_type {
 static char opt_editor[SIZEOF_STR]     = "";
 
 enum option_type {


@@ -2236,12 +2237,19 @@ view_driver(struct view *view, enum request request)
                open_view(view, request, OPEN_DEFAULT);
                break;
 
                open_view(view, request, OPEN_DEFAULT);
                break;
 

+       case REQ_VIEW_STATUS:
+               if (opt_is_inside_work_tree == FALSE) {
+                       report("The status view requires a working tree");
+                       break;
+               }
+               open_view(view, request, OPEN_DEFAULT);
+               break;
+

        case REQ_VIEW_MAIN:
        case REQ_VIEW_DIFF:
        case REQ_VIEW_LOG:
        case REQ_VIEW_TREE:
        case REQ_VIEW_HELP:
        case REQ_VIEW_MAIN:
        case REQ_VIEW_DIFF:
        case REQ_VIEW_LOG:
        case REQ_VIEW_TREE:
        case REQ_VIEW_HELP:

-       case REQ_VIEW_STATUS:

                open_view(view, request, OPEN_DEFAULT);
                break;
 
                open_view(view, request, OPEN_DEFAULT);
                break;
 


@@ -3067,7 +3075,6 @@ status_open(struct view *view)
        unsigned long prev_lineno = view->lineno;
        size_t i;
 
        unsigned long prev_lineno = view->lineno;
        size_t i;
 

-

        for (i = 0; i < view->lines; i++)
                free(view->line[i].data);
        free(view->line);
        for (i = 0; i < view->lines; i++)
                free(view->line[i].data);
        free(view->line);


@@ -4288,6 +4295,21 @@ report(const char *msg, ...)
        if (input_mode)
                return;
 
        if (input_mode)
                return;
 

+       if (!view) {
+               char buf[SIZEOF_STR];
+               va_list args;
+
+               va_start(args, msg);
+               if (vsnprintf(buf, sizeof(buf), msg, args) >= sizeof(buf)) {
+                       buf[sizeof(buf) - 1] = 0;
+                       buf[sizeof(buf) - 2] = '.';
+                       buf[sizeof(buf) - 3] = '.';
+                       buf[sizeof(buf) - 4] = '.';
+               }
+               va_end(args);
+               die("%s", buf);
+       }
+

        if (!status_empty || *msg) {
                va_list args;
 
        if (!status_empty || *msg) {
                va_list args;
 


@@ -4567,10 +4589,21 @@ load_repo_config(void)
 static int
 read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 {
 static int
 read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 {

-       if (!opt_git_dir[0])
+       if (!opt_git_dir[0]) {

                string_ncopy(opt_git_dir, name, namelen);
                string_ncopy(opt_git_dir, name, namelen);

-       else
+
+       } else if (opt_is_inside_work_tree == -1) {
+               /* This can be 3 different values depending on the
+                * version of git being used. If git-rev-parse does not
+                * understand --is-inside-work-tree it will simply echo
+                * the option else either "true" or "false" is printed.
+                * Default to true for the unknown case. */
+               opt_is_inside_work_tree = strcmp(name, "false") ? TRUE : FALSE;
+
+       } else {

                string_ncopy(opt_cdup, name, namelen);
                string_ncopy(opt_cdup, name, namelen);

+       }
+

        return OK;
 }
 
        return OK;
 }
 


@@ -4579,7 +4612,7 @@ read_repo_info(char *name, size_t namelen, char *value, size_t valuelen)
 static int
 load_repo_info(void)
 {
 static int
 load_repo_info(void)
 {

-       return read_properties(popen("git rev-parse --git-dir --show-cdup 2>/dev/null", "r"),
+       return read_properties(popen("git rev-parse --git-dir --is-inside-work-tree --show-cdup 2>/dev/null", "r"),

                               "=", read_repo_info);
 }
 
                               "=", read_repo_info);
 }