|
f34b9a59
|
2014-03-03T12:45:46
|
|
Merge pull request #2150 from libgit2/vmg/features
caps: Rename to features to avoid confusion
|
|
ebb3c506
|
2014-03-03T12:40:25
|
|
features: Rename `_HAS_` to `_FEATURE_`
|
|
|
2491c416
|
2014-03-03T12:13:17
|
|
caps: Rename the enum name too!
|
|
|
c9f5298b
|
2014-03-03T12:09:17
|
|
caps: Rename to features to avoid confusion
|
|
494be429
|
2014-03-02T09:00:00
|
|
Merge pull request #2144 from linquize/branch-f-current
Do not allow git_branch_create() to force update branch
|
|
1d08b72e
|
2014-03-02T19:14:20
|
|
Add unit test to show git_branch_create() fails if attempt to force create current branch
|
|
|
9776cb84
|
2014-03-01T18:06:49
|
|
Merge pull request #2143 from libgit2/rb/projects
Add project list and update readme
|
|
|
06d41826
|
2014-02-28T09:40:17
|
|
Merge pull request #2146 from libgit2/rb/diff-b2b
Add git_diff_buffers and git_patch_from_buffers
|
|
6789b7a7
|
2014-02-27T14:13:22
|
|
Add buffer to buffer diff and patch APIs
This adds `git_diff_buffers` and `git_patch_from_buffers`. This
also includes a bunch of internal refactoring to increase the
shared code between these functions and the blob-to-blob and
blob-to-buffer APIs, as well as some higher level assert helpers
in the tests to also remove redundancy.
|
|
|
d8839992
|
2014-02-27T14:01:16
|
|
Fix warnings and code style issues
|
|
|
59b1dbcd
|
2014-02-27T23:56:25
|
|
Do not allow git_branch_create() to force update branch
|
|
|
486bc366
|
2014-02-26T16:37:08
|
|
Add project list and update readme
|
|
|
1574d388
|
2014-02-26T16:58:20
|
|
Merge pull request #2137 from jru/blame-first-parent
Blame first-parent history
|
|
|
6b34a4ed
|
2014-02-26T22:50:51
|
|
Merge pull request #2142 from ethomson/ignore_authors
Remove "ignore" state from the git.git-authors
|
|
f2abb725
|
2014-02-26T12:39:48
|
|
Remove "ignore" state from the git.git-authors
|
|
0276f0f5
|
2014-02-26T19:22:19
|
|
Reset num_parents to 1 only for merge commits
Also, correct test case to account for the boundary flag
|
|
|
cb81c3a7
|
2014-02-25T10:46:41
|
|
Merge pull request #2138 from ethomson/sysdir
Move system directory cache out of utils
|
|
|
1c8b339d
|
2014-02-25T10:43:04
|
|
Merge pull request #2139 from ethomson/va_copy_warning
Include stdarg.h for the va_copy test
|
|
|
4f46a98b
|
2014-02-24T23:32:25
|
|
Remove now-duplicated stdarg.h include
|
|
|
ab0af298
|
2014-02-24T21:56:08
|
|
Include stdarg.h for the va_copy test
|
|
83634d38
|
2014-02-24T17:43:10
|
|
Move system directory cache out of utils
|
|
|
98b93662
|
2014-02-24T23:01:01
|
|
Merge pull request #2134 from libgit2/ben/icc
Fix Intel compiler warnings
|
|
|
c8893d1f
|
2014-02-24T13:39:04
|
|
Use a portable cast
|
|
|
899bd19a
|
2014-02-24T21:20:57
|
|
Document enumerator and rewording
|
|
|
b1f2c2e2
|
2014-02-22T10:18:42
|
|
Prevent icc warning
|
|
|
8ac7da79
|
2014-02-22T10:15:11
|
|
Avoid casting warning
|
|
|
0d8265c8
|
2014-02-22T09:25:41
|
|
Staticize file-local variables
|
|
|
f3e44dd6
|
2014-02-24T11:02:42
|
|
Merge pull request #2132 from ethomson/merge_doc
Improve documentation for merging
|
|
|
9e3b901a
|
2014-02-24T00:09:29
|
|
Add unit test
|
|
|
c7c83394
|
2014-02-21T00:22:07
|
|
Add option to limit blame to first parent
|
|
|
5af69ee9
|
2014-02-21T10:06:11
|
|
Merge pull request #2130 from worblehat/development
Check if librt exists independent of OS, to be able to exclude librt on ...
|
|
|
c254e2b6
|
2014-02-21T08:55:30
|
|
Improve documentation for merging
|
|
|
f83ef562
|
2014-02-21T01:33:47
|
|
Merge pull request #2129 from arrbee/rb/c89-or-c99
Improve C89 compatibility and clarify use of C99 features
|
|
5bda607c
|
2014-02-21T01:09:44
|
|
Check if librt exists independent of OS, to be able to exclude librt on Android builds, even though it is a 'Linux'.
|
|
|
72556cc6
|
2014-02-20T14:27:10
|
|
Address PR comments
* Make GIT_INLINE an internal definition so it cannot be used in
public headers
* Fix language in CONTRIBUTING
* Make index caps API use signed instead of unsigned values
|
|
|
68a19ca9
|
2014-02-20T11:26:51
|
|
Clarify C compatibility policy
and a couple of other minor doc fixups.
|
|
|
978a4ed5
|
2014-02-20T11:00:31
|
|
Make git_oid_equal a non-inline API
|
|
|
2dc49ea9
|
2014-02-19T00:21:38
|
|
Merge pull request #2124 from libgit2/better-shallow-errors
Improve error propagation in shallow call
|
|
|
864535cf
|
2014-02-18T14:07:42
|
|
Readability
|
|
|
9bda5fb8
|
2014-02-18T14:05:30
|
|
Improve error propagation in shallow call
|
|
|
e0ebaaa5
|
2014-02-18T18:48:43
|
|
Merge pull request #2121 from bk2204/ewouldblock
Check for EWOULDBLOCK as well as EAGAIN on write.
|
|
0197d410
|
2014-02-15T23:09:01
|
|
Check for EWOULDBLOCK as well as EAGAIN on write.
On some systems, notably HP PA-RISC systems running Linux or HP-UX,
EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow
EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly
for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED
that considers both.
The macro is necessary because MSYS does not provide EWOULDBLOCK and
compilation fails if an attempt is made to use it unconditionally. On most
systems, where the two values are the same, the compiler will simply
optimize this check out and it will have no effect.
|
|
|
dbd2ca35
|
2014-02-11T17:27:30
|
|
Merge pull request #2115 from ethomson/crlf_redux
Fix filter test for CRLF->LF issues
|
|
|
2a528bc0
|
2014-02-11T19:05:13
|
|
Fix filter test for CRLF->LF issues
|
|
|
90dd2864
|
2014-02-12T01:55:25
|
|
Merge pull request #2114 from ethomson/crlf_redux
Never convert CRLF->LF
|
|
|
b033f3a3
|
2014-02-11T16:52:08
|
|
Never convert CRLF->LF
Core git performs no conversion on systems that use LF, emulate that.
|
|
|
5d195cf7
|
2014-02-11T15:56:04
|
|
Merge pull request #2110 from libgit2/ed/crlf_input
Handle `core.autocrlf=input` when checking out
|
|
|
b362fbf3
|
2014-02-10T10:01:36
|
|
Merge pull request #2111 from libgit2/cmn/cond-fixups
Conditional ref update fixups
|
|
15284a2c
|
2014-02-10T14:52:28
|
|
refs: move current_id before the reflog parameters
Keep the reflog parameters as the last two, as they're the optional
parameters.
|
|
|
77ad6754
|
2014-02-10T14:38:01
|
|
refs: conditional wording fixups
This addresses arrbee's concerns about wording in the conditional
reference udpate functions.
|
|
|
66b2626c
|
2014-02-09T13:43:56
|
|
core.autocrlf=input w/ text=auto attr to workdir
|
|
|
9780020b
|
2014-02-09T13:37:39
|
|
Tests for crlf filtering into the repository
|
|
|
f77127da
|
2014-02-09T12:37:16
|
|
Tests for core.autocrlf and .gitattributes
|
|
|
fb6f4539
|
2014-02-09T12:36:24
|
|
Close files on file diff failure
Not closing the files on a diff failure ensures that clar
cleanup will fail on win32 because we still have the file open.
|
|
|
fb52ba19
|
2014-02-09T07:25:49
|
|
Merge pull request #2107 from rocky-luo/examples-diff-numstat
add example for diff with --numstat
|
|
8086b78b
|
2014-02-09T21:08:42
|
|
replace 'out' with 'patch',replace the literal tabs with '\t'.
|
|
|
4f5a3f40
|
2014-02-08T20:10:19
|
|
add example for diff with --numstat
|
|
|
f1590a18
|
2014-02-07T16:56:46
|
|
Merge pull request #2056 from libgit2/rb/commit-amend
Add git_commit_amend API
|
|
|
80c29fe9
|
2014-01-17T10:45:11
|
|
Add git_commit_amend API
This adds an API to amend an existing commit, basically a shorthand
for creating a new commit filling in missing parameters from the
values of an existing commit. As part of this, I also added a new
"sys" API to create a commit using a callback to get the parents.
This allowed me to rewrite all the other commit creation APIs so
that temporary allocations are no longer needed.
|
|
|
2d929194
|
2014-02-07T16:14:17
|
|
Merge pull request #2099 from libgit2/bs/more-reflog-stuff
More reflogness
|
|
|
57c47af1
|
2014-02-07T16:05:19
|
|
Merge pull request #2042 from libgit2/cmn/conditional-ref
refs: conditional ref updates
|
|
|
3158e2fe
|
2014-02-07T15:24:39
|
|
Fix some Windows warnings
This fixes a number of warnings with the Windows 64-bit build
including a test failure in test_repo_message__message where an
invalid pointer to a git_buf was being used.
|
|
|
c4ee3b54
|
2014-02-07T18:32:06
|
|
Merge pull request #2100 from libgit2/rb/update-pqueue
Replace priority queue code with implementation from hashsig
|
|
|
db55bb73
|
2014-02-06T11:18:10
|
|
Correct default reflog message for git_remote_fetch
|
|
|
2bfc6739
|
2014-02-06T10:39:57
|
|
Fix terrible indentation
|
|
|
8875ef21
|
2014-02-06T10:11:17
|
|
Merge pull request #2104 from ethomson/utf8_cleanup
Remove unused utf8 -> utf16 conversion code
|
|
|
5dae3ffe
|
2014-02-05T19:27:27
|
|
Only run clone-failure test on private repo
|
|
|
55d257e7
|
2014-02-05T15:03:00
|
|
Remove unused utf8 -> utf16 conversion code
|
|
|
78ee7e81
|
2014-02-05T14:10:19
|
|
More merge.conflictstyle fixes
|
|
|
3094102f
|
2014-02-05T14:05:18
|
|
Avoid crash when skipping remote test
|
|
|
fe45922d
|
2014-02-05T13:41:12
|
|
Fix broken clone test
|
|
|
a2ce19ca
|
2014-02-05T13:35:26
|
|
Prevent user's merge.conflictstyle from breaking tests
|
|
|
5c8be325
|
2014-02-05T13:32:45
|
|
Fix a few references to changed function signatures
|
|
|
0de2c4e3
|
2014-02-05T13:15:57
|
|
Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff
|
|
|
629ba7f1
|
2014-02-05T13:07:46
|
|
Merge pull request #2027 from libgit2/rb/only-windows-is-windows
Some tests of paths that can't actually be written to disk
|
|
|
df70de07
|
2014-02-05T10:25:50
|
|
Merge pull request #2094 from libgit2/cmn/push-non-commit
Add flexibility to the revwalk API
|
|
|
daeac29a
|
2014-02-05T16:24:09
|
|
Merge pull request #2103 from libgit2/cmn/parse-commit-faster
commit: faster parsing
|
|
|
24f3024f
|
2014-02-05T14:31:01
|
|
Split p_strlen into its own header
We need this from util.h and posix.h, but the latter includes common.h
which includes util.h, which means p_strlen is not defined by the time
we get to git__strndup().
Split the definition on p_strlen() off into its own header so we can use
it in util.h.
|
|
|
1e6f0ac4
|
2014-02-05T13:49:51
|
|
utils: don't reimplement strnlen
The standard library provides a very nice strnlen function, which knows
to use SSE, let's not reimplement it ourselves.
|
|
|
a6563619
|
2014-02-05T13:01:54
|
|
commit: faster parsing
The current code issues a lot of strncmp() calls in order to check for
the end of the header, simply in order to copy it and start going
through it again. These are a lot of calls for something we can check as
we go along. Knowing the amount of parents beforehand to reduce
allocations in extreme cases does not make up for them.
Instead start parsing immediately and check for the double-newline after
each header field, leaving the raw_header allocation for the end, which
lets us go through the header once and reduces the amount of strncmp()
calls significantly.
In unscientific testing, this has reduced a shortlog-like usage (walking
though the whole history of a branch and extracting data from the
commits) of git.git from ~830ms to ~700ms and makes the time we spend in
strncmp() negligible.
|
|
|
d6006413
|
2014-01-30T17:24:46
|
|
docs: produce literal asterisks
|
|
|
c74077d1
|
2014-02-02T12:08:18
|
|
revparse: do look at all refs when matching text
Now that we no longer fail to push non-commits on a glob, let's search
on all refs when we rev-parse syntax asks us to match text.
|
|
|
d18209ee
|
2014-02-01T16:27:42
|
|
revwalk: add a test for pushing all references
This used to be broken, let's make sure we don't break this use-case.
|
|
|
af817202
|
2014-02-01T15:29:16
|
|
revwalk: remove usage of foreach
|
|
|
d465e4e9
|
2014-02-01T15:19:13
|
|
revwalk: ignore wrong object type in glob pushes
Pushing a whole namespace can cause us to attempt to push non-committish
objects. Catch this situation and special-case it for ignoring this.
|
|
|
b4ef67d5
|
2014-02-01T15:11:00
|
|
revwalk: add a failing test for pushing "tags"
This shows that pusing a whole namespace can be problematic.
|
|
|
f61272e0
|
2014-02-01T12:51:36
|
|
revwalk: accept committish objects
Let the user push committish objects and peel them to figure out which
commit to push to our queue.
This is for convenience and for allowing uses of
git_revwalk_push_glob(w, "tags")
with annotated tags.
|
|
|
5367ec4b
|
2014-02-05T12:02:52
|
|
refs: add an unconditional delete
Add it under the git_reference_remove() name, letting the user pass the
repo and name, analogous to unconditional setting/creation.
|
|
|
b7ae71ec
|
2014-02-05T11:47:33
|
|
refs: catch cases where the ref type has changed
If the type of the on-disk reference has changed, the old value
comparison should fail.
|
|
|
f44fd59e
|
2014-02-05T11:21:14
|
|
refs: check the ref's old value when deleting
Recognize when the reference has changed since we loaded it.
|
|
|
7ee8c7e6
|
2014-02-05T11:07:34
|
|
refs: placeholder conditional delete
We don't actually pass the old value yet.
|
|
|
f8621dde
|
2014-02-05T10:42:42
|
|
refs: factor out old value comparison
We will reuse this later for deletion.
|
|
|
878fb66f
|
2014-02-05T10:19:17
|
|
refs: bring conditional symbolic updates to the frontend
Bring the race detection goodness to symbolic references as well.
|
|
|
91123661
|
2014-02-04T22:04:00
|
|
refdb: add conditional symbolic updates
Add a parameter to the backend to allow checking for the old symbolic
target.
|
|
|
d6236cf6
|
2014-02-04T21:40:22
|
|
refs: add tests for conditional updates
|
|
|
1202c7ea
|
2014-02-04T21:35:44
|
|
refs: fix leak on successful update
Free the old ref even on success.
|
|
|
fc4728e3
|
2014-01-29T14:07:18
|
|
refs: return GIT_EMODIFIED if the ref target moved
In case we loose the race to update the reference, return GIT_EMODIFIED
to let the user distinguish it from other types of errors.
|
|
|
5d96fe88
|
2014-01-14T15:33:29
|
|
refs: changes from feedback
Change the name to _matching() intead of _if(), and force _set_target()
to be a conditional update. If the user doesn't care about the old
value, they should use git_reference_create().
|
|
|
9b148098
|
2013-12-18T19:58:16
|
|
refs: conditional ref updates
Allow updating references if the old value matches the given one.
|
|
|
010cec3a
|
2014-02-04T20:50:40
|
|
Add reflog params to git_repository_detach_head
|