summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-06 23:41:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-26 22:44:47 (GMT)
commitb13112fa160f44fb0d795cdd992015c9f5a3d72a (patch)
treedbf92a734807c32342703603ea3d7c77826b95fe /builtin/merge-tree.c
parentfa2364ec3457cc107e47d617779f1ffa23647ca4 (diff)
downloadgit-b13112fa160f44fb0d795cdd992015c9f5a3d72a.zip
git-b13112fa160f44fb0d795cdd992015c9f5a3d72a.tar.gz
git-b13112fa160f44fb0d795cdd992015c9f5a3d72a.tar.bz2
merge-tree: lose unused "flags" from merge_list
Drop the unused field from the structure. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r--builtin/merge-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ebd0d25..b61d811 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -12,8 +12,7 @@ struct merge_list {
struct merge_list *next;
struct merge_list *link; /* other stages for this object */
- unsigned int stage : 2,
- flags : 30;
+ unsigned int stage : 2;
unsigned int mode;
const char *path;
struct blob *blob;