mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![brian m. carlson](/assets/img/avatar_default.png)
When applying multiple patches with git am, or when rebasing using the am backend, it's possible that one of our patches has updated a gitattributes file. Currently, we cache this information, so if a file in a subsequent patch has attributes applied, the file will be written out with the attributes in place as of the time we started the rebase or am operation, not with the attributes applied by the previous patch. This problem does not occur when using the -m or -i flags to rebase. To ensure we write the correct data into the working tree, expire the cache after each patch that touches a path ending in ".gitattributes". Since we load these attributes in multiple separate files, we must expire them accordingly. Verify that both the am and rebase code paths work correctly, including the conflict marker size with am -3. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
134 lines
4.1 KiB
C
134 lines
4.1 KiB
C
/*
|
|
* Copyright (c) 2011, Google Inc.
|
|
*/
|
|
#ifndef CONVERT_H
|
|
#define CONVERT_H
|
|
|
|
#include "string-list.h"
|
|
|
|
struct index_state;
|
|
struct object_id;
|
|
struct strbuf;
|
|
|
|
#define CONV_EOL_RNDTRP_DIE (1<<0) /* Die if CRLF to LF to CRLF is different */
|
|
#define CONV_EOL_RNDTRP_WARN (1<<1) /* Warn if CRLF to LF to CRLF is different */
|
|
#define CONV_EOL_RENORMALIZE (1<<2) /* Convert CRLF to LF */
|
|
#define CONV_EOL_KEEP_CRLF (1<<3) /* Keep CRLF line endings as is */
|
|
#define CONV_WRITE_OBJECT (1<<4) /* Content is written to the index */
|
|
|
|
extern int global_conv_flags_eol;
|
|
|
|
enum auto_crlf {
|
|
AUTO_CRLF_FALSE = 0,
|
|
AUTO_CRLF_TRUE = 1,
|
|
AUTO_CRLF_INPUT = -1
|
|
};
|
|
|
|
extern enum auto_crlf auto_crlf;
|
|
|
|
enum eol {
|
|
EOL_UNSET,
|
|
EOL_CRLF,
|
|
EOL_LF,
|
|
#ifdef NATIVE_CRLF
|
|
EOL_NATIVE = EOL_CRLF
|
|
#else
|
|
EOL_NATIVE = EOL_LF
|
|
#endif
|
|
};
|
|
|
|
enum ce_delay_state {
|
|
CE_NO_DELAY = 0,
|
|
CE_CAN_DELAY = 1,
|
|
CE_RETRY = 2
|
|
};
|
|
|
|
struct delayed_checkout {
|
|
/*
|
|
* State of the currently processed cache entry. If the state is
|
|
* CE_CAN_DELAY, then the filter can delay the current cache entry.
|
|
* If the state is CE_RETRY, then this signals the filter that the
|
|
* cache entry was requested before.
|
|
*/
|
|
enum ce_delay_state state;
|
|
/* List of filter drivers that signaled delayed blobs. */
|
|
struct string_list filters;
|
|
/* List of delayed blobs identified by their path. */
|
|
struct string_list paths;
|
|
};
|
|
|
|
extern enum eol core_eol;
|
|
extern char *check_roundtrip_encoding;
|
|
const char *get_cached_convert_stats_ascii(const struct index_state *istate,
|
|
const char *path);
|
|
const char *get_wt_convert_stats_ascii(const char *path);
|
|
const char *get_convert_attr_ascii(const struct index_state *istate,
|
|
const char *path);
|
|
|
|
/* returns 1 if *dst was used */
|
|
int convert_to_git(const struct index_state *istate,
|
|
const char *path, const char *src, size_t len,
|
|
struct strbuf *dst, int conv_flags);
|
|
int convert_to_working_tree(const struct index_state *istate,
|
|
const char *path, const char *src,
|
|
size_t len, struct strbuf *dst);
|
|
int async_convert_to_working_tree(const struct index_state *istate,
|
|
const char *path, const char *src,
|
|
size_t len, struct strbuf *dst,
|
|
void *dco);
|
|
int async_query_available_blobs(const char *cmd,
|
|
struct string_list *available_paths);
|
|
int renormalize_buffer(const struct index_state *istate,
|
|
const char *path, const char *src, size_t len,
|
|
struct strbuf *dst);
|
|
static inline int would_convert_to_git(const struct index_state *istate,
|
|
const char *path)
|
|
{
|
|
return convert_to_git(istate, path, NULL, 0, NULL, 0);
|
|
}
|
|
/* Precondition: would_convert_to_git_filter_fd(path) == true */
|
|
void convert_to_git_filter_fd(const struct index_state *istate,
|
|
const char *path, int fd,
|
|
struct strbuf *dst,
|
|
int conv_flags);
|
|
int would_convert_to_git_filter_fd(const struct index_state *istate,
|
|
const char *path);
|
|
|
|
/*
|
|
* Reset the internal list of attributes used by convert_to_git and
|
|
* convert_to_working_tree.
|
|
*/
|
|
void reset_parsed_attributes(void);
|
|
|
|
/*****************************************************************
|
|
*
|
|
* Streaming conversion support
|
|
*
|
|
*****************************************************************/
|
|
|
|
struct stream_filter; /* opaque */
|
|
|
|
struct stream_filter *get_stream_filter(const struct index_state *istate,
|
|
const char *path,
|
|
const struct object_id *);
|
|
void free_stream_filter(struct stream_filter *);
|
|
int is_null_stream_filter(struct stream_filter *);
|
|
|
|
/*
|
|
* Use as much input up to *isize_p and fill output up to *osize_p;
|
|
* update isize_p and osize_p to indicate how much buffer space was
|
|
* consumed and filled. Return 0 on success, non-zero on error.
|
|
*
|
|
* Some filters may need to buffer the input and look-ahead inside it
|
|
* to decide what to output, and they may consume more than zero bytes
|
|
* of input and still not produce any output. After feeding all the
|
|
* input, pass NULL as input and keep calling this function, to let
|
|
* such filters know there is no more input coming and it is time for
|
|
* them to produce the remaining output based on the buffered input.
|
|
*/
|
|
int stream_filter(struct stream_filter *,
|
|
const char *input, size_t *isize_p,
|
|
char *output, size_t *osize_p);
|
|
|
|
#endif /* CONVERT_H */
|