diff options
| author | crumblycake <angusbjones@outlook.com> | 2014-02-06 15:37:31 +0400 |
|---|---|---|
| committer | crumblycake <angusbjones@outlook.com> | 2014-02-06 15:37:31 +0400 |
| commit | bc101b2ba468b828bebc8f300218e98c20040eb4 (patch) | |
| tree | 934977ec734b837266df70b39bc7886c07f6dbec /LibGit2Sharp/Repository.cs | |
| parent | 61e8add29c12bd4a56b84af6ddac318e1778ea50 (diff) | |
Fix fast forward merge behavior.
Diffstat (limited to 'LibGit2Sharp/Repository.cs')
| -rw-r--r-- | LibGit2Sharp/Repository.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs index 092aa38d..7854e8c4 100644 --- a/LibGit2Sharp/Repository.cs +++ b/LibGit2Sharp/Repository.cs @@ -1101,7 +1101,9 @@ namespace LibGit2Sharp CheckoutTree(fastForwardCommit.Tree, null, checkoutOpts); - Refs.UpdateTarget("HEAD", fastForwardCommit.Id.Sha); + var reference = Refs.Head.ResolveToDirectReference(); + + Refs.UpdateTarget(reference, fastForwardCommit.Id.Sha); // TODO: Update Reflog... } |