jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

More diff functionality #629

Merged
mbfr merged 24 commits from feature-diff-extra into master 2020-08-18 08:14:03 -05:00
Conversation 0 Commits 24 Files Changed 3 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c64de36901 - Show all commits

16
diff_test.go
View File

@ -256,7 +256,7 @@ func TestApplyDiffAddfile(t *testing.T) {
err = repo.ResetToCommit(addSecondFileCommit, ResetHard, &CheckoutOpts{}) err = repo.ResetToCommit(addSecondFileCommit, ResetHard, &CheckoutOpts{})
checkFatal(t, err) checkFatal(t, err)
err = repo.ApplyDiff(diff, GitApplyLocationBoth, nil) err = repo.ApplyDiff(diff, ApplyLocationBoth, nil)
if err == nil { if err == nil {
t.Error("expecting applying patch to current repo to fail") t.Error("expecting applying patch to current repo to fail")
} }
@ -266,7 +266,7 @@ func TestApplyDiffAddfile(t *testing.T) {
err = repo.ResetToCommit(addFirstFileCommit, ResetHard, &CheckoutOpts{}) err = repo.ResetToCommit(addFirstFileCommit, ResetHard, &CheckoutOpts{})
checkFatal(t, err) checkFatal(t, err)
err = repo.ApplyDiff(diff, GitApplyLocationBoth, nil) err = repo.ApplyDiff(diff, ApplyLocationBoth, nil)
checkFatal(t, err) checkFatal(t, err)
t.Run("Check that diff only changed one file", func(t *testing.T) { t.Run("Check that diff only changed one file", func(t *testing.T) {
@ -328,7 +328,7 @@ func TestApplyDiffAddfile(t *testing.T) {
diff2, err := DiffFromBuffer(raw, repo) diff2, err := DiffFromBuffer(raw, repo)
checkFatal(t, err) checkFatal(t, err)
err = repo.ApplyDiff(diff2, GitApplyLocationBoth, nil) err = repo.ApplyDiff(diff2, ApplyLocationBoth, nil)
checkFatal(t, err) checkFatal(t, err)
}) })
@ -353,7 +353,7 @@ func TestApplyDiffAddfile(t *testing.T) {
return true, nil return true, nil
} }
err = repo.ApplyDiff(diff, GitApplyLocationBoth, opts) err = repo.ApplyDiff(diff, ApplyLocationBoth, opts)
checkFatal(t, err) checkFatal(t, err)
if called == false { if called == false {
@ -375,7 +375,7 @@ func TestApplyDiffAddfile(t *testing.T) {
return true, nil return true, nil
} }
err = repo.ApplyDiff(diff, GitApplyLocationBoth, opts) err = repo.ApplyDiff(diff, ApplyLocationBoth, opts)
checkFatal(t, err) checkFatal(t, err)
if called == false { if called == false {
@ -397,7 +397,7 @@ func TestApplyDiffAddfile(t *testing.T) {
return false, nil return false, nil
} }
err = repo.ApplyDiff(diff, GitApplyLocationBoth, opts) err = repo.ApplyDiff(diff, ApplyLocationBoth, opts)
checkFatal(t, err) checkFatal(t, err)
if called == false { if called == false {
@ -416,7 +416,7 @@ func TestApplyDiffAddfile(t *testing.T) {
return false, errors.New("something happened") return false, errors.New("something happened")
} }
err = repo.ApplyDiff(diff, GitApplyLocationBoth, opts) err = repo.ApplyDiff(diff, ApplyLocationBoth, opts)
if err == nil { if err == nil {
t.Error("expected an error after trying to apply") t.Error("expected an error after trying to apply")
} }
@ -440,7 +440,7 @@ func TestApplyDiffAddfile(t *testing.T) {
return false, errors.New("something happened") return false, errors.New("something happened")
} }
err = repo.ApplyDiff(diff, GitApplyLocationBoth, opts) err = repo.ApplyDiff(diff, ApplyLocationBoth, opts)
if err == nil { if err == nil {
t.Error("expected an error after trying to apply") t.Error("expected an error after trying to apply")
} }