summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-08-05 10:22:52 +0200
committerJunio C Hamano <gitster@pobox.com>2010-08-06 09:14:22 -0700
commitdea007fb4c8170ea007b577698c7b44df6c318b9 (patch)
tree387a6302089953a7c07c9396cdbd91a36b031c7a /t/t4013
parent64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff)
downloadgit-dea007fb4c8170ea007b577698c7b44df6c318b9.tar.gz
diff: parse separate options like -S foo
Change the option parsing logic in revision.c to accept separate forms like `-S foo' in addition to `-Sfoo'. The rest of git already accepted this form, but revision.c still used its own option parsing. Short options affected are -S<string>, -l<num> and -O<orderfile>, for which an empty string wouldn't make sense, hence -<option> <arg> isn't ambiguous. This patch does not handle --stat-name-width and --stat-width, which are special-cases where diff_long_opt do not apply. They are handled in a separate patch to ease review. Original patch by Matthieu Moy, plus refactoring by Jonathan Nieder. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013')
-rw-r--r--t/t4013/diff.log_-S_F_master7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4013/diff.log_-S_F_master b/t/t4013/diff.log_-S_F_master
new file mode 100644
index 0000000000..978d2b4118
--- /dev/null
+++ b/t/t4013/diff.log_-S_F_master
@@ -0,0 +1,7 @@
+$ git log -S F master
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+$