summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Fonseca <jonas.fonseca@gmail.com>2018-05-19 17:54:16 -0400
committerJonas Fonseca <jonas.fonseca@gmail.com>2018-05-19 20:44:38 -0400
commit13afba878b3618e785a54feff20f2ece8d4b9f8f (patch)
tree733b299de4bcd347d4e81b93b613153e505cdce5
parent625bb58386cf4180102a0f944f962b4f7dcbc9cd (diff)
Fix argument parsing to pass '--' to git-rev-parse
-rw-r--r--src/tig.c1
-rwxr-xr-xtest/main/filter-args-test6
2 files changed, 3 insertions, 4 deletions
diff --git a/src/tig.c b/src/tig.c
index 4b7d55e4..92718100 100644
--- a/src/tig.c
+++ b/src/tig.c
@@ -508,7 +508,6 @@ parse_options(int argc, const char *argv[], bool pager_mode)
if (!seen_dashdash) {
if (!strcmp(opt, "--")) {
seen_dashdash = true;
- continue;
} else if (!strcmp(opt, "-v") || !strcmp(opt, "--version")) {
printf("tig version %s\n", TIG_VERSION);
diff --git a/test/main/filter-args-test b/test/main/filter-args-test
index 784b754a..0ad3be31 100755
--- a/test/main/filter-args-test
+++ b/test/main/filter-args-test
@@ -31,9 +31,9 @@ grep 'git rev-parse' < "$TIG_TRACE" > rev-parse.trace
grep 'git log' < "$TIG_TRACE" > log.trace
assert_equals 'rev-parse.trace' <<EOF
-git rev-parse --no-revs --no-flags common tracer
-git rev-parse --flags --no-revs common tracer
-git rev-parse --symbolic --revs-only common tracer
+git rev-parse --no-revs --no-flags -- common tracer
+git rev-parse --flags --no-revs -- common tracer
+git rev-parse --symbolic --revs-only -- common tracer
git rev-parse --git-dir --is-inside-work-tree --show-cdup --show-prefix HEAD --symbolic-full-name HEAD
EOF