Skip to content

Topic/path and patch #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2014
Merged

Topic/path and patch #702

merged 2 commits into from
Jun 12, 2014

Conversation

yorah
Copy link
Contributor

@yorah yorah commented Apr 30, 2014

Fixes #686

I also added a cleanup commit on the fixture file I was modifying. Tell me if you want me to drop it 😉

@dahlbyk
Copy link
Member

dahlbyk commented Apr 30, 2014

Looks good to me. @sergiodebst will this address your need?

@sergiodebst
Copy link

Yes, great, thanks!

}

/// <summary>
/// The new path.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why new?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the path participated in a rename? Do we need NewPath and OldPath?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, Path and OldPath, to align with TreeEntryChanges. Though really, I could argue that PatchContentChanges should include all the properties from TreeEntryChanges.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 @dahlbyk spike coming this way

@yorah
Copy link
Contributor Author

yorah commented May 2, 2014

The last commit is a spike showing what would we end up with if PatchEntryChanges exposes all properties of TreeEntryChanges (through composition, as it still makes more sense for it to inherit from ContentChanges).

In order to avoid duplication, some building logic has been move to the TreeEntryChanges constructor.

I will add more tests later if you're Ok with this spike.

@dahlbyk
Copy link
Member

dahlbyk commented May 2, 2014

I like this.

@nulltoken
Copy link
Member

👍 as well. Could you please squash and rebase?

@nulltoken
Copy link
Member

Could you please squash and rebase?

Actually squash only the "Spike" one. I kind of like your separate "cleanup" commit" ;-)

@nulltoken
Copy link
Member

@yorah Ping?

@Therzok
Copy link
Member

Therzok commented Jun 1, 2014

I can fetch and squash if needed.

yorah added 2 commits June 12, 2014 12:13
@yorah
Copy link
Contributor Author

yorah commented Jun 12, 2014

@yorah Ping?

... pong !

Sorry for the delay, squashed and pushed.

@nulltoken nulltoken merged commit 5dab358 into libgit2:vNext Jun 12, 2014
@nulltoken nulltoken added this to the v0.19.0 milestone Jun 12, 2014
@nulltoken
Copy link
Member

@yorah ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants