revert.c:run_sequencer calls setup_revisions right after replacing "-" with
"@{-1}" for this shorthand. A previous patch taught setup_revisions to handle
this shorthand by doing the required replacement inside revision.c:get_sha1_1.
Hence, the code here is redundant and has been removed.
This patch also adds a test to check that revert recognizes the "-" shorthand.
Signed-off-by: Siddharth Kannan <kannan.siddharth12@xxxxxxxxx>
---
builtin/revert.c | 2 --
t/t3514-revert-shorthand.sh | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
create mode 100755 t/t3514-revert-shorthand.sh
diff --git a/builtin/revert.c b/builtin/revert.c
index 4ca5b51..0bc6657 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -155,8 +155,6 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
if (argc < 2)
usage_with_options(usage_str, options);
- if (!strcmp(argv[1], "-"))
- argv[1] = "@{-1}";
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.assume_dashdash = 1;
argc = setup_revisions(argc, argv, opts->revs, &s_r_opt);
diff --git a/t/t3514-revert-shorthand.sh b/t/t3514-revert-shorthand.sh
new file mode 100755
index 0000000..51f8c81d
--- /dev/null
+++ b/t/t3514-revert-shorthand.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+test_description='log can show previous branch using shorthand - for @{-1}'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_commit first
+'
+
+test_expect_success 'setup branches' '
+ echo "hello" >hello &&
+ cat hello >expect &&
+ git add hello &&
+ git commit -m "hello first commit" &&
+ echo "world" >>hello &&
+ git commit -am "hello second commit" &&
+ git checkout -b testing-1 &&
+ git checkout master &&
+ git revert --no-edit - &&
+ cat hello >actual &&
+ test_cmp expect actual
+'
+
+test_done
--
2.1.4