Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | fetch: remove timeout code | Carlos Martín Nieto | 2012-07-30 | 1 | -13/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | ssl: use the callback instead of ifs to determine how to get data | Carlos Martín Nieto | 2012-07-30 | 1 | -40/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the callbacks makes it clearer and reduces the amount of #ifdefs and ifs and we need in the code. | |||||
* | | | | | | | | transport: store the refs in a common area | Carlos Martín Nieto | 2012-07-30 | 8 | -297/+184 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instad of each transport having its own function and logic to get to its refs, store them directly in transport. Leverage the new gitno_buffer to make the parsing and storing of the refs use common code and get rid of the git_protocol struct. | |||||
* | | | | | | | | remote: use the same code to control git and http | Carlos Martín Nieto | 2012-07-30 | 10 | -317/+193 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to add capabilitites to both at the same time, keeps them in sync and removes a lot of code. gitno_buffer now uses a callback to fill its buffer, allowing us to use the same interface for git and http (which uses callbacks). | |||||
* | | | | | | | | network: implement multi_ack for the git transport | Carlos Martín Nieto | 2012-07-30 | 4 | -26/+85 | |
| | | | | | | | | ||||||
* | | | | | | | | remote: start moving the protocol to a common area | Carlos Martín Nieto | 2012-07-30 | 6 | -167/+144 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the transition, http is going to keep its own logic until the git/common code catches up with the implied multi_ack that http has. This also has the side-effect of making the code cleaner and more correct regardingt he protocol. | |||||
* | | | | | | | | git_oid_cmp: inline memcmp by hand to optimize | Michael Schubert | 2012-07-29 | 2 | -11/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git.git uses an inlined hashcmp function instead of memcmp, since it performes much better when comparing hashes (most hashes compared diverge within the first byte). Measurements and rationale for the curious reader: http://thread.gmane.org/gmane.comp.version-control.git/172286 | |||||
* | | | | | | | | Fix -Wuninitialized warning | Michael Schubert | 2012-07-28 | 1 | -1/+1 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #834 from carlosmn/network-callbacks | Vicent Martí | 2012-07-27 | 2 | -3/+11 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a struct for network callbacks | |||||
| * | | | | | | | Add a struct for network callbacks | Carlos Martín Nieto | 2012-07-21 | 2 | -3/+11 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only update_tips is used, but it prepares the way for progress output during download. | |||||
* | | | | | | | branch: Add `repository` argument to `create` | Vicent Marti | 2012-07-27 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yes, we can get the repository from the owner of the object, but having it marked explicitly makes the API more consistent. | |||||
* | | | | | | | Merge remote-tracking branch 'nulltoken/topic/branch-rework' into development | Vicent Marti | 2012-07-27 | 4 | -110/+107 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | branch: enforce git_branch_delete() parameter checking | nulltoken | 2012-07-24 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | refs: drop git_reference_remote_tracking_from_branch() | nulltoken | 2012-07-24 | 1 | -74/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | branch: introduce git_branch_tracking() | nulltoken | 2012-07-24 | 2 | -1/+69 | |
| | | | | | | | | ||||||
| * | | | | | | | branch: make git_branch_move() reference based | nulltoken | 2012-07-24 | 1 | -12/+16 | |
| | | | | | | | | ||||||
| * | | | | | | | branch: introduce git_reference_is_branch() | nulltoken | 2012-07-24 | 1 | -0/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | branch: introduce git_branch_lookup() | nulltoken | 2012-07-24 | 1 | -0/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | branch: change git_branch_create() to make it return a reference | nulltoken | 2012-07-24 | 1 | -9/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | branch: remove useless header | nulltoken | 2012-07-24 | 2 | -18/+2 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | reflog: Rename `entry_drop` to `drop` | Vicent Marti | 2012-07-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge remote-tracking branch 'nulltoken/topic/reflog-delete' into development | Vicent Marti | 2012-07-27 | 2 | -102/+222 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | reflog: keep the reflog name in sync with the reference name | nulltoken | 2012-07-25 | 1 | -0/+22 | |
| | | | | | | | | ||||||
| * | | | | | | | reflog: prevent git_reflog_append() from persisting the reflog back to disk | nulltoken | 2012-07-25 | 1 | -81/+59 | |
| | | | | | | | | ||||||
| * | | | | | | | reflog: prevent git_reflog_read() from chocking when no log exists yet | nulltoken | 2012-07-25 | 1 | -9/+16 | |
| | | | | | | | | ||||||
| * | | | | | | | reflog: introduce git_reflog_write() | nulltoken | 2012-07-25 | 2 | -57/+114 | |
| | | | | | | | | ||||||
| * | | | | | | | reflog: rename git_reflog_write() to git_reflog_append() | nulltoken | 2012-07-25 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | reflog: introduce git_reflog_entry_drop() | nulltoken | 2012-07-25 | 1 | -4/+58 | |
| | | | | | | | | ||||||
| * | | | | | | | reflog: add GIT_OID_HEX_ZERO constant | nulltoken | 2012-07-25 | 2 | -1/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | remote: fix C99-ism | Carlos Martín Nieto | 2012-07-27 | 1 | -1/+2 | |
| | | | | | | | ||||||
* | | | | | | | Remotes: Use correct url in git_remote_connect | Sascha Cunz | 2012-07-27 | 2 | -1/+22 | |
| | | | | | | | ||||||
* | | | | | | | Remotes: Save a cleaned pushurl (by deleting it from the config) | Sascha Cunz | 2012-07-27 | 1 | -4/+13 | |
| | | | | | | | ||||||
* | | | | | | | Remotes: Setter for url+pushurl; Getter for pushurl | Sascha Cunz | 2012-07-26 | 1 | -0/+32 | |
| | | | | | | | ||||||
* | | | | | | | Remotes: Load/Save for fetch.foo.pushurl | Sascha Cunz | 2012-07-26 | 2 | -0/+33 | |
| | | | | | | | ||||||
* | | | | | | | Remove unneccessary string transformation | Sascha Cunz | 2012-07-26 | 1 | -1/+1 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Add flag to turn off pathspec testing for diff and status | yorah | 2012-07-24 | 2 | -2/+5 | |
| | | | | | | ||||||
* | | | | | | Fix getting status of files containing brackets | yorah | 2012-07-24 | 2 | -9/+20 | |
| | | | | | | ||||||
* | | | | | | Add git_buf_unescape and git__unescape to unescape all characters in a ↵ | yorah | 2012-07-24 | 5 | -11/+35 | |
|/ / / / / | | | | | | | | | | | | | | | | string (in-place) | |||||
* | | | | | update_tips: report error if it fails to create a ref | Carlos Martín Nieto | 2012-07-24 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | revparse: initialize 'parsed' in case the user doesn't give a number with ↵ | Carlos Martín Nieto | 2012-07-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | the @-notation | |||||
* | | | | | revparse: don't allow an empty string | Carlos Martín Nieto | 2012-07-23 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Asking the library for "" used to give HEAD, but that's trying to impose a default at the wrong layer. Make it fail. | |||||
* | | | | | Merge pull request #818 from nulltoken/rework | Vicent Martí | 2012-07-21 | 3 | -479/+655 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Revparse rework | |||||
| * | | | | revparse: deploy git_object_peel() | nulltoken | 2012-07-17 | 1 | -55/+4 | |
| | | | | | ||||||
| * | | | | object: introduce git_object_peel() | nulltoken | 2012-07-17 | 1 | -0/+69 | |
| | | | | | | | | | | | | | | | | | | | | Partially fix #530 | |||||
| * | | | | revparse: enhance parsing engine | nulltoken | 2012-07-17 | 2 | -469/+627 | |
| | | | | | ||||||
* | | | | | config: escape subsection names when creating them | Carlos Martín Nieto | 2012-07-21 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to set options like "some.foo\\ish.var". This closes #830 | |||||
* | | | | | Merge pull request #831 from schu/tree-walk-order | Vicent Martí | 2012-07-20 | 1 | -8/+12 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | tree: fix ordering for git_tree_walk | |||||
| * | | | | tree: fix ordering for git_tree_walk | Michael Schubert | 2012-07-19 | 1 | -8/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Josh Triplett noticed libgit2 actually does preorder entries in tree_walk_post instead of postorder. Also, we continued walking even when an error occured in the callback. Fix #773; also, allow both pre- and postorder walking. | |||||
* | | | | | Fix bug with merging diffs with null options | Russell Belfer | 2012-07-19 | 3 | -2/+14 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | A diff that is created with a NULL options parameter could result in a NULL prefix string, but diff merge was unconditionally strdup'ing it. I added a test to replicate the issue and then a new method that does the right thing with NULL values. | |||||
* | | | | Remove old error handling code | Michael Schubert | 2012-07-17 | 2 | -14/+0 | |
| |_|/ |/| | |