Do not show boundary commits by default

They can cause confusing results when combined with the --author flag.
If they should be shown the --boundary option should be passed.

diff --git a/NEWS b/NEWS
index 9ebcbeabc7c8c55fde9450efaf961e515d8fb0d5..3615f1ddecf79c7e2d3c46c0e03136d9c2426a82 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ Improvements:
  - Allow line graphics to be disabled with new line-graphics option.
  - Main view: also include the reference names when searching.
  - Main view: support for refreshing.
+ - Main view: disable boundary commits by default. Use --boundary when
+   they should be shown. (Debian bug 498628)
  - Stage view: add stage-next action to jump to next diff chunk that can
    be staged. By default bound to '@'.
  - Configure: check for the ncurses header files.

diff --git a/tig.c b/tig.c
index fd0076f076e38b2e3f2a6374a376e84f27046f42..a830412a6e5b0ff601b69f4a7f3f22beb5feab6b 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -126,7 +126,7 @@ static size_t utf8_length(const char *string, int *width, size_t max_width, int
        "git log --no-color --cc --stat -n100 %s 2>/dev/null"
 
 #define TIG_MAIN_CMD \
-       "git log --no-color --topo-order --parents --boundary --pretty=raw %s 2>/dev/null"
+       "git log --no-color --topo-order --parents --pretty=raw %s 2>/dev/null"
 
 #define TIG_TREE_CMD   \
        "git ls-tree %s %s"
@@ -522,7 +522,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 --boundary --parents");
+               string_copy(opt_cmd, "git log --no-color --pretty=raw --parents");
        else
                string_format(opt_cmd, "git %s", subcommand);