summaryrefslogtreecommitdiff
path: root/tree-walk.h
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2013-06-16 01:44:43 +0200
committerJunio C Hamano <gitster@pobox.com>2013-06-17 09:24:47 -0700
commit603d249853981d81d1f8cf561b18d77cb1b55923 (patch)
treeada925596b9eeef99de56ed4ce1ec02696214730 /tree-walk.h
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-603d249853981d81d1f8cf561b18d77cb1b55923.tar.gz
unpack-trees: don't shift conflicts left and right
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>
Diffstat (limited to 'tree-walk.h')
-rw-r--r--tree-walk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-walk.h b/tree-walk.h
index 2bf0db9814..ae04b6417d 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -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;