Re: [PATCH] git-svn now work with crlf convertion enabled.
- From
Dmitry Potapov <dpotapov@gmail.com>
- Date
- Aug 1, 2008, 23:10 UTC
- Message-ID
- <20080801231024.GL7008@dpotapov.dyndns.org>
- In-Reply-To
- <7vr698qt6w.fsf@gitster.siamese.dyndns.org>
On Fri, Aug 01, 2008 at 03:14:15PM -0700, Junio C Hamano wrote:
Show 5 quoted lines
> > Even though the patch was not compile tested, I did check the existing > call sites are giving only 0 or 1, but I think converting these "please > write -- I give you 1" callers to pass the bitmask would be a sane thing > to do.
Here it goes. It turned out that there are only two places that actually needs correction, while two others use '0'. I have run 'make test' and it's passed the tests.
-- 8< -- From: Dmitry Potapov <dpotapov@gmail.com> Date: Sat, 2 Aug 2008 02:56:45 +0400 Subject: [PATCH] convert index_path callers to use bitmask instead of 1
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> --- builtin-update-index.c | 5 +++-- read-cache.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin-update-index.c b/builtin-update-index.c index 38eb53c..d3e212c 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -85,7 +85,7 @@ static int process_lstat_error(const char *path, int err) static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st) { - int option, size; + int option, flags, size; struct cache_entry *ce; /* Was the old index entry already up-to-date? */ @@ -99,7 +99,8 @@ static int add_one_path(struct cache_entry *old, const char *path, int len, stru fill_stat_cache_info(ce, st); ce->ce_mode = ce_mode_from_stat(old, st->st_mode); - if (index_path(ce->sha1, path, st, !info_only)) + flags = info_only ? 0 : HASH_OBJECT_DO_CREATE; + if (index_path(ce->sha1, path, st, flags)) return -1; option = allow_add ? ADD_CACHE_OK_TO_ADD : 0; option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0; diff --git a/read-cache.c b/read-cache.c index 2c03ec3..afd6005 100644 --- a/read-cache.c +++ b/read-cache.c @@ -550,7 +550,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, alias->ce_flags |= CE_ADDED; return 0; } - if (index_path(ce->sha1, path, st, 1)) + if (index_path(ce->sha1, path, st, HASH_OBJECT_DO_CREATE)) return error("unable to index file %s", path); if (ignore_case && alias && different_name(ce, alias)) ce = create_alias_ce(ce, alias);
-- 1.6.0.rc1.34.gad373