diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-09 04:35:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-09 04:35:52 (GMT) |
| commit | 7f5885ad2abfbf9b760e2f32f70537d1c380734d (patch) | |
| tree | f2a636bb35db7ea784c2ae08259cfca6bfb6a1a6 /read-cache.c | |
| parent | faacc8efe503a470c0c549c7949824728d7f1461 (diff) | |
| parent | 1335d76e4569fa84e52dc24c88c04daeae6e160e (diff) | |
| download | git-7f5885ad2abfbf9b760e2f32f70537d1c380734d.zip git-7f5885ad2abfbf9b760e2f32f70537d1c380734d.tar.gz git-7f5885ad2abfbf9b760e2f32f70537d1c380734d.tar.bz2 | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint
"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 db27766..491e52d 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); |