summaryrefslogtreecommitdiff
path: root/src/cherrypick.c
Commit message (Collapse)AuthorAgeFilesLines
* git_error: use new names in internal APIs and usageEdward Thomson2019-01-221-2/+2
| | | | | Move to the `git_error` name in the internal API for error-related functions.
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-011-1/+1
| | | | Use the new object_type enumeration names within the codebase.
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-3/+3
|
* Make sure to always include "common.h" firstPatrick Steinhardt2017-07-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | Next to including several files, our "common.h" header also declares various macros which are then used throughout the project. As such, we have to make sure to always include this file first in all implementation files. Otherwise, we might encounter problems or even silent behavioural differences due to macros or defines not being defined as they should be. So in fact, our header and implementation files should make sure to always include "common.h" first. This commit does so by establishing a common include pattern. Header files inside of "src" will now always include "common.h" as its first other file, separated by a newline from all the other includes to make it stand out as special. There are two cases for the implementation files. If they do have a matching header file, they will always include this one first, leading to "common.h" being transitively included as first file. If they do not have a matching header file, they instead include "common.h" as first file themselves. This fixes the outlined problems and will become our standard practice for header and source files inside of the "src/" from now on.
* repository: rename `path_repository` and `path_gitlink`Patrick Steinhardt2017-02-131-2/+2
| | | | | | | | | | | | | The `path_repository` variable is actually confusing to think about, as it is not always clear what the repository actually is. It may either be the path to the folder containing worktree and .git directory, the path to .git itself, a worktree or something entirely different. Actually, the intent of the variable is to hold the path to the gitdir, which is either the .git directory or the bare repository. Rename the variable to `gitdir` to avoid confusion. While at it, also rename `path_gitlink` to `gitlink` to improve consistency.
* giterr_set: consistent error messagesEdward Thomson2016-12-291-2/+2
| | | | | | | | Error messages should be sentence fragments, and therefore: 1. Should not begin with a capital letter, 2. Should not conclude with punctuation, and 3. Should not end a sentence and begin a new one
* cherrypick, revert: drop unnecessary SAFE_CREATEEdward Thomson2015-02-271-1/+1
|
* indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-141-23/+9
| | | | | Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
* merge-like operations: lock index while workingEdward Thomson2015-02-141-4/+24
|
* git_cherry_pick -> git_cherrypickEdward Thomson2014-07-221-37/+37
|
* git_checkout_index: checkout other indexesEdward Thomson2014-07-011-7/+4
| | | | | | | | git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
* Fix remaining init_options inconsistenciesRussell Belfer2014-05-021-9/+5
| | | | | There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.
* cherry-pick: terminate the commit id stringCarlos Martín Nieto2014-04-181-1/+1
| | | | | We treat this as a NUL-terminated string, so make sure that we add the terminator.
* Added cherry-pick supportJacques Germishuys2014-04-141-0/+230