Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | online: test with https instead of git protocolethomson/test_https | Edward Thomson | 2022-01-10 | 4 | -46/+37 |
| | | | | | GitHub is removing support for the unauthenticated git protocol; test with the https protocol. | ||||
* | Merge branch 'status' | Edward Thomson | 2022-01-06 | 6 | -16/+79 |
|\ | |||||
| * | status: don't use `// ...` in tests, use `/* ... */` | Edward Thomson | 2022-01-06 | 1 | -5/+4 |
| | | |||||
| * | Merge remote-tracking branch 'pr/6159' | Edward Thomson | 2022-01-06 | 6 | -1/+65 |
| |\ | |||||
| | * | #6154 git_status_list_new case insensitive fix | Miguel Arroz | 2022-01-01 | 6 | -1/+64 |
| | | | |||||
| * | | status: don't use `// ...` in tests, use `/* ... */` | Edward Thomson | 2022-01-06 | 1 | -15/+15 |
|/ / | |||||
* | | Merge pull request #6165 from libgit2/ethomson/includeif | Edward Thomson | 2022-01-06 | 2 | -3/+39 |
|\ \ | | | | | | | config: handle empty conditional in includeIf | ||||
| * | | config: test allocation in config conditionalsethomson/includeif | Edward Thomson | 2022-01-05 | 1 | -1/+3 |
| | | | |||||
| * | | config: handle empty conditional in includeIf | Edward Thomson | 2022-01-05 | 2 | -3/+37 |
| |/ | | | | | | | | | | | When a config file contains `[includeIf]` (with no condition), we should treat that as a falsey value. This means that we should properly parse a config value of `includeIf.path`. | ||||
* | | Merge pull request #6158 from arroz/feat/statusRenameThreshold | Edward Thomson | 2022-01-05 | 3 | -0/+72 |
|\ \ | | | | | | | Add `rename_threshold` to `git_status_options`. | ||||
| * | | Add `rename_threshold` to `git_status_options`. | Miguel Arroz | 2021-12-31 | 3 | -0/+72 |
| |/ | |||||
* | | Merge pull request #6157 from boretrk/hmac_ctx_cleanup | Edward Thomson | 2022-01-04 | 1 | -1/+1 |
|\ \ | |/ |/| | ntmlclient: fix linking with libressl | ||||
| * | ntmlclient: don't declare dummy HMAC_CTX_cleanup when building with libressl | Peter Pettersson | 2021-12-31 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #6150 from cestrand/patch-1 | Edward Thomson | 2021-12-24 | 1 | -2/+0 |
|\ | | | | | Remove PSGit from Language Bindings section of README | ||||
| * | Remove PSGit from Language Bindings section of README | Marcin Kolenda | 2021-12-24 | 1 | -2/+0 |
|/ | | | PSGit is not using libgit2 library. It is stub of a library and is not developed further. | ||||
* | Merge pull request #6148 from libgit2/ethomson/ci | Edward Thomson | 2021-12-24 | 1 | -1/+2 |
|\ | | | | | ci: build with ssh on nightly | ||||
| * | ci: build with ssh on nightly | Edward Thomson | 2021-12-23 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #6147 from libgit2/ethomson/insteadof | Edward Thomson | 2021-12-23 | 1 | -34/+28 |
|\ | | | | | remote: refactor insteadof application | ||||
| * | remote: refactor insteadof applicationethomson/insteadof | Edward Thomson | 2021-12-23 | 1 | -34/+28 |
|/ | | | | | | | Using the insteadof helper would leak memory when we didn't really want the pushInsteadOf configuration. Refactor the choice into the function that allocates memory (or now, not) and use a more idiomatic `int` return code. | ||||
* | Merge branch 'pr/6062' | Edward Thomson | 2021-12-23 | 3 | -6/+34 |
|\ | |||||
| * | worktree: checkout options suggestions from code review | Edward Thomson | 2021-12-23 | 3 | -8/+8 |
| | | |||||
| * | Fix test fail because of memory leak | punkymaniac | 2021-12-23 | 1 | -0/+1 |
| | | |||||
| * | Update test for `git_str` usage instead of `git_buf` | punkymaniac | 2021-12-23 | 1 | -3/+3 |
| | | | | | | | | See commit f0e693b18afbe1de37d7da5b5a8967b6c87d8e53 | ||||
| * | Add test for `git_worktree_add` no checkout | punkymaniac | 2021-12-23 | 1 | -0/+21 |
| | | |||||
| * | Change default checkout strategy from FORCE to SAFE | punkymaniac | 2021-12-23 | 1 | -2/+0 |
| | | | | | | | | | | | | Since we are able to give our own git checkout options, the default git checkout strategy will be the same as initialized in a new git_checkout_options struct. | ||||
| * | Allow user checkout options on git_worktree_add | punkymaniac | 2021-12-23 | 2 | -2/+10 |
|/ | | | | | | Extend the `git_worktree_add_options` to include `git_checkout_options`. github issue #5949 | ||||
* | Merge pull request #6142 from libgit2/ethomson/blob_data_is_binary | Edward Thomson | 2021-12-23 | 3 | -0/+37 |
|\ | | | | | blob: identify binary content | ||||
| * | blob: identify binary contentethomson/blob_data_is_binary | Edward Thomson | 2021-12-10 | 3 | -0/+37 |
| | | | | | | | | | | Introduce `git_blob_data_is_binary` to examine a blob's data, instead of the blob itself. A replacement for `git_buf_is_binary`. | ||||
* | | Merge pull request #6124 from csware/config-parsing | Edward Thomson | 2021-12-23 | 4 | -5/+66 |
|\ \ | | | | | | | Config parsing | ||||
| * | | Multiline config values not preserved on saving | Sven Strickroth | 2021-12-06 | 2 | -4/+27 |
| | | | | | | | | | | | | | | | | | | (fixes issue #6088) Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | | Add more tests for contents | Sven Strickroth | 2021-12-06 | 1 | -0/+15 |
| | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | | Config parsing confused by continuations that start with quotes | Sven Strickroth | 2021-12-06 | 3 | -1/+24 |
| | | | | | | | | | | | | | | | | | | (fixes issue #6089) Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
* | | | Merge pull request #6125 from stforek/git_commit_summary_spaces | Edward Thomson | 2021-12-23 | 2 | -4/+18 |
|\ \ \ | | | | | | | | | git_commit_summary: ignore lines with spaces | ||||
| * | | | git_commit_summary: ignore lines with spaces | Przemyslaw Ciezkowski | 2021-11-25 | 2 | -4/+18 |
| |/ / | | | | | | | | | | Fixes libgit2/libgit2#6065 | ||||
* | | | Merge pull request #6101 from mkhl/fix/instead-of | Edward Thomson | 2021-12-23 | 3 | -28/+153 |
|\ \ \ | | | | | | | | | remotes: fix insteadOf/pushInsteadOf handling | ||||
| * | | | remote: improve apply_insteadof function signature | Martin Kühl | 2021-11-11 | 1 | -9/+9 |
| | | | | |||||
| * | | | fix remote/insteadof tests | Martin Kühl | 2021-11-11 | 1 | -5/+25 |
| | | | | |||||
| * | | | update remote/insteadof tests | Martin Kühl | 2021-11-11 | 2 | -23/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we want to test: - an anonymous repo (a url) - a named repo with a url - a named repo with a url and pushurl and for each of these matching configuration: - only insteadOf - only pushInsteadOf - both insteadOf and pushInsteadOf this change adds test cases for all of these combinations. | ||||
* | | | | Merge pull request #6095 from yoichi/better-compatiblity-for-at-time-notation | Edward Thomson | 2021-12-23 | 12 | -32/+71 |
|\ \ \ \ | | | | | | | | | | | Better revparse compatibility for at time notation | ||||
| * \ \ \ | Merge branch 'main' into better-compatiblity-for-at-time-notation | Yoichi Nakayama | 2021-11-23 | 297 | -5385/+6264 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: src/revparse.c | ||||
| * | | | | Add TODO comment for emit a warning | Yoichi Nakayama | 2021-10-22 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Cause error when date parsing is failed | Yoichi Nakayama | 2021-10-22 | 4 | -3/+25 |
| | | | | | |||||
| * | | | | Return the oldest reflog entry on revparse when older time is given | Yoichi Nakayama | 2021-10-22 | 2 | -8/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | For better compatibility with git command which returns the oldest log entry with a warning message. | ||||
| * | | | | Add a branch with a empty reflog into testrepo.git | Yoichi Nakayama | 2021-10-22 | 8 | -21/+24 |
| | | | | | |||||
* | | | | | Merge pull request #6094 from visualgitio/commit-graph-long-long | Edward Thomson | 2021-12-23 | 2 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix a long long that crept past | ||||
| * | | | | | Simplifications to definitions to avoid UINT64_C | Calvin Buckley | 2021-12-11 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fix long long constants in macro in ntlmclient | Calvin Buckley | 2021-10-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This should be propagated to upstream. | ||||
| * | | | | | Also correct this long long constant | Calvin Buckley | 2021-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed this because I searched for digits before ULL, otherwise it would match terms like "null" or "fully". | ||||
| * | | | | | Fix a long long that crept past | Calvin Buckley | 2021-10-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #6146 from Qix-/main | Edward Thomson | 2021-12-23 | 9 | -29/+29 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | cmake: use project-specific root variable instead of CMAKE_SOURCE_DIR |