summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-22 01:47:53 (GMT)
commitf00ecbe42b82f3c8e6a170074f2299487026e400 (patch)
treefca98c6ac1d4cde3d5e60d296b2fcae8caf7fc6b /upload-pack.c
parent5e092b5bcea48c098af7000f888a2a0f16c9db77 (diff)
parent4e65b538acc97dd853e19a1692893f5fd47043e6 (diff)
downloadgit-f00ecbe42b82f3c8e6a170074f2299487026e400.zip
git-f00ecbe42b82f3c8e6a170074f2299487026e400.tar.gz
git-f00ecbe42b82f3c8e6a170074f2299487026e400.tar.bz2
Merge branch 'cc/replace'
* cc/replace: t6050: check pushing something based on a replaced commit Documentation: add documentation for "git replace" Add git-replace to .gitignore builtin-replace: use "usage_msg_opt" to give better error messages parse-options: add new function "usage_msg_opt" builtin-replace: teach "git replace" to actually replace Add new "git replace" command environment: add global variable to disable replacement mktag: call "check_sha1_signature" with the replacement sha1 replace_object: add a test case object: call "check_sha1_signature" with the replacement sha1 sha1_file: add a "read_sha1_file_repl" function replace_object: add mechanism to replace objects found in "refs/replace/" refs: add a "for_each_replace_ref" function
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/upload-pack.c b/upload-pack.c
index f7d308a..4d8be83 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -651,6 +651,7 @@ int main(int argc, char **argv)
int strict = 0;
git_extract_argv0_path(argv[0]);
+ read_replace_refs = 0;
for (i = 1; i < argc; i++) {
char *arg = argv[i];