diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-06-16 01:44:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-17 09:24:47 -0700 |
| commit | 603d249853981d81d1f8cf561b18d77cb1b55923 (patch) | |
| tree | ada925596b9eeef99de56ed4ce1ec02696214730 /trace.c | |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
| download | git-603d249853981d81d1f8cf561b18d77cb1b55923.tar.gz git-603d249853981d81d1f8cf561b18d77cb1b55923.tar.xz | |
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 'trace.c')
0 files changed, 0 insertions, 0 deletions