diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:36:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 00:36:22 (GMT) |
commit | 324b6b1678a3c1c6179f53fccf4e5fe2cef43240 (patch) | |
tree | d59ceeace1abf83b562bd8bac5285130f86c9593 /ll-merge.c | |
parent | da68bf337664f6160d56153cfe4a38c49a5185f3 (diff) | |
parent | 9e8137238d1b7f558dd61c8737883e73c8368e4b (diff) | |
download | git-324b6b1678a3c1c6179f53fccf4e5fe2cef43240.zip git-324b6b1678a3c1c6179f53fccf4e5fe2cef43240.tar.gz git-324b6b1678a3c1c6179f53fccf4e5fe2cef43240.tar.bz2 |
Merge branch 'mh/check-attr-relative'
* mh/check-attr-relative: (29 commits)
test-path-utils: Add subcommand "prefix_path"
test-path-utils: Add subcommand "absolute_path"
git-check-attr: Normalize paths
git-check-attr: Demonstrate problems with relative paths
git-check-attr: Demonstrate problems with unnormalized paths
git-check-attr: test that no output is written to stderr
Rename git_checkattr() to git_check_attr()
git-check-attr: Fix command-line handling to match docs
git-check-attr: Drive two tests using the same raw data
git-check-attr: Add an --all option to show all attributes
git-check-attr: Error out if no pathnames are specified
git-check-attr: Process command-line args more systematically
git-check-attr: Handle each error separately
git-check-attr: Extract a function error_with_usage()
git-check-attr: Introduce a new variable
git-check-attr: Extract a function output_attr()
Allow querying all attributes on a file
Remove redundant check
Remove redundant call to bootstrap_attr_stack()
Extract a function collect_all_attrs()
...
Diffstat (limited to 'll-merge.c')
-rw-r--r-- | ll-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -330,7 +330,7 @@ static int git_path_check_merge(const char *path, struct git_attr_check check[2] check[0].attr = git_attr("merge"); check[1].attr = git_attr("conflict-marker-size"); } - return git_checkattr(path, 2, check); + return git_check_attr(path, 2, check); } static void normalize_file(mmfile_t *mm, const char *path) @@ -387,7 +387,7 @@ int ll_merge_marker_size(const char *path) if (!check.attr) check.attr = git_attr("conflict-marker-size"); - if (!git_checkattr(path, 1, &check) && check.value) { + if (!git_check_attr(path, 1, &check) && check.value) { marker_size = atoi(check.value); if (marker_size <= 0) marker_size = DEFAULT_CONFLICT_MARKER_SIZE; |