merge! #1007
merge! #1007
Conversation
| (diff = a->file_size - b->file_size) == 0 && | ||
| (diff = a->flags - b->flags) == 0 && | ||
| (diff = a->flags_extended - b->flags_extended) == 0) { | ||
| diff = git_oid_cmp(&a->oid, &b->oid); |
There was a problem hiding this comment.
By the looks of it, I think a single memcmp over the whole struct would be faster -- regardless of whether there are unset fields or not.
|
Gah, this is a lot of code. @arrbee, to the review-mobile. |
|
@vmg Yeah, this is stupidly large. Let me break some of this stuff out into separate PRs. |
|
So, here's what's still missing:
|
| GIT_CHECKOUT_SKIP_UNMERGED = (1u << 10), | ||
| /** For unmerged files, checkout stage 2 from index (NOT IMPLEMENTED) */ | ||
| GIT_CHECKOUT_USE_OURS = (1u << 11), | ||
| /** For unmerged files, checkout stage 3 from index (NOT IMPLEMENTED) */ |
There was a problem hiding this comment.
I'm guessing you want to remove the (NOT IMPLEMENTED) comment? ⚡
|
Rebased! |
|
What's the status of this pull request? When can we expect it to hit the development branch? |
|
@AnuiCuda Thanks for your interest. This is ready for code review and will need updates based on that review. Getting close! |
|
Sweet! Can't wait for this! I was about to go dig into the code to figure out what needed to be done when I tripped into this request. Nice work @ethomson! |
|
@ethomson: Looks like we're having umask issues again... |
|
Indeed. #1940 has the fix. On Nov 5, 2013, at 5:58 AM, Vicent Martí [email protected] wrote:
|
|
Sounds good. Let's go for the rebase then. :) |
|
@vmg Yup, rebased! |
|
What could possibly go wrong. |
This merges a branch and puts the results in the workdir!