| commit | 603d249853981d81d1f8cf561b18d77cb1b55923 | |
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | |
| Sat, 15 Jun 2013 23:44:43 +0000 (16 01:44 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 16:24:47 +0000 (17 09:24 -0700) | ||
| tree | ada925596b9eeef99de56ed4ce1ec02696214730 | treesnapshot (tar.gz zip) |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 | commitdiff |
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>
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>
| tree-walk.h | diffblobblamehistory | |
| unpack-trees.c | diffblobblamehistory |