From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 03:37:21 +0000 (-0700)
Subject: Merge branch 'jc/replacing'
X-Git-Tag: v1.7.6-rc0~51
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61d7503da141f13bc916b36012760791761cc909;p=git.git

Merge branch 'jc/replacing'

* jc/replacing:
  read_sha1_file(): allow selective bypassing of replacement mechanism
  inline lookup_replace_object() calls
  read_sha1_file(): get rid of read_sha1_file_repl() madness
  t6050: make sure we test not just commit replacement
  Declare lookup_replace_object() in cache.h, not in commit.h

Conflicts:
	environment.c
---

61d7503da141f13bc916b36012760791761cc909
diff --cc environment.c
index 7fe9f1012,91828201d..94d58fd24
--- a/environment.c
+++ b/environment.c
@@@ -42,8 -42,8 +42,8 @@@ const char *editor_program
  const char *askpass_program;
  const char *excludes_file;
  enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
- int read_replace_refs = 1;
+ int read_replace_refs = 1; /* NEEDSWORK: rename to use_replace_refs */
 -enum eol eol = EOL_UNSET;
 +enum eol core_eol = EOL_UNSET;
  enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
  unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
  enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;