summaryrefslogtreecommitdiff
path: root/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-24 23:49:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-24 23:49:24 (GMT)
commita5c8a98ca7e978c334e956df7ae2165c75c494da (patch)
treedf77e4b7b652a72f6bb862e81a55f95692eda55a /fetch.c
parent6858d494926437ad7b7e9199ea39953eb90c7bab (diff)
parent84c667ff97da2a3864ef7952b9f438d133ce35ef (diff)
downloadgit-a5c8a98ca7e978c334e956df7ae2165c75c494da.zip
git-a5c8a98ca7e978c334e956df7ae2165c75c494da.tar.gz
git-a5c8a98ca7e978c334e956df7ae2165c75c494da.tar.bz2
Merge branch 'master' into sp/reflog
* master: (90 commits) fetch.c: remove an unused variable and dead code. Clean up sha1 file writing Builtin git-cat-file builtin format-patch: squelch content-type for 7-bit ASCII CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields. add more informative error messages to git-mktag remove the artificial restriction tagsize < 8kb git-rebase: use canonical A..B syntax to format-patch git-format-patch: now built-in. fmt-patch: Support --attach fmt-patch: understand old <his> notation Teach fmt-patch about --keep-subject Teach fmt-patch about --numbered fmt-patch: implement -o <dir> fmt-patch: output file names to stdout Teach fmt-patch to write individual files. built-in tar-tree and remote tar-tree Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree. Builtin git-show-branch. Builtin git-apply. ...
Diffstat (limited to 'fetch.c')
-rw-r--r--fetch.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fetch.c b/fetch.c
index fd57684..ae92d52 100644
--- a/fetch.c
+++ b/fetch.c
@@ -10,8 +10,6 @@
const char *write_ref = NULL;
const char *write_ref_log_details = NULL;
-const unsigned char *current_ref = NULL;
-
int get_tree = 0;
int get_history = 0;
int get_all = 0;
@@ -213,16 +211,15 @@ int pull(char *target)
save_commit_buffer = 0;
track_object_refs = 0;
if (write_ref) {
- lock = lock_ref_sha1(write_ref, current_ref, 1);
+ lock = lock_ref_sha1(write_ref, NULL, 0);
if (!lock) {
error("Can't lock ref %s", write_ref);
return -1;
}
}
- if (!get_recover) {
+ if (!get_recover)
for_each_ref(mark_complete);
- }
if (interpret_target(target, sha1)) {
error("Could not interpret %s as something to pull", target);