Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t3506: validate '-m 1 -ff' is now accepted for non-merge commits
author
Sergey Organov
<sorganov@gmail.com>
Fri, 14 Dec 2018 04:53:51 +0000
(07:53 +0300)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 7 Jan 2019 16:44:37 +0000
(08:44 -0800)
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3506-cherry-pick-ff.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
4d67b4e
)
diff --git
a/t/t3506-cherry-pick-ff.sh
b/t/t3506-cherry-pick-ff.sh
index fb889ac6f05a3243b09fbb7ec05356ed61ff9cb0..127dd0082ff8f535eeb8dee93095cf1ce13f3a95 100755
(executable)
--- a/
t/t3506-cherry-pick-ff.sh
+++ b/
t/t3506-cherry-pick-ff.sh
@@
-64,10
+64,10
@@
test_expect_success 'merge setup' '
git checkout -b new A
'
-test_expect_success 'cherry-pick
a non-merge with --ff and -m should fail
' '
+test_expect_success 'cherry-pick
explicit first parent of a non-merge with --ff
' '
git reset --hard A -- &&
-
test_must_fail
git cherry-pick --ff -m 1 B &&
- git diff --exit-code
A
--
+ git cherry-pick --ff -m 1 B &&
+ git diff --exit-code
C
--
'
test_expect_success 'cherry pick a merge with --ff but without -m should fail' '