Main: use --topo-order when arguments are given on the command line

diff --git a/NEWS b/NEWS
index 59274da232460f89610968da7e6a436b12fd0a24..3699097ef00077972db252c05eec5f33d399354c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ tig master
 Improvements:
 
  - Checkout files with unstaged changes. Bound to '!' by default.
+ - Main: use --topo-order also when rev-list arguments are given on the
+   command line.
 
 tig-0.12
 --------

diff --git a/tig.c b/tig.c
index 7831536366d96e439d0037aaf1f76204f1e0151d..26cd2ef386a15f58754a6f8ff915e51578047e40 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -126,8 +126,11 @@ static bool prompt_yesno(const char *prompt);
 #define TIG_LOG_CMD    \
        "git log --no-color --cc --stat -n100 %s 2>/dev/null"
 
+#define TIG_MAIN_BASE \
+       "git log --no-color --pretty=raw --parents --topo-order"
+
 #define TIG_MAIN_CMD \
-       "git log --no-color --topo-order --parents --pretty=raw %s 2>/dev/null"
+       TIG_MAIN_BASE " %s 2>/dev/null"
 
 #define TIG_TREE_CMD   \
        "git ls-tree %s %s"
@@ -524,7 +527,7 @@ parse_options(int argc, char *argv[])
        if (!subcommand)
                /* XXX: This is vulnerable to the user overriding
                 * options required for the main view parser. */
-               string_copy(opt_cmd, "git log --no-color --pretty=raw --parents");
+               string_copy(opt_cmd, TIG_MAIN_BASE);
        else
                string_format(opt_cmd, "git %s", subcommand);