X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/809a9f4877cd60312dfb5fb314dd250d74a386fc..c38c64bb6e5e9c1f173e24c964b06497e24108d9:/tig.c diff --git a/tig.c b/tig.c index 541a8df..cc7f6b8 100644 --- a/tig.c +++ b/tig.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006 Jonas Fonseca +/* Copyright (c) 2006-2007 Jonas Fonseca * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -11,8 +11,12 @@ * GNU General Public License for more details. */ -#ifndef VERSION -#define VERSION "unknown-version" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef TIG_VERSION +#define TIG_VERSION "unknown-version" #endif #ifndef DEBUG @@ -76,6 +80,9 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, #define COLOR_DEFAULT (-1) #define ICONV_NONE ((iconv_t) -1) +#ifndef ICONV_CONST +#define ICONV_CONST /* nothing */ +#endif /* The format and size of the date column in the main view. */ #define DATE_FORMAT "%Y-%m-%d %H:%M" @@ -90,6 +97,10 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, #define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3) +#ifndef GIT_CONFIG +#define GIT_CONFIG "git config" +#endif + #define TIG_LS_REMOTE \ "git ls-remote $(git rev-parse --git-dir) 2>/dev/null" @@ -112,6 +123,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, #define TIG_HELP_CMD "" #define TIG_PAGER_CMD "" #define TIG_STATUS_CMD "" +#define TIG_STAGE_CMD "" /* Some ascii-shorthands fitted into the ncurses namespace. */ #define KEY_TAB '\t' @@ -299,12 +311,14 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(VIEW_HELP, "Show help page"), \ REQ_(VIEW_PAGER, "Show pager view"), \ REQ_(VIEW_STATUS, "Show status view"), \ + REQ_(VIEW_STAGE, "Show stage view"), \ \ REQ_GROUP("View manipulation") \ REQ_(ENTER, "Enter current line and scroll"), \ REQ_(NEXT, "Move to next"), \ REQ_(PREVIOUS, "Move to previous"), \ REQ_(VIEW_NEXT, "Move focus to next view"), \ + REQ_(REFRESH, "Reload and refresh"), \ REQ_(VIEW_CLOSE, "Close the current view"), \ REQ_(QUIT, "Close all views and quit"), \ \ @@ -338,7 +352,8 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(TOGGLE_LINENO, "Toggle line numbers"), \ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \ REQ_(STATUS_UPDATE, "Update file status"), \ - REQ_(EDIT, "Open in editor") + REQ_(EDIT, "Open in editor"), \ + REQ_(CHERRY_PICK, "Cherry-pick commit to current branch") /* User action requests. */ @@ -390,7 +405,7 @@ get_request(const char *name) */ static const char usage[] = -"tig " VERSION " (" __DATE__ ")\n" +"tig " TIG_VERSION " (" __DATE__ ")\n" "\n" "Usage: tig [options]\n" " or: tig [options] [--] [git log options]\n" @@ -425,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_is_inside_work_tree = -1; /* set to TRUE or FALSE */ static char opt_editor[SIZEOF_STR] = ""; enum option_type { @@ -516,7 +532,7 @@ parse_options(int argc, char *argv[]) } if (check_option(opt, 'v', "version", OPT_NONE)) { - printf("tig version %s\n", VERSION); + printf("tig version %s\n", TIG_VERSION); return FALSE; } @@ -613,10 +629,10 @@ LINE(MAIN_REMOTE, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \ LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ -LINE(STAT_SECTION, "", COLOR_DEFAULT, COLOR_BLUE, A_BOLD), \ +LINE(STAT_SECTION, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ LINE(STAT_NONE, "", COLOR_DEFAULT, COLOR_DEFAULT, 0), \ -LINE(STAT_STAGED, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ -LINE(STAT_UNSTAGED,"", COLOR_YELLOW, COLOR_DEFAULT, 0), \ +LINE(STAT_STAGED, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ +LINE(STAT_UNSTAGED,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(STAT_UNTRACKED,"", COLOR_MAGENTA, COLOR_DEFAULT, 0) enum line_type { @@ -729,6 +745,7 @@ static struct keybinding default_keybindings[] = { { 'p', REQ_VIEW_PAGER }, { 'h', REQ_VIEW_HELP }, { 'S', REQ_VIEW_STATUS }, + { 'c', REQ_VIEW_STAGE }, /* View manipulation */ { 'q', REQ_VIEW_CLOSE }, @@ -736,6 +753,7 @@ static struct keybinding default_keybindings[] = { { KEY_RETURN, REQ_ENTER }, { KEY_UP, REQ_PREVIOUS }, { KEY_DOWN, REQ_NEXT }, + { 'R', REQ_REFRESH }, /* Cursor navigation */ { 'k', REQ_MOVE_UP }, @@ -770,6 +788,7 @@ static struct keybinding default_keybindings[] = { { ':', REQ_PROMPT }, { 'u', REQ_STATUS_UPDATE }, { 'e', REQ_EDIT }, + { 'C', REQ_CHERRY_PICK }, /* Using the ncurses SIGWINCH handler. */ { KEY_RESIZE, REQ_SCREEN_RESIZE }, @@ -784,7 +803,8 @@ static struct keybinding default_keybindings[] = { KEYMAP_(BLOB), \ KEYMAP_(PAGER), \ KEYMAP_(HELP), \ - KEYMAP_(STATUS) + KEYMAP_(STATUS), \ + KEYMAP_(STAGE) enum keymap { #define KEYMAP_(name) KEYMAP_##name @@ -1280,6 +1300,7 @@ static struct view_ops tree_ops; static struct view_ops blob_ops; static struct view_ops help_ops; static struct view_ops status_ops; +static struct view_ops stage_ops; #define VIEW_STR(name, cmd, env, ref, ops, map) \ { name, cmd, #env, ref, ops, map} @@ -1297,6 +1318,7 @@ static struct view views[] = { VIEW_(HELP, "help", &help_ops, ""), VIEW_(PAGER, "pager", &pager_ops, "stdin"), VIEW_(STATUS, "status", &status_ops, ""), + VIEW_(STAGE, "stage", &stage_ops, ""), }; #define VIEW(req) (&views[(req) - REQ_OFFSET - 1]) @@ -1926,7 +1948,7 @@ update_view(struct view *view) line[linelen - 1] = 0; if (opt_iconv != ICONV_NONE) { - char *inbuf = line; + ICONV_CONST char *inbuf = line; size_t inlen = linelen; char *outbuf = out_buffer; @@ -2124,11 +2146,12 @@ open_view(struct view *prev, enum request request, enum open_flags flags) } static void -open_editor(struct view *view, char *file) +open_editor(bool from_root, char *file) { char cmd[SIZEOF_STR]; char file_sq[SIZEOF_STR]; char *editor; + char *prefix = from_root ? opt_cdup : ""; editor = getenv("GIT_EDITOR"); if (!editor && *opt_editor) @@ -2141,7 +2164,7 @@ open_editor(struct view *view, char *file) editor = "vi"; if (sq_quote(file_sq, 0, file) < sizeof(file_sq) && - string_format(cmd, "%s %s", editor, file_sq)) { + string_format(cmd, "%s %s%s", editor, prefix, file_sq)) { def_prog_mode(); /* save current tty modes */ endwin(); /* restore original tty modes */ system(cmd); @@ -2159,6 +2182,11 @@ view_driver(struct view *view, enum request request) { int i; + if (request == REQ_NONE) { + doupdate(); + return TRUE; + } + if (view && view->lines) { request = view->ops->request(view, request, &view->line[view->lineno]); if (request == REQ_NONE) @@ -2200,12 +2228,28 @@ view_driver(struct view *view, enum request request) open_view(view, request, OPEN_DEFAULT); break; + case REQ_VIEW_STAGE: + if (!VIEW(REQ_VIEW_STAGE)->lines) { + report("No stage content, press %s to open the status view and choose file", + get_key(REQ_VIEW_STATUS)); + 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_STATUS: open_view(view, request, OPEN_DEFAULT); break; @@ -2215,7 +2259,7 @@ view_driver(struct view *view, enum request request) if ((view == VIEW(REQ_VIEW_DIFF) && view->parent == VIEW(REQ_VIEW_MAIN)) || - (view == VIEW(REQ_VIEW_DIFF) && + (view == VIEW(REQ_VIEW_STAGE) && view->parent == VIEW(REQ_VIEW_STATUS)) || (view == VIEW(REQ_VIEW_BLOB) && view->parent == VIEW(REQ_VIEW_TREE))) { @@ -2251,6 +2295,10 @@ view_driver(struct view *view, enum request request) report(""); break; } + case REQ_REFRESH: + report("Refreshing is not yet supported for the %s view", view->name); + break; + case REQ_TOGGLE_LINENO: opt_line_number = !opt_line_number; redraw_display(); @@ -2286,7 +2334,7 @@ view_driver(struct view *view, enum request request) break; case REQ_SHOW_VERSION: - report("tig-%s (built %s)", VERSION, __DATE__); + report("tig-%s (built %s)", TIG_VERSION, __DATE__); return TRUE; case REQ_SCREEN_RESIZE: @@ -2300,13 +2348,14 @@ view_driver(struct view *view, enum request request) report("Nothing to edit"); break; + case REQ_CHERRY_PICK: + report("Nothing to cherry-pick"); + break; + case REQ_ENTER: report("Nothing to enter"); break; - case REQ_NONE: - doupdate(); - return TRUE; case REQ_VIEW_CLOSE: /* XXX: Mark closed views by letting view->parent point to the @@ -2599,6 +2648,9 @@ help_open(struct view *view) for (i = 0; i < ARRAY_SIZE(req_info); i++) { char *key; + if (req_info[i].request == REQ_NONE) + continue; + if (!req_info[i].request) { add_line_text(view, "", LINE_DEFAULT); add_line_text(view, req_info[i].help, LINE_DEFAULT); @@ -2606,6 +2658,9 @@ help_open(struct view *view) } key = get_key(req_info[i].request); + if (!*key) + key = "(no key defined)"; + if (!string_format(buf, " %-25s %s", key, req_info[i].help)) continue; @@ -2630,6 +2685,50 @@ static struct view_ops help_ops = { * Tree backend */ +struct tree_stack_entry { + struct tree_stack_entry *prev; /* Entry below this in the stack */ + unsigned long lineno; /* Line number to restore */ + char *name; /* Position of name in opt_path */ +}; + +/* The top of the path stack. */ +static struct tree_stack_entry *tree_stack = NULL; +unsigned long tree_lineno = 0; + +static void +pop_tree_stack_entry(void) +{ + struct tree_stack_entry *entry = tree_stack; + + tree_lineno = entry->lineno; + entry->name[0] = 0; + tree_stack = entry->prev; + free(entry); +} + +static void +push_tree_stack_entry(char *name, unsigned long lineno) +{ + struct tree_stack_entry *entry = calloc(1, sizeof(*entry)); + size_t pathlen = strlen(opt_path); + + if (!entry) + return; + + entry->prev = tree_stack; + entry->name = opt_path + pathlen; + tree_stack = entry; + + if (!string_format_from(opt_path, &pathlen, "%s/", name)) { + pop_tree_stack_entry(); + return; + } + + /* Move the current line to the first tree entry. */ + tree_lineno = 1; + entry->lineno = lineno; +} + /* Parse output from git-ls-tree(1): * * 100644 blob fb0e31ea6cc679b7379631188190e975f5789c26 Makefile @@ -2726,9 +2825,10 @@ tree_read(struct view *view, char *text) if (!add_line_text(view, text, type)) return FALSE; - /* Move the current line to the first tree entry. */ - if (first_read) - view->lineno++; + if (tree_lineno > view->lineno) { + view->lineno = tree_lineno; + tree_lineno = 0; + } return TRUE; } @@ -2741,29 +2841,22 @@ tree_request(struct view *view, enum request request, struct line *line) if (request != REQ_ENTER) return request; + /* Cleanup the stack if the tree view is at a different tree. */ + while (!*opt_path && tree_stack) + pop_tree_stack_entry(); + switch (line->type) { case LINE_TREE_DIR: /* Depending on whether it is a subdir or parent (updir?) link * mangle the path buffer. */ if (line == &view->line[1] && *opt_path) { - size_t path_len = strlen(opt_path); - char *dirsep = opt_path + path_len - 1; - - while (dirsep > opt_path && dirsep[-1] != '/') - dirsep--; - - dirsep[0] = 0; + pop_tree_stack_entry(); } else { - size_t pathlen = strlen(opt_path); - size_t origlen = pathlen; char *data = line->data; char *basename = data + SIZEOF_TREE_ATTR; - if (!string_format_from(opt_path, &pathlen, "%s/", basename)) { - opt_path[origlen] = 0; - return TRUE; - } + push_tree_stack_entry(basename, view->lineno); } /* Trees and subtrees share the same ID, so they are not not @@ -2782,6 +2875,9 @@ tree_request(struct view *view, enum request request, struct line *line) } open_view(view, request, flags); + if (request == REQ_VIEW_TREE) { + view->lineno = tree_lineno; + } return REQ_NONE; } @@ -2814,7 +2910,7 @@ static struct view_ops tree_ops = { static bool blob_read(struct view *view, char *line) { - return add_line_text(view, line, LINE_DEFAULT); + return add_line_text(view, line, LINE_DEFAULT) != NULL; } static struct view_ops blob_ops = { @@ -2845,6 +2941,9 @@ struct status { char name[SIZEOF_STR]; }; +static struct status stage_status; +static enum line_type stage_line_type; + /* Get fields from the diff line: * :100644 100644 06a5d6ae9eca55be2e0e585a152e6b1336f2b20e 0000000000000000000000000000000000000000 M */ @@ -2973,12 +3072,13 @@ status_open(struct view *view) struct stat statbuf; char exclude[SIZEOF_STR]; char cmd[SIZEOF_STR]; + unsigned long prev_lineno = view->lineno; size_t i; for (i = 0; i < view->lines; i++) free(view->line[i].data); free(view->line); - view->lines = view->line_size = 0; + view->lines = view->line_size = view->lineno = 0; view->line = NULL; if (!realloc_lines(view, view->line_size + 6)) @@ -3002,6 +3102,13 @@ status_open(struct view *view) !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED)) return FALSE; + /* If all went well restore the previous line number to stay in + * the context. */ + if (prev_lineno < view->lines) + view->lineno = prev_lineno; + else + view->lineno = view->lines - 1; + return TRUE; } @@ -3122,9 +3229,16 @@ status_enter(struct view *view, struct line *line) die("w00t"); } - open_view(view, REQ_VIEW_DIFF, OPEN_RELOAD | OPEN_SPLIT); - if (view_is_displayed(VIEW(REQ_VIEW_DIFF))) { - string_format(VIEW(REQ_VIEW_DIFF)->ref, info, status->name); + open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | OPEN_SPLIT); + if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) { + if (status) { + stage_status = *status; + } else { + memset(&stage_status, 0, sizeof(stage_status)); + } + + stage_line_type = line->type; + string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.name); } return REQ_NONE; @@ -3224,13 +3338,18 @@ status_request(struct view *view, enum request request, struct line *line) if (!status) return request; - open_editor(view, status->name); + open_editor(status->status != '?', status->name); + open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); break; case REQ_ENTER: status_enter(view, line); break; + case REQ_REFRESH: + open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); + break; + default: return request; } @@ -3318,6 +3437,171 @@ static struct view_ops status_ops = { }; +static bool +stage_diff_line(FILE *pipe, struct line *line) +{ + char *buf = line->data; + size_t bufsize = strlen(buf); + size_t written = 0; + + while (!ferror(pipe) && written < bufsize) { + written += fwrite(buf + written, 1, bufsize - written, pipe); + } + + fputc('\n', pipe); + + return written == bufsize; +} + +static struct line * +stage_diff_hdr(struct view *view, struct line *line) +{ + int diff_hdr_dir = line->type == LINE_DIFF_CHUNK ? -1 : 1; + struct line *diff_hdr; + + if (line->type == LINE_DIFF_CHUNK) + diff_hdr = line - 1; + else + diff_hdr = view->line + 1; + + while (diff_hdr > view->line && diff_hdr < view->line + view->lines) { + if (diff_hdr->type == LINE_DIFF_HEADER) + return diff_hdr; + + diff_hdr += diff_hdr_dir; + } + + return NULL; +} + +static bool +stage_update_chunk(struct view *view, struct line *line) +{ + char cmd[SIZEOF_STR]; + size_t cmdsize = 0; + struct line *diff_hdr, *diff_chunk, *diff_end; + FILE *pipe; + + diff_hdr = stage_diff_hdr(view, line); + if (!diff_hdr) + return FALSE; + + if (opt_cdup[0] && + !string_format_from(cmd, &cmdsize, "cd %s;", opt_cdup)) + return FALSE; + + if (!string_format_from(cmd, &cmdsize, + "git apply --cached %s - && " + "git update-index -q --unmerged --refresh 2>/dev/null", + stage_line_type == LINE_STAT_STAGED ? "-R" : "")) + return FALSE; + + pipe = popen(cmd, "w"); + if (!pipe) + return FALSE; + + diff_end = view->line + view->lines; + if (line->type != LINE_DIFF_CHUNK) { + diff_chunk = diff_hdr; + + } else { + for (diff_chunk = line + 1; diff_chunk < diff_end; diff_chunk++) + if (diff_chunk->type == LINE_DIFF_CHUNK || + diff_chunk->type == LINE_DIFF_HEADER) + diff_end = diff_chunk; + + diff_chunk = line; + + while (diff_hdr->type != LINE_DIFF_CHUNK) { + switch (diff_hdr->type) { + case LINE_DIFF_HEADER: + case LINE_DIFF_INDEX: + case LINE_DIFF_ADD: + case LINE_DIFF_DEL: + break; + + default: + diff_hdr++; + continue; + } + + if (!stage_diff_line(pipe, diff_hdr++)) { + pclose(pipe); + return FALSE; + } + } + } + + while (diff_chunk < diff_end && stage_diff_line(pipe, diff_chunk)) + diff_chunk++; + + pclose(pipe); + + if (diff_chunk != diff_end) + return FALSE; + + return TRUE; +} + +static void +stage_update(struct view *view, struct line *line) +{ + if (stage_line_type != LINE_STAT_UNTRACKED && + (line->type == LINE_DIFF_CHUNK || !stage_status.status)) { + if (!stage_update_chunk(view, line)) { + report("Failed to apply chunk"); + return; + } + + } else if (!status_update_file(view, &stage_status, stage_line_type)) { + report("Failed to update file"); + return; + } + + open_view(view, REQ_VIEW_STATUS, OPEN_RELOAD); + + view = VIEW(REQ_VIEW_STATUS); + if (view_is_displayed(view)) + status_enter(view, &view->line[view->lineno]); +} + +static enum request +stage_request(struct view *view, enum request request, struct line *line) +{ + switch (request) { + case REQ_STATUS_UPDATE: + stage_update(view, line); + break; + + case REQ_EDIT: + if (!stage_status.name[0]) + return request; + + open_editor(stage_status.status != '?', stage_status.name); + break; + + case REQ_ENTER: + pager_request(view, request, line); + break; + + default: + return request; + } + + return REQ_NONE; +} + +static struct view_ops stage_ops = { + "line", + NULL, + pager_read, + pager_draw, + stage_request, + pager_grep, + pager_select, +}; + + /* * Revision graph */ @@ -3744,6 +4028,26 @@ main_read(struct view *view, char *line) return TRUE; } +static void +cherry_pick_commit(struct commit *commit) +{ + char cmd[SIZEOF_STR]; + char *cherry_pick = getenv("TIG_CHERRY_PICK"); + + if (!cherry_pick) + cherry_pick = "git cherry-pick"; + + if (string_format(cmd, "%s %s", cherry_pick, commit->id)) { + def_prog_mode(); /* save current tty modes */ + endwin(); /* restore original tty modes */ + system(cmd); + fprintf(stderr, "Press Enter to continue"); + getc(stdin); + reset_prog_mode(); + redraw_display(); + } +} + static enum request main_request(struct view *view, enum request request, struct line *line) { @@ -3751,6 +4055,8 @@ main_request(struct view *view, enum request request, struct line *line) if (request == REQ_ENTER) open_view(view, REQ_VIEW_DIFF, flags); + else if (request == REQ_CHERRY_PICK) + cherry_pick_commit(line->data); else return request; @@ -3989,6 +4295,21 @@ report(const char *msg, ...) 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; @@ -4261,17 +4582,28 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen static int load_repo_config(void) { - return read_properties(popen("git repo-config --list", "r"), + return read_properties(popen(GIT_CONFIG " --list", "r"), "=", read_repo_config_option); } 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); - 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); + } + return OK; } @@ -4280,7 +4612,7 @@ read_repo_info(char *name, size_t namelen, char *value, size_t valuelen) 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); } @@ -4372,10 +4704,6 @@ main(int argc, char *argv[]) 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."); @@ -4387,6 +4715,10 @@ main(int argc, char *argv[]) if (!parse_options(argc, argv)) return 0; + /* Require a git repository unless when running in pager mode. */ + if (!opt_git_dir[0]) + die("Not a git repository"); + if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) { opt_iconv = iconv_open(opt_codeset, opt_encoding); if (opt_iconv == ICONV_NONE)