From: Stephen Boyd <bebarino@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Sixt <j.sixt@viscovery.net>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv3 2/2] read-tree: migrate to parse-options
Date: Thu, 25 Jun 2009 22:29:20 -0700 [thread overview]
Message-ID: <4A445CB0.4010506@gmail.com> (raw)
In-Reply-To: <1245993250-8213-2-git-send-email-bebarino@gmail.com>
Stephen Boyd wrote:
> struct unpack_trees_options {
> - unsigned int reset:1,
> - merge:1,
> - update:1,
> - index_only:1,
> - nontrivial_merge:1,
> - trivial_merges_only:1,
> - verbose_update:1,
> - aggressive:1,
> - skip_unmerged:1,
> - initial_checkout:1,
> - diff_index_cached:1,
> - gently:1;
> + unsigned int reset,
> + merge,
> + update,
> + index_only,
> + nontrivial_merge,
> + trivial_merges_only,
> + verbose_update,
> + aggressive,
> + skip_unmerged,
> + initial_checkout,
> + diff_index_cached,
> + gently;
Sorry I went a little overboard with s/:1// on unpack_tree_options.
You'll probably want to squash this on top.
diff --git a/unpack-trees.h b/unpack-trees.h
index d19df44..f344679 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -21,14 +21,14 @@ struct unpack_trees_options {
merge,
update,
index_only,
- nontrivial_merge,
+ nontrivial_merge:1,
trivial_merges_only,
verbose_update,
aggressive,
- skip_unmerged,
- initial_checkout,
- diff_index_cached,
- gently;
+ skip_unmerged:1,
+ initial_checkout:1,
+ diff_index_cached:1,
+ gently:1;
const char *prefix;
int pos;
struct dir_struct *dir;
next prev parent reply other threads:[~2009-06-26 5:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-24 4:27 [PATCH 1/2] read-tree: convert unhelpful usage()'s to helpful die()'s Stephen Boyd
2009-06-24 4:27 ` [PATCH 2/2] read-tree: migrate to parse-options Stephen Boyd
2009-06-24 5:08 ` Junio C Hamano
2009-06-25 1:36 ` Stephen Boyd
2009-06-25 5:06 ` [PATCHv2 " Stephen Boyd
2009-06-25 6:55 ` Johannes Sixt
2009-06-26 3:15 ` Stephen Boyd
2009-06-26 5:14 ` [PATCHv3 1/2] read-tree: convert unhelpful usage()'s to helpful die()'s Stephen Boyd
2009-06-26 5:14 ` [PATCHv3 2/2] read-tree: migrate to parse-options Stephen Boyd
2009-06-26 5:29 ` Stephen Boyd [this message]
2009-06-26 17:23 ` Junio C Hamano
2009-06-27 2:00 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A445CB0.4010506@gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).