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 /src/merge.c | |
| parent | ac584fcfd3e15b0a0200ee609bf964414936c710 (diff) | |
| download | libgit2-58c2b1c4218a2f90ee2745687f2e17670bde0b1b.tar.gz | |
UNBORN implies FAST_FORWARD
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 852043cd7..1be351577 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2531,7 +2531,7 @@ int git_merge_analysis( *out = GIT_MERGE_ANALYSIS_NONE; if (git_repository_head_unborn(repo)) { - *out = GIT_MERGE_ANALYSIS_UNBORN; + *out = GIT_MERGE_ANALYSIS_FASTFORWARD | GIT_MERGE_ANALYSIS_UNBORN; goto done; } |