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

Diff: heed DiffOptions fields OldPrefix and NewPrefix #150

Merged
sqs merged 1 commits from DiffOptions_OldPrefix_and_NewPrefix into master 2014-12-30 04:09:20 -06:00
Conversation 1 Commits 1 Files Changed 2 +25
sqs commented 2014-12-09 16:13:00 -06:00 (Migrated from github.com)
Copy Link

This PR makes diffing heed the OldPrefix and NewPrefix fields in
DiffOptions.

Before this patch, running the modified TestDiffTreeToTree fails:

--- FAIL: TestDiffTreeToTree-12 (0.02s)
    diff_test.go:150: Diff patch doesn't contain "x1/README" or "y1/README"

        diff --git a/README b/README
        index 257cc56..820734a 100644
        --- a/README
        +++ b/README
        @@ -1 +1 @@
        -foo
        +file changed

It passes with the changes to diff.go in this PR.

This PR makes diffing heed the OldPrefix and NewPrefix fields in DiffOptions. Before this patch, running the modified TestDiffTreeToTree fails: ``` --- FAIL: TestDiffTreeToTree-12 (0.02s) diff_test.go:150: Diff patch doesn't contain "x1/README" or "y1/README" diff --git a/README b/README index 257cc56..820734a 100644 --- a/README +++ b/README @@ -1 +1 @@ -foo +file changed ``` It passes with the changes to diff.go in this PR.
sqs commented 2014-12-29 11:29:37 -06:00 (Migrated from github.com)
Copy Link

I updated this PR to use the diffOptionsToC and freeDiffOptions that were recently added to master. It's a much smaller PR now. Let me know if this looks good.

I updated this PR to use the `diffOptionsToC` and `freeDiffOptions` that were recently added to master. It's a much smaller PR now. Let me know if this looks good.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
duplicate

   
enhancement

   
invalid

   
question

   
up for grabs

   
wontfix
No Label
bug
duplicate
enhancement
invalid
question
up for grabs
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: jcarr/git2go#150
No description provided.
Delete Branch "DiffOptions_OldPrefix_and_NewPrefix"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?