diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:47:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:47:53 -0700 |
| commit | f00ecbe42b82f3c8e6a170074f2299487026e400 (patch) | |
| tree | fca98c6ac1d4cde3d5e60d296b2fcae8caf7fc6b /builtin-unpack-objects.c | |
| parent | Merge branch 'gb/apply-ignore-whitespace' (diff) | |
| parent | t6050: check pushing something based on a replaced commit (diff) | |
| download | tgif-f00ecbe42b82f3c8e6a170074f2299487026e400.tar.xz | |
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 'builtin-unpack-objects.c')
| -rw-r--r-- | builtin-unpack-objects.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c index 557148a693..968fda7219 100644 --- a/builtin-unpack-objects.c +++ b/builtin-unpack-objects.c @@ -495,6 +495,8 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix) int i; unsigned char sha1[20]; + read_replace_refs = 0; + git_config(git_default_config, NULL); quiet = !isatty(2); |