diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:35:22 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:35:22 -0700 |
| commit | 58c2b1c4218a2f90ee2745687f2e17670bde0b1b (patch) | |
| tree | e00cd7afb7c5cac057e1d051f68bb690258a0a09 /tests | |
| parent | ac584fcfd3e15b0a0200ee609bf964414936c710 (diff) | |
| download | libgit2-58c2b1c4218a2f90ee2745687f2e17670bde0b1b.tar.gz | |
UNBORN implies FAST_FORWARD
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/merge/workdir/analysis.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/merge/workdir/analysis.c b/tests/merge/workdir/analysis.c index 86b50b718..0e937857f 100644 --- a/tests/merge/workdir/analysis.c +++ b/tests/merge/workdir/analysis.c @@ -99,7 +99,8 @@ void test_merge_workdir_analysis__unborn(void) p_unlink(git_buf_cstr(&master)); analysis = analysis_from_branch(NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, analysis); + cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); + cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (analysis & GIT_MERGE_ANALYSIS_UNBORN)); git_buf_free(&master); } |