Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
133bceba
Commit
133bceba
authored
May 19, 2019
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ignore: skip UTF8 BOM in ignore file
parent
73a157e0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletions
+12
-1
src/attr_file.c
+12
-1
No files found.
src/attr_file.c
View file @
133bceba
...
...
@@ -10,6 +10,7 @@
#include "repository.h"
#include "filebuf.h"
#include "attrcache.h"
#include "buf_text.h"
#include "git2/blob.h"
#include "git2/tree.h"
#include "blob.h"
...
...
@@ -108,9 +109,12 @@ int git_attr_file__load(
int
error
=
0
;
git_blob
*
blob
=
NULL
;
git_buf
content
=
GIT_BUF_INIT
;
const
char
*
content_str
;
git_attr_file
*
file
;
struct
stat
st
;
bool
nonexistent
=
false
;
int
bom_offset
;
git_bom_t
bom
;
*
out
=
NULL
;
...
...
@@ -159,13 +163,20 @@ int git_attr_file__load(
if
((
error
=
git_attr_file__new
(
&
file
,
entry
,
source
))
<
0
)
goto
cleanup
;
/* advance over a UTF8 BOM */
content_str
=
git_buf_cstr
(
&
content
);
bom_offset
=
git_buf_text_detect_bom
(
&
bom
,
&
content
);
if
(
bom
==
GIT_BOM_UTF8
)
content_str
+=
bom_offset
;
/* store the key of the attr_reader; don't bother with cache
* invalidation during the same attr reader session.
*/
if
(
attr_session
)
file
->
session_key
=
attr_session
->
key
;
if
(
parser
&&
(
error
=
parser
(
repo
,
file
,
git_buf_cstr
(
&
content
)
))
<
0
)
{
if
(
parser
&&
(
error
=
parser
(
repo
,
file
,
content_str
))
<
0
)
{
git_attr_file__free
(
file
);
goto
cleanup
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment