undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/diff-filespec-cleanup'

Browse Source 
* jk/diff-filespec-cleanup:
  diff_filespec: use only 2 bits for is_binary flag
  diff_filespec: reorder is_binary field
  diff_filespec: drop xfrm_flags field
  diff_filespec: drop funcname_pattern_ident field
  diff_filespec: reorder dirty_submodule macro definitions
This commit is contained in:
Junio C Hamano 2014-01-27 10:45:02 -08:00
commit e049109ef1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -4139,9 +4139,9 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
DIFF_FILE_VALID(s) ? "valid" : "invalid", DIFF_FILE_VALID(s) ? "valid" : "invalid",
s->mode, s->mode,
s->sha1_valid ? sha1_to_hex(s->sha1) : ""); s->sha1_valid ? sha1_to_hex(s->sha1) : "");
fprintf(stderr, "queue[%d] %s size %lu flags %d\n", fprintf(stderr, "queue[%d] %s size %lu\n",
x, one ? one : "", x, one ? one : "",
s->size, s->xfrm_flags); s->size);
} }
void diff_debug_filepair(const struct diff_filepair *p, int i) void diff_debug_filepair(const struct diff_filepair *p, int i)

8
diffcore.h
View File

@ -29,10 +29,8 @@ struct diff_filespec {
char *path; char *path;
void *data; void *data;
void *cnt_data; void *cnt_data;
const char *funcname_pattern_ident;
unsigned long size; unsigned long size;
int count; /* Reference count */ int count; /* Reference count */
int xfrm_flags; /* for use by the xfrm */
int rename_used; /* Count of rename users */ int rename_used; /* Count of rename users */
unsigned short mode; /* file mode */ unsigned short mode; /* file mode */
unsigned sha1_valid : 1; /* if true, use sha1 and trust mode; unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
@ -43,13 +41,13 @@ struct diff_filespec {
unsigned should_free : 1; /* data should be free()'ed */ unsigned should_free : 1; /* data should be free()'ed */
unsigned should_munmap : 1; /* data should be munmap()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */
unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */ unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */
unsigned is_stdin : 1;
#define DIRTY_SUBMODULE_UNTRACKED 1 #define DIRTY_SUBMODULE_UNTRACKED 1
#define DIRTY_SUBMODULE_MODIFIED 2 #define DIRTY_SUBMODULE_MODIFIED 2
unsigned is_stdin : 1;
unsigned has_more_entries : 1; /* only appear in combined diff */ unsigned has_more_entries : 1; /* only appear in combined diff */
struct userdiff_driver *driver;
/* data should be considered "binary"; -1 means "don't know yet" */ /* data should be considered "binary"; -1 means "don't know yet" */
int is_binary; int is_binary : 2;
struct userdiff_driver *driver;
}; };
extern struct diff_filespec *alloc_filespec(const char *); extern struct diff_filespec *alloc_filespec(const char *);