summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* repository: Add `git_repository_open_bare`vmg/bare-openVicent Marti2013-04-171-0/+31
|
* Merge pull request #1469 from libgit2/vmg/unified-revisionVicent Martí2013-04-153-42/+59
|\ | | | | Unified rev-parse, with a revision object
| * git_revision -> git_revspecVicent Marti2013-04-152-16/+16
| |
| * Is this crazy?Vicent Marti2013-04-152-27/+24
| |
| * Merge remote-tracking branch 'ben/unified-revparse' into developmentVicent Marti2013-04-153-36/+56
| |\
| | * Change git_revparse to output git_object pointersBen Straub2013-04-152-16/+13
| | | | | | | | | | | | This will probably prevent many lookup/free operations in calling code.
| | * Redeploy git_revparse_single.Ben Straub2013-04-152-5/+7
| | |
| | * Reintroduce git_revparse_single.Ben Straub2013-04-151-1/+1
| | |
| | * Deprecate git_revparse_single and _rangelikeBen Straub2013-04-094-51/+20
| | |
| | * Implement unified git_revparseBen Straub2013-04-081-6/+58
| | |
* | | remote: don't try to update FETCH_HEAD if no extra heads existCarlos Martín Nieto2013-04-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Allow git_remote_ls after disconnecting from the remoteCarlos Martín Nieto2013-04-153-23/+22
|/ / | | | | | | Keep the data around until free, as expected by our own fetch example
* | Fix compilation on OpenBSDCarlos Martín Nieto2013-04-152-2/+2
| |
* | commit: correctly detect the start of the commit messageCarlos Martín Nieto2013-04-151-2/+2
| | | | | | | | | | | | | | | | | | 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".
* | dec refcount on refdb instead of always freeingEdward Thomson2013-04-121-1/+9
| |
* | Merge pull request #1450 from carlosmn/branch-upstreamVicent Martí2013-04-115-38/+149
|\ \ | | | | | | Branch upstream configuration
| * | branch: add more upstream configuration managementCarlos Martín Nieto2013-04-111-1/+115
| | | | | | | | | | | | | | | Add functions to set and unset the upstream configuration to complement the getter we already have.
| * | branch: refactor git_branch_remote_nameCarlos Martín Nieto2013-03-311-25/+22
| | | | | | | | | | | | | | | | | | 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.
| * | branch: rename 'tracking' to 'upstream'Carlos Martín Nieto2013-03-305-12/+12
| | | | | | | | | | | | | | | The term 'tracking' is overloaded. Help distinguish what we mean by using 'upstream' for this part of the library.
* | | Notify '*' pathspec correctly when diffingyorah2013-04-114-12/+40
| | | | | | | | | | | | I also moved all tests related to notifying in their own file.
* | | object: Export git_object_dupVicent Marti2013-04-106-16/+10
| | |
* | | Merge pull request #1424 from phkelley/efficient_pushVicent Martí2013-04-101-35/+138
|\ \ \ | | | | | | | | Reduce the number of unnecessary objects in pushed packs
| * | | Fix dumb mistake in the comparison functionPhilip Kelley2013-03-191-3/+1
| | | |
| * | | Convert enqueue_object to a functionPhilip Kelley2013-03-191-21/+19
| | | |
| * | | Reduce the number of unnecessary objects in pushed packsPhilip Kelley2013-03-191-35/+142
| | | |
* | | | Tests and more fixes for submodule diffsRussell Belfer2013-04-092-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Fix clang warnings and improve checksRussell Belfer2013-04-091-2/+2
| | | |
* | | | Fix submodule dirty states not showing if submodules comes before files, or ↵Linquize2013-04-091-1/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote-tracking branch 'gnprice/revwalk' into developmentVicent Marti2013-04-072-0/+50
|\ \ \
| * | | revwalk: Parse revision rangesGreg Price2013-04-061-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | All the hard work is already in revparse. Signed-off-by: Greg Price <price@mit.edu>
| * | | revparse: Parse range-like syntaxGreg Price2013-04-061-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Greg Price <price@mit.edu>
* | | | Merge pull request #1448 from phkelley/developmentVicent Martí2013-04-014-31/+199
|\ \ \ \ | | | | | | | | | | Avoid pre-Win7 WinHTTP self-redirect quirk
| * | | | Fix whitespace in src/win32/version.hPhilip Kelley2013-03-311-2/+2
| | | | |
| * | | | Add git_has_win32_version helperPhilip Kelley2013-03-314-8/+25
| | | | |
| * | | | Win32 error reporting: Support WinHTTP errorsPhilip Kelley2013-03-311-18/+54
| | | | |
| * | | | Avoid pre-Win7 WinHTTP self-redirect quirkPhilip Kelley2013-03-301-11/+126
| | |_|/ | |/| |
* | | | tag: Fix parsing when no tagger nor messagenulltoken2013-03-311-1/+1
|/ / /
* | | remove unmerged files during reset hardEdward Thomson2013-03-291-2/+5
| | |
* | | Fix Windows/Win32 warningRussell Belfer2013-03-261-1/+6
| | |
* | | Merge pull request #1436 from schu/opts-cache-sizeVicent Martí2013-03-262-1/+12
|\ \ \ | | | | | | | | opts: allow configuration of odb cache size
| * | | opts: allow configuration of odb cache sizeMichael Schubert2013-03-252-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #1439 from arrbee/recurse-ignored-dirsVicent Martí2013-03-263-54/+111
|\ \ \ \ | | | | | | | | | | Several diff and status fixes
| * | | | Fix some diff ignores and submodule dirty workdirRussell Belfer2013-03-251-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Implement GIT_STATUS_OPT_EXCLUDE_SUBMODULESRussell Belfer2013-03-253-21/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | Recursing into ignored dirs for diff and statusRussell Belfer2013-03-252-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #1438 from ethomson/checkout_statVicent Martí2013-03-251-3/+3
|\ \ \ \ \ | | | | | | | | | | | | don't stat until the file is written
| * | | | | don't stat until the file is writtenEdward Thomson2013-03-251-3/+3
| |/ / / /
* | | | | Merge pull request #1437 from phkelley/redirectVicent Martí2013-03-251-32/+99
|\ \ \ \ \ | |/ / / / |/| | | | http: Support 302 Found (arrbee did most of the work)
| * | | | Refine the redirect check conditionPhilip Kelley2013-03-251-2/+5
| | | | |
| * | | | http: Support 302 Found (arrbee did most of the work)Philip Kelley2013-03-251-32/+96
| | | | |
View Lorry Controller Status