summaryrefslogtreecommitdiff
path: root/local-fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-23 15:07:47 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-23 15:07:47 -0700
commitdcaad49c928f047d5ffa1c5a1753aff6e87f16b5 (patch)
treea688a7fcc3922b37fb72a5d52c00928ac5667bdb /local-fetch.c
parent33b292610dea9f94c986eb88f12e503f5b8375dd (diff)
parent6858d494926437ad7b7e9199ea39953eb90c7bab (diff)
downloadgit-dcaad49c928f047d5ffa1c5a1753aff6e87f16b5.tar.gz
Merge branch 'sp/reflog' into next
* sp/reflog: Enable ref log creation in git checkout -b. Create/delete branch ref logs. Include ref log detail in commit, reset, etc. Change order of -m option to update-ref. Correct force_write bug in refs.c Change 'master@noon' syntax to 'master@{noon}'. Log ref updates made by fetch. Force writing ref if it doesn't exist. Added logs/ directory to repository layout. General ref log reading improvements. Fix ref log parsing so it works properly. Support 'master@2 hours ago' syntax Log ref updates to logs/refs/<ref> Convert update-ref to use ref_lock API. Improve abstraction of ref lock/write.
Diffstat (limited to 'local-fetch.c')
-rw-r--r--local-fetch.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/local-fetch.c b/local-fetch.c
index fa9e697fd3..ffa4887570 100644
--- a/local-fetch.c
+++ b/local-fetch.c
@@ -208,6 +208,7 @@ int main(int argc, char **argv)
int arg = 1;
setup_git_directory();
+ git_config(git_default_config);
while (arg < argc && argv[arg][0] == '-') {
if (argv[arg][1] == 't')
@@ -239,6 +240,7 @@ int main(int argc, char **argv)
usage(local_pull_usage);
commit_id = argv[arg];
path = argv[arg + 1];
+ write_ref_log_details = path;
if (pull(commit_id))
return 1;