diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:39 -0700 |
| commit | 21bed620cd2d4fc4fb3d42447136c9f899ede5bb (patch) | |
| tree | 55fe7e104798ec1689d4e3513e81563a0188317f /read-cache.c | |
| parent | Merge branch 'rs/worktree-use-strbuf-absolute-path' (diff) | |
| parent | merge: avoid "safer crlf" during recording of merge results (diff) | |
| download | tgif-21bed620cd2d4fc4fb3d42447136c9f899ede5bb.tar.xz | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
* jc/renormalize-merge-kill-safer-crlf:
merge: avoid "safer crlf" during recording of merge results
convert: unify the "auto" handling of CRLF
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/read-cache.c b/read-cache.c index db27766055..491e52d120 100644 --- a/read-cache.c +++ b/read-cache.c @@ -19,9 +19,6 @@ #include "split-index.h" #include "utf8.h" -static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, - unsigned int options); - /* Mask for the name length in ce_flags in the on-disk index */ #define CE_NAMEMASK (0x0fff) @@ -1257,7 +1254,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, return has_errors; } -static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, +struct cache_entry *refresh_cache_entry(struct cache_entry *ce, unsigned int options) { return refresh_cache_ent(&the_index, ce, options, NULL, NULL); |