From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH] refresh-index: fix bitmask assignment
Date: Sat, 19 Jul 2008 23:31:52 -0700 [thread overview]
Message-ID: <7vtzelf4mf.fsf@gitster.siamese.dyndns.org> (raw)
5fdeacb (Teach update-index about --ignore-submodules, 2008-05-14) added a
new refresh option flag but did not assign a unique bit for it correctly,
and broke "update-index --ignore-missing".
This should fix it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* The fact that it took this long for anybody to notice the breakage
probably means that the "--ignore-missing" option in particular but the
ability for plumbing to allow scripting in general is not utilized by
as many people as the design initially envisioned.
cache.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cache.h b/cache.h
index ca382d4..9735b66 100644
--- a/cache.h
+++ b/cache.h
@@ -396,7 +396,7 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
#define REFRESH_QUIET 0x0004 /* be quiet about it */
#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */
-#define REFRESH_IGNORE_SUBMODULES 0x0008 /* ignore submodules */
+#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen);
struct lock_file {
--
1.5.6.4.570.g052e6
next reply other threads:[~2008-07-20 6:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-20 6:31 Junio C Hamano [this message]
2008-07-20 7:03 ` [PATCH] refresh-index: fix bitmask assignment Junio C Hamano
2008-07-20 7:28 ` Junio C Hamano
2008-07-20 7:48 ` [RFC] "needs update" considered harmful Junio C Hamano
2008-07-21 18:17 ` Jay Soffian
2008-07-20 7:48 ` [RFC variant 1 of 2] " Junio C Hamano
2008-07-20 7:48 ` [RFC variant 2 " Junio C Hamano
2008-07-20 11:29 ` Petr Baudis
2008-07-20 12:41 ` Johannes Schindelin
2008-07-20 19:29 ` Junio C Hamano
2008-07-21 17:27 ` Jay Soffian
2008-07-20 14:03 ` André Goddard Rosa
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=7vtzelf4mf.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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).