summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2015-01-30 14:50:37 +0100
committerCarlos Martín Nieto <[email protected]>2015-01-30 14:50:37 +0100
commitce8bcbf9663c8b36f309f98ccedbd64b57b8125d (patch)
tree116869b40a0c948e13dcaddbdaff12ebce06bcfd
parent2bcbe6bd2dc230539b8a909606107d65a706bd66 (diff)
parent3e05c1038589258b40efd4bfef4d5c387bcc73c9 (diff)
Merge pull request #172 from motemen/fix-test-patch-prefix
Fix test to force diff prefixes.
-rw-r--r--patch_test.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/patch_test.go b/patch_test.go
index 569eac2..a061142 100644
--- a/patch_test.go
+++ b/patch_test.go
@@ -20,7 +20,11 @@ func TestPatch(t *testing.T) {
newTree, err := repo.LookupTree(newTreeId)
checkFatal(t, err)
- diff, err := repo.DiffTreeToTree(originalTree, newTree, nil)
+ opts := &DiffOptions{
+ OldPrefix: "a",
+ NewPrefix: "b",
+ }
+ diff, err := repo.DiffTreeToTree(originalTree, newTree, opts)
checkFatal(t, err)
patch, err := diff.Patch(0)