mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: don't shift conflicts left and right

Browse Source 
If o->merge is set, the struct traverse_info member conflicts is shifted
left in unpack_callback, then passed through traverse_trees_recursive
to unpack_nondirectories, where it is shifted right before use.  Stop
the shifting and just pass the conflict bit mask as is.  Rename the
member to df_conflicts to prove that it isn't used anywhere else.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2013-06-16 01:44:43 +02:00
committed by Junio C Hamano
parent edca415256
commit 603d249853
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tree-walk.h
View File

@ -46,7 +46,7 @@ struct traverse_info {
int pathlen;
struct pathspec *pathspec;
unsigned long conflicts;
unsigned long df_conflicts;
traverse_callback_t fn;
void *data;
int show_all_errors;