summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7d68c8)
raw | patch | inline | side by side (parent: c7d68c8)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 1 Mar 2007 01:01:00 +0000 (17:01 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 1 Mar 2007 01:01:00 +0000 (17:01 -0800) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-fetch--tool.c | patch | blob | history | |
git-fetch.sh | patch | blob | history |
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index eeee0a5ebf61af8844471130f666c5ae3bb6b249..5261bf57fdb76174a1c8d85873f2c080d0330c51 100644 (file)
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
fclose(fp);
return result;
}
- if (!strcmp("update-local-ref", argv[1])) {
- if (argc != 5)
- return error("update-local-ref takes 3 args");
- return update_local_ref(argv[2], argv[3], argv[4],
- verbose, force);
- }
if (!strcmp("native-store", argv[1])) {
int result;
FILE *fp;
diff --git a/git-fetch.sh b/git-fetch.sh
index f438ac1ef2351e902980e5a896d84b693589d430..4a8d8d6ef73921ebd99ef68ffa097cd325453763 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
git-fetch--tool $flags append-fetch-head "$@"
}
-update_local_ref () {
- flags=
- test -n "$verbose" && flags="$flags -v"
- test -n "$force" && flags="$flags -f"
- GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
- git-fetch--tool $flags update-local-ref "$@"
-}
-
# updating the current HEAD with git-fetch in a bare
# repository is always fine.
if test -z "$update_head_ok" && test $(is_bare_repository) = false