Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Plug a leak in the tests | Carlos Martín Nieto | 2014-06-03 | 1 | -0/+2 | |
| |/ / | ||||||
| * | | Merge pull request #2392 from libgit2/cmn/remote-delete | Vicent Marti | 2014-06-01 | 1 | -8/+34 | |
| |\ \ | | | | | | | | | remote: build up the list of refs to remove | |||||
| | * | | remote: build up the list of refs to removecmn/remote-delete | Carlos Martín Nieto | 2014-06-01 | 1 | -8/+34 | |
| |/ / | | | | | | | | | | | | | | | | When removing the remote-tracking branches, build up the list and remove in two steps, working around an issue with the iterator. Removing while we're iterating over the refs can cause us to miss references. | |||||
| * | | Merge pull request #2391 from libgit2/rb/clean-up-diff-binary-print | Vicent Marti | 2014-05-31 | 2 | -38/+55 | |
| |\ \ | | | | | | | | | Minor fixes to binary diff code | |||||
| | * | | minor cleanups | Russell Belfer | 2014-05-31 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | Clean up the handling of large binary diffs | Russell Belfer | 2014-05-31 | 2 | -38/+55 | |
| |/ / | ||||||
| * | | Merge pull request #2388 from ethomson/safecrlf_ignore_warn | Vicent Marti | 2014-05-30 | 2 | -1/+48 | |
| |\ \ | | |/ | |/| | Ignore core.safecrlf=warn until we have a warn infrastructure | |||||
| | * | Ignore core.safecrlf=warn until we have a warn infrastructure | Edward Thomson | 2014-05-30 | 2 | -1/+48 | |
| |/ | ||||||
| * | Merge pull request #2358 from ↵ | Vicent Marti | 2014-05-30 | 4 | -34/+37 | |
| |\ | | | | | | | | | | | | | arthurschreiber/arthur/normalize-ref-names-on-creation Respect core.precomposeunicode = true in more cases. | |||||
| | * | Refs: Extend unicode test for branch creation. | Arthur Schreiber | 2014-05-30 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | This adds another assertion to ensure that the reference name inside the git_reference struct returned by `git_branch_create` is returned as precomposed if `core.precomposeunicode` is enabled. | |||||
| | * | Refs: Add a unicode test for git_branch_move. | Arthur Schreiber | 2014-05-30 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | This tests that decomposed branch names are correctly precomposed when passed to `git_branch_move` and `core.precomposeunicode` is enabled. | |||||
| | * | Refs: Introduce `git_refname_t`. | Arthur Schreiber | 2014-05-30 | 2 | -13/+12 | |
| | | | ||||||
| | * | Refs: Fix some issue when core.precomposeunicode = true. | Arthur Schreiber | 2014-05-30 | 2 | -25/+9 | |
| |/ | | | | | | | | | | | | | | | | | | | | | This fixes two issues I found when core.precomposeunicode is enabled: * When creating a reference with a NFD string, the returned git_reference would return this NFD string as the reference’s name. But when looking up the reference later, the name would then be returned as NFC string. * Renaming a reference would not honor the core.precomposeunicode and apply no normalization to the new reference name. | |||||
| * | config: initialize the error | Carlos Martín Nieto | 2014-05-30 | 1 | -1/+1 | |
| | | | | | | | | | | The error would be uninitialized if we take a snapshot of a config with no backends. | |||||
| * | Merge pull request #2381 from ecoffey/example_log_author_filter | Vicent Marti | 2014-05-29 | 2 | -8/+47 | |
| |\ | | | | | | | Add support for --author flag in example log implementation | |||||
| | * | examples/log.c: invert filtering impl and conditional | Eoin Coffey | 2014-05-28 | 1 | -14/+14 | |
| | | | ||||||
| | * | Remove simple --author, --committer, and --grep from PROJECTS | Eoin Coffey | 2014-05-23 | 1 | -6/+0 | |
| | | | ||||||
| | * | Add support for --grep | Eoin Coffey | 2014-05-23 | 1 | -1/+23 | |
| | | | ||||||
| | * | Add --committer option, and break out helper function | Eoin Coffey | 2014-05-23 | 1 | -7/+21 | |
| | | | ||||||
| | * | Add support for --author flag in example log implementation | Eoin Coffey | 2014-05-22 | 1 | -1/+10 | |
| | | | ||||||
| * | | Merge pull request #2011 from libgit2/cmn/clone-local | Vicent Marti | 2014-05-29 | 7 | -13/+347 | |
| |\ \ | | | | | | | | | Local clone | |||||
| | * | | clone: more explicit local testscmn/clone-local | Carlos Martín Nieto | 2014-05-29 | 1 | -14/+29 | |
| | | | | | | | | | | | | | | | | | | | | Assert the exact amount of links we expect. While there, check that a plain git_clone() automatically chooses to link. | |||||
| | * | | clone: allow for linking in local clone | Carlos Martín Nieto | 2014-05-28 | 3 | -5/+94 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If requested, git_clone_local_into() will try to link the object files instead of copying them. This only works on non-Windows (since it doesn't have this) when both are on the same filesystem (which are unix semantics). | |||||
| | * | | fileops: allow linking files when copying directory structures | Carlos Martín Nieto | 2014-05-28 | 3 | -2/+32 | |
| | | | | | | | | | | | | | | | | | | | | When passed the LINK_FILES flag, the recursive copy will hardlink files instead of copying them. | |||||
| | * | | clone: add flag not to link | Carlos Martín Nieto | 2014-05-28 | 3 | -1/+4 | |
| | | | | ||||||
| | * | | clone: add flags to override whether to perform a local clone | Carlos Martín Nieto | 2014-05-28 | 4 | -1/+72 | |
| | | | | ||||||
| | * | | clone: store the realpath when given a relative one | Carlos Martín Nieto | 2014-05-28 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | A call like git_clone("./foo", "./foo1") writes origin's url as './foo', which makes it unusable, as they're relative to different things. Go with git's behaviour and store the realpath as the url. | |||||
| | * | | clone: perform a "local clone" when given a local path | Carlos Martín Nieto | 2014-05-28 | 2 | -11/+128 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When git is given such a path, it will perform a "local clone", bypassing the git-aware protocol and simply copying over all objects that exist in the source. Copy this behaviour when given a local path. | |||||
| * | | | Merge pull request #2386 from Therzok/patch-2 | Russell Belfer | 2014-05-28 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | [Blob] Update documentation for is_binary. | |||||
| | * | | | [Blob] Update documentation for is_binary. | Ungureanu Marius | 2014-05-28 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | filter.h tells me that we check the first 8000 bytes. | |||||
| * | | | Merge pull request #2380 from libgit2/cmn/index-add-modes | Vicent Marti | 2014-05-28 | 2 | -0/+29 | |
| |\ \ \ | | | | | | | | | | | index: check for valid filemodes on add | |||||
| | * | | | index: check for valid filemodes on addcmn/index-add-modes | Carlos Martín Nieto | 2014-05-22 | 2 | -0/+29 | |
| | | |/ | | |/| | ||||||
| * | | | Merge pull request #2377 from libgit2/cmn/dual-os | Vicent Marti | 2014-05-28 | 3 | -4/+23 | |
| |\ \ \ | | | | | | | | | | | travis: build on osx too | |||||
| | * | | | travis: build on osx toocmn/dual-os | Carlos Martín Nieto | 2014-05-21 | 3 | -4/+23 | |
| | | | | | ||||||
| * | | | | Merge pull request #2359 from e45lee/chmod-fix | Vicent Marti | 2014-05-28 | 1 | -6/+14 | |
| |\ \ \ \ | | | | | | | | | | | | | Fixed permissions on template directories. | |||||
| | * | | | | Address style concerns in setting mkdir/copy flags. | Edward Lee | 2014-05-23 | 1 | -16/+10 | |
| | | | | | | ||||||
| | * | | | | Fixed permissions on template directories. | Edward Lee | 2014-05-16 | 1 | -7/+21 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #2385 from karipe/development | Vicent Marti | 2014-05-28 | 2 | -3/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix compile error on Visual Studio | |||||
| | * | | | | | Fix compile error on Visual Studio | Cha, Hojeong | 2014-05-27 | 2 | -3/+3 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Merge pull request #2337 from ethomson/merge_ff | Vicent Marti | 2014-05-28 | 3 | -34/+125 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Introduce GIT_MERGE_CONFIG_* for merge.ff settings | |||||
| | * | | | | Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE | Edward Thomson | 2014-05-27 | 3 | -31/+32 | |
| | | | | | | ||||||
| | * | | | | Staticify `merge_config` | Edward Thomson | 2014-05-27 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Use a config snapshot | Edward Thomson | 2014-05-27 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Move GIT_MERGE_CONFIG_* to its own enum | Edward Thomson | 2014-05-27 | 3 | -43/+61 | |
| | | | | | | ||||||
| | * | | | | Introduce GIT_MERGE_CONFIG_* for merge.ff settings | Edward Thomson | 2014-05-27 | 3 | -9/+81 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true | |||||
| * | | | | Merge pull request #2382 from mikeando/doc_fixes | Carlos Martín Nieto | 2014-05-26 | 10 | -34/+31 | |
| |\ \ \ \ | | | | | | | | | | | | | Fixed miscellaneous documentation errors. | |||||
| | * | | | | Fixed miscellaneous documentation errors. | Michael Anderson | 2014-05-23 | 10 | -34/+31 | |
| |/ / / / | ||||||
| * | | | | odb: clear backend errors on successful read | Carlos Martín Nieto | 2014-05-23 | 1 | -0/+1 | |
| | |_|/ | |/| | | | | | | | | | | | | | | We go through the different backends in order, so it's not an error if at least one of the backends has the data we want. | |||||
| * | | | smart: initialize the error variable | Carlos Martín Nieto | 2014-05-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Plug leaks and fix a C99-ism | Carlos Martín Nieto | 2014-05-22 | 3 | -13/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have too many places where we repeat free code, so when adding the new free to the generic code, it didn't take for the local transport. While there, fix a C99-ism that sneaked through. |