|
24f61bc5
|
2013-04-15T15:47:38
|
|
Merge pull request #1469 from libgit2/vmg/unified-revision
Unified rev-parse, with a revision object
|
|
|
54e05482
|
2013-04-15T15:27:27
|
|
Merge pull request #1470 from carlosmn/remote-ls-after-close
Fetch fixes
|
|
32ef1d1c
|
2013-04-16T00:17:40
|
|
Fix examples
|
|
404eadb0
|
2013-04-16T00:11:59
|
|
remote: don't try to update FETCH_HEAD if no extra heads exist
Don't try to update anything if there are no heads to update. This
saves us from trying to look into a fetch refspec when there is none.
A better fix for compatibility with git when using remotes without
refspecs is still needed, but this stops us from segfaulting.
|
|
|
e13a0647
|
2013-04-15T23:54:28
|
|
Update docs
|
|
|
cbda09d0
|
2013-04-15T23:40:46
|
|
git_revision -> git_revspec
|
|
|
36c2dfed
|
2013-04-15T23:32:40
|
|
Is this crazy?
|
|
|
67ba7d20
|
2013-04-15T22:53:57
|
|
Allow git_remote_ls after disconnecting from the remote
Keep the data around until free, as expected by our own fetch example
|
|
|
d064c747
|
2013-04-15T23:18:24
|
|
Merge remote-tracking branch 'ben/unified-revparse' into development
|
|
20156653
|
2013-04-15T13:29:40
|
|
Clean up minor details
|
|
|
5961d5ea
|
2013-04-15T12:10:18
|
|
Clean up example code.
|
|
|
299a224b
|
2013-04-15T12:00:04
|
|
Change git_revparse to output git_object pointers
This will probably prevent many lookup/free
operations in calling code.
|
|
|
2ebc3c66
|
2013-04-15T11:57:24
|
|
Redeploy git_revparse_single.
|
|
|
4291ad07
|
2013-04-15T11:42:34
|
|
Reintroduce git_revparse_single.
|
|
4a3f69b5
|
2013-04-15T20:20:14
|
|
refdb tests: use the right variable size
Mixing int and size_t through pointers leads to problems
in big-endian machines.
|
|
|
77849ebf
|
2013-04-15T11:19:12
|
|
Merge pull request #1468 from carlosmn/obsd-sparc64
OpenBSD & sparc64 fixes
|
|
|
872ca1d3
|
2013-04-15T20:00:42
|
|
Fix compilation on OpenBSD
|
|
|
2d2260da
|
2013-04-15T06:11:29
|
|
Merge pull request #1467 from carlosmn/commit-parse
commit: correctly detect the start of the commit message
|
|
|
0efae3b2
|
2013-04-15T12:24:08
|
|
commit: correctly detect the start of the commit message
The end of the header is signaled by to consecutive LFs and the commit
message starts immediately after. Jumping over LFs at the start of the
message is a bug and leads to creating different commits if
when rebuilding history.
This also fixes an empty commit message being returned as "\n".
|
|
041ed367
|
2013-04-12T10:48:23
|
|
Merge pull request #1464 from ethomson/refdb_free
dec refcount on refdb instead of always freeing
|
|
7ebc249c
|
2013-04-04T11:38:17
|
|
dec refcount on refdb instead of always freeing
|
|
|
ea8bac37
|
2013-04-11T06:34:59
|
|
Merge pull request #1450 from carlosmn/branch-upstream
Branch upstream configuration
|
|
|
d59942c2
|
2013-03-30T04:27:42
|
|
branch: add more upstream configuration management
Add functions to set and unset the upstream configuration to
complement the getter we already have.
|
|
|
acd40771
|
2013-04-11T03:03:02
|
|
Merge pull request #1367 from yorah/fix/pathspecs_behaviour
Correctly return matched pathspec when passing "*" or "."
|
|
0d32f39e
|
2013-03-04T11:31:50
|
|
Notify '*' pathspec correctly when diffing
I also moved all tests related to notifying in their own file.
|
|
|
90431f1b
|
2013-04-10T08:33:33
|
|
Merge pull request #1424 from phkelley/efficient_push
Reduce the number of unnecessary objects in pushed packs
|
|
|
575a54db
|
2013-04-10T16:55:29
|
|
object: Export git_object_dup
|
|
|
0d3ccf0b
|
2013-04-10T16:41:05
|
|
examples: Don't print weird characters
|
|
|
e9b7ff60
|
2013-04-09T15:15:18
|
|
Merge pull request #1460 from arrbee/fix-dirty-submodules-diff
Submodule diff tests and fixes
|
|
|
ad26434b
|
2013-04-09T14:52:32
|
|
Tests and more fixes for submodule diffs
This adds tests for diffs with submodules in them and (perhaps
unsurprisingly) requires further fixes to be made. Specifically,
this fixes:
- when considering if a submodule is dirty in the workdir, it was
being treated as dirty even if only the index was dirty.
- git_diff_patch_to_str (and git_diff_patch_print) were "printing"
the headers for files (and submodules) that were unmodified or
had no meaningful content.
- added comment to previous fix and removed unneeded parens.
|
|
|
9da187e8
|
2013-04-09T11:40:00
|
|
Fix clang warnings and improve checks
|
|
94750e8a
|
2013-03-29T11:52:18
|
|
Fix submodule dirty states not showing if submodules comes before files, or there are only dirty submodules but no changed files
GIT_DIFF_PATCH_DIFFABLE was not set, so the diff content was not shown
When submodule is dirty, the hash may be the same, but the length is different because -dirty is appended
We can therefore compare the length or hash
|
|
|
fc12a6b5
|
2013-04-08T23:28:27
|
|
Merge pull request #1458 from maxpow4h/patch-1
Updated link to Haskell bindings
|
|
|
ec7e240b
|
2013-04-09T05:07:12
|
|
Add rev-list example to makefiles
|
|
|
1aa21fe3
|
2013-04-09T05:03:51
|
|
Deprecate git_revparse_single and _rangelike
|
|
7d5b0f8b
|
2013-04-09T09:28:40
|
|
Updated link to Haskell bindings
The old one hasn't been updated in a long time. This one is current.
|
|
|
8480eef7
|
2013-03-11T20:27:16
|
|
Implement unified git_revparse
|
|
|
4d13d07a
|
2013-03-11T13:20:47
|
|
Propose unified rev-parse API
|
|
|
812e5aea
|
2013-04-07T07:23:08
|
|
test: Add missing NULLs
|
|
|
d9ecaf8c
|
2013-04-07T07:22:38
|
|
Merge remote-tracking branch 'gnprice/revwalk' into development
|
|
2e233285
|
2013-03-20T09:39:20
|
|
examples: a test, for rev-list
This test file could probably be improved by a framework like
the one in git.git:t/, or by using a language like Python instead
of shell.
The other examples would benefit from tests too. Probably best
to settle on a framework to write them in, then add more tests.
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
8f7f5e55
|
2013-03-31T14:56:32
|
|
examples: rev-list
This demonstrates parts of the interface for specifying revisions that
Git users are familiar with from 'git rev-list', 'git log', and other
Git commands. A similar query interface is used in out-of-core
command-line programs that browse a Git repo (like 'tig'), and may be
useful for an 'advanced search' interface in GUI or web applications.
In this version, we parse all the query modifiers we can support with
the existing logic in revwalk: basic include/exclude commits, and the
ordering flags. More logic will be required to support '--grep',
'--author', the pickaxe '-S', etc.
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
af079d8b
|
2013-03-03T20:54:23
|
|
revwalk: Parse revision ranges
All the hard work is already in revparse.
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
b208d900
|
2013-03-20T10:01:58
|
|
revparse: Parse range-like syntax
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
22744837
|
2013-04-04T11:46:54
|
|
Merge pull request #1456 from ben/fix-general-example
Fix the general.c example to run against testrepo.git
|
|
|
f8591e51
|
2013-04-04T11:44:50
|
|
General example: run against testrepo.git
Fixes #1455
|
|
|
432b8c11
|
2013-04-02T17:09:35
|
|
Merge pull request #1453 from ethomson/refdb_export
Properly GIT_EXPORT git_reference__alloc
|
|
|
c869e268
|
2013-04-02T18:57:42
|
|
export git_reference__alloc
|
|
|
734aa826
|
2013-04-01T13:28:08
|
|
Merge pull request #1452 from nulltoken/fix/branch_doc
branch: Fix git_branch_create() documentation
|
|
b08c3173
|
2013-04-01T22:01:13
|
|
branch: Fix git_branch_create() documentation
|
|
|
08283cbd
|
2013-04-01T07:12:49
|
|
Merge pull request #1448 from phkelley/development
Avoid pre-Win7 WinHTTP self-redirect quirk
|
|
b39f9697
|
2013-03-31T23:04:14
|
|
Fix whitespace in src/win32/version.h
|
|
|
5c5eeba6
|
2013-03-31T22:22:33
|
|
Add git_has_win32_version helper
|
|
|
2932c882
|
2013-03-04T02:17:04
|
|
revwalk: refactor tests a bit
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
06e6eab0
|
2013-03-19T12:02:19
|
|
revwalk tests: better diagram of example repo
The purported command output was already inaccurate, as the refs
aren't where it shows. In any event, the labels a reader of this
file really needs are the indices used in commit_sorting_*, to make
it possible to understand them by referring directly from those
arrays to the diagram rather than from the index arrays, to commit_ids,
to the diagram. Add those.
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
804c5f56
|
2013-03-03T20:22:51
|
|
Fix puzzling doc comment
Signed-off-by: Greg Price <price@mit.edu>
|
|
|
c45d9c46
|
2013-03-31T14:07:15
|
|
Merge pull request #1451 from nulltoken/topic/support_taggerless_tags
Support tags with no tagger nor message
|
|
|
8cc2f2d8
|
2013-03-31T12:10:27
|
|
Win32 error reporting: Support WinHTTP errors
|
|
|
24cb87e2
|
2013-03-31T13:27:43
|
|
tag: Fix parsing when no tagger nor message
|
|
|
5a5bd640
|
2013-03-31T13:53:40
|
|
tests: Fix indentations
|
|
|
97016f29
|
2013-03-30T09:30:29
|
|
branch: refactor git_branch_remote_name
Return the size we'd need to write to instead of simply an
error. Split the function into two to be used later by the upstream
configuration functions.
|
|
|
0227fa2a
|
2013-03-30T21:36:04
|
|
Avoid pre-Win7 WinHTTP self-redirect quirk
|
|
|
a258d8e3
|
2013-03-30T03:39:19
|
|
branch: rename 'tracking' to 'upstream'
The term 'tracking' is overloaded. Help distinguish what we mean by
using 'upstream' for this part of the library.
|
|
|
81b8c9df
|
2013-03-30T04:50:53
|
|
transport: don't try to export nonexistent function
|
|
f938259f
|
2013-03-29T16:44:00
|
|
Merge pull request #1446 from ethomson/free
Clean up some memleaks in tests
|
|
|
0e60b637
|
2013-03-29T18:36:11
|
|
free!
|
|
|
1d5220dc
|
2013-03-29T10:13:54
|
|
Merge pull request #1445 from ethomson/reset_unmerged
remove unmerged files during reset hard
|
|
|
54a1a042
|
2013-03-29T11:26:12
|
|
remove unmerged files during reset hard
|
|
|
8cfd54f0
|
2013-03-26T12:27:15
|
|
Fix Windows/Win32 warning
|
|
|
0b061b5b
|
2013-03-26T11:05:57
|
|
Merge pull request #1436 from schu/opts-cache-size
opts: allow configuration of odb cache size
|
|
|
86d24ce4
|
2013-03-26T10:42:30
|
|
Merge pull request #1439 from arrbee/recurse-ignored-dirs
Several diff and status fixes
|
|
|
ccfa6805
|
2013-03-25T23:58:40
|
|
Fix some diff ignores and submodule dirty workdir
This started out trying to look at the problems from issue #1425
and gradually grew to a broader set of fixes. There are two core
things fixed here:
1. When you had an ignore like "/bin" which is rooted at the top
of your tree, instead of immediately adding the "bin/" entry
as an ignored item in the diff, we were returning all of the
direct descendants of the directory as ignored items. This
changes things to immediately ignore the directory. Note that
this effects the behavior in test_status_ignore__subdirectories
so that we no longer exactly match core gits ignore behavior,
but the new behavior probably makes more sense (i.e. we now
will include an ignored directory inside an untracked directory
that we previously would have left off).
2. When a submodule only contained working directory changes, the
diff code was always considering it unmodified which was just
an outright bug. The HEAD SHA of the submodule matches the SHA
in the parent repo index, and since the SHAs matches, the diff
code was overwriting the actual status with UNMODIFIED.
These fixes broke existing tests test_diff_workdir__submodules and
test_status_ignore__subdirectories but looking it over, I actually
think the new results are correct and the old results were wrong.
@nulltoken had actually commented on the subdirectory ignore issue
previously.
I also included in the tests some debugging versions of the
shared iteration callback routines that print status or diff
information. These aren't used actively in the tests, but can be
quickly swapped in to test code to give a better picture of what
is being scanned in some of the complex test scenarios.
|
|
|
37ee70fa
|
2013-03-25T22:19:39
|
|
Implement GIT_STATUS_OPT_EXCLUDE_SUBMODULES
This option has been sitting unimplemented for a while, so I
finally went through and implemented it along with some tests.
As part of this, I improved the implementation of
GIT_DIFF_IGNORE_SUBMODULES so it be more diligent about avoiding
extra work and about leaving off delta records for submodules to
the greatest extent possible (though it may include them still
if you are request TYPECHANGE records).
|
|
|
d2a4a54b
|
2013-03-25T21:46:51
|
|
Merge pull request #1438 from ethomson/checkout_stat
don't stat until the file is written
|
|
|
d828f118
|
2013-03-25T18:16:02
|
|
don't stat until the file is written
|
|
|
0c289dd7
|
2013-03-25T16:40:16
|
|
Recursing into ignored dirs for diff and status
This implements working versions of GIT_DIFF_RECURSE_IGNORED_DIRS
and GIT_STATUS_OPT_RECURSE_IGNORED_DIRS along with some tests for
the newly available behaviors. This is not turned on by default
for status, but can be accessed via the options to the extended
version of the command.
|
|
|
f2850f33
|
2013-03-25T15:30:37
|
|
Merge pull request #1437 from phkelley/redirect
http: Support 302 Found (arrbee did most of the work)
|
|
|
f273b5d6
|
2013-03-25T18:15:54
|
|
Add a valgrind suppression for glibc's getaddrinfo cache
|
|
|
35e0f3c6
|
2013-03-25T17:59:30
|
|
Refine the redirect check condition
|
|
|
f17951d6
|
2013-03-25T14:42:53
|
|
Merge pull request #1431 from libgit2/autocrlf-fixes
Fix crlf handling, particularly when autocrlf=true
|
|
|
2c7f7a66
|
2013-03-25T17:35:36
|
|
http: Support 302 Found (arrbee did most of the work)
|
|
|
3658e81e
|
2013-03-25T14:20:07
|
|
Move crlf conversion into buf_text
This adds crlf/lf conversion functions into buf_text with more
efficient implementations that bypass the high level buffer
functions. They attempt to minimize the number of reallocations
done and they directly write the buffer data as needed if they
know that there is enough memory allocated to memcpy data.
Tests are added for these new functions. The crlf.c code is
updated to use the new functions.
Removed the include of buf_text.h from filter.h and just include
it more narrowly in the places that need it.
|
|
|
050ab995
|
2013-03-25T14:13:53
|
|
Fix up checkout file contents checks
This fixes of the file contents checks in checkout to give
slightly better error messages by directly calling the underlying
clar assertions so the file and line number of the top level call
can be reported correctly, and renames the helpers to not start
with "test_" since that is kind of reserved by clar.
This also enables some of the CRLF tests on all platforms that
were previously Windows only (by pushing a check of the native
line endings into the test body).
|
|
|
4a15ea86
|
2013-03-21T14:02:25
|
|
don't convert CRLF to CRCRLF
|
|
|
1098cfae
|
2013-03-22T14:52:29
|
|
Test fixes and cleanup
This fixes some places where the new tests were leaving the test
area in a bad state or were freeing data they should not free.
It also removes code that is extraneous to the core issue and
fixes an invalid SHA being looked up in one of the tests (which
was failing, but for the wrong reason).
|
|
b8acb775
|
2013-03-07T22:15:40
|
|
Added some tests for issue #1397
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
9733e80c
|
2013-03-22T10:44:45
|
|
Add has_cr_in_index check to CRLF filter
This adds a check to the drop_crlf filter path to check it the
file in the index already has a CR in it, in which case this will
not drop the CRs from the workdir file contents.
This uncovered a "bug" in `git_blob_create_fromworkdir` where the
full path to the file was passed to look up the attributes instead
of the relative path from the working directory root. This meant
that the check in the index for a pre-existing entry of the same
name was failing.
|
|
|
13640d1b
|
2013-03-25T21:39:11
|
|
oid: Do not parse OIDs longer than 40
|
|
|
1f107478
|
2013-03-25T13:26:50
|
|
Merge pull request #1428 from xavier-l/nul-terminated-oid
Nul terminated oid
|
|
|
c2ea65ee
|
2013-03-25T21:22:57
|
|
clar: Disable online tests. By now.
|
|
|
f7110e6c
|
2013-03-25T10:11:32
|
|
Merge pull request #1427 from Lionelon/development
Fix link issue in network examples
|
|
|
c5b72fa2
|
2013-03-25T10:09:03
|
|
Merge pull request #1435 from mcanes/development
Remove GIT_SUCCESS from documentation
|
|
f5e28202
|
2013-03-25T13:38:43
|
|
opts: allow configuration of odb cache size
Currently, the odb cache has a fixed size of 128 slots as defined by
GIT_DEFAULT_CACHE_SIZE. Allow users to set the size of the cache via
git_libgit2_opts().
Fixes #1035.
|
|
c2186230
|
2013-03-24T12:34:00
|
|
Remove GIT_SUCCESS from documentation
|
|
|
3f21a23c
|
2013-03-23T12:10:23
|
|
Merge pull request #1432 from arrbee/update-clar
Update clar and some test helpers clean up
|
|
|
1323c6d1
|
2013-03-22T14:27:56
|
|
Add cl_repo_set_bool and cleanup tests
This adds a helper function for the cases where you want to
quickly set a single boolean config value for a repository.
This allowed me to remove a lot of code.
|
|
|
3ba01362
|
2013-03-20T11:46:03
|
|
Update cl_assert_equal_sz to be nicer
This makes the size_t comparison test nicer (assuming that the
values are actually not using the full length), and converts
some cases that were using it for pointer comparison to use the
macro that is designed for pointer comparison.
|
|
|
7202ec29
|
2013-03-20T11:47:34
|
|
Update to latest Clar
|
|
|
33a59401
|
2013-03-22T20:22:39
|
|
graph: make the ahead-behind docs clearer
Explain it in local-upstream branch terms so it's easier to grasp than
with the `one` and `two` naming from the merge-base code.
|
|
b3c17483
|
2013-03-21T14:50:28
|
|
Clarified string value
|