git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH 4/4] sha1_file: don't mix enum with int
Date: Tue, 15 Nov 2011 22:29:39 +0530	[thread overview]
Message-ID: <1321376379-31750-5-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1321376379-31750-1-git-send-email-artagnon@gmail.com>

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 sha1_file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index 27f3b9b..869852b 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2616,7 +2616,7 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size,
 	if ((type == OBJ_BLOB) && path) {
 		struct strbuf nbuf = STRBUF_INIT;
 		if (convert_to_git(path, buf, size, &nbuf,
-		                   write_object ? safe_crlf : 0)) {
+		                   write_object ? safe_crlf : SAFE_CRLF_FALSE)) {
 			buf = strbuf_detach(&nbuf, &size);
 			re_allocated = 1;
 		}
-- 
1.7.6.351.gb35ac.dirty

  parent reply	other threads:[~2011-11-15 17:01 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-15 16:59 [PATCH 0/4] Fix minor warnings reported by icc Ramkumar Ramachandra
2011-11-15 16:59 ` [PATCH 1/4] http: remove unused function hex() Ramkumar Ramachandra
2011-11-15 16:59 ` [PATCH 2/4] convert: don't mix enum with int Ramkumar Ramachandra
2011-11-15 16:59 ` [PATCH 3/4] ll-merge: initialize default_opts const Ramkumar Ramachandra
2011-11-15 23:17   ` Junio C Hamano
2011-11-16  6:06     ` Ramkumar Ramachandra
2011-11-16  7:49       ` Junio C Hamano
2011-11-15 16:59 ` Ramkumar Ramachandra [this message]
2011-11-15 17:31 ` [PATCH 5/4] git-compat-util: don't assume value for undefined variable Ramkumar Ramachandra

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1321376379-31750-5-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=trast@student.ethz.ch \
    /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.
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 NNTP newsgroup(s).