Skip to content

Commit 14b30a3

Browse files
Merge pull request #238: Drop --no-update-remote-refs
This is a straight revert of 61def50, since feedback from upstream demonstrated that the `--refmap=""` option does exactly what we want.
2 parents 6758ed3 + 5f63115 commit 14b30a3

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

Documentation/fetch-options.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,6 @@ endif::git-pull[]
254254
'git-pull' the --ff-only option will still check for forced updates
255255
before attempting a fast-forward update. See linkgit:git-config[1].
256256

257-
--no-update-remote-refs::
258-
By default, git updates the `refs/remotes/` refspace with the refs
259-
advertised by the remotes during a `git fetch` command. With this
260-
option, those refs will be ignored.
261-
262257
-4::
263258
--ipv4::
264259
Use IPv4 addresses only, ignoring IPv6 addresses.

builtin/fetch.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ static struct list_objects_filter_options filter_options;
8080
static struct string_list server_options = STRING_LIST_INIT_DUP;
8181
static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
8282
static int fetch_write_commit_graph = -1;
83-
static int update_remote_refs = 1;
8483

8584
static int git_fetch_config(const char *k, const char *v, void *cb)
8685
{
@@ -204,8 +203,6 @@ static struct option builtin_fetch_options[] = {
204203
N_("check for forced-updates on all updated branches")),
205204
OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph,
206205
N_("write the commit-graph after fetching")),
207-
OPT_BOOL(0, "update-remote-refs", &update_remote_refs,
208-
N_("update the refs/remotes/ refspace")),
209206
OPT_END()
210207
};
211208

@@ -751,9 +748,6 @@ static int update_local_ref(struct ref *ref,
751748
const char *pretty_ref = prettify_refname(ref->name);
752749
int fast_forward = 0;
753750

754-
if (!update_remote_refs && starts_with(ref->name, "refs/remotes/"))
755-
return 0;
756-
757751
type = oid_object_info(the_repository, &ref->new_oid, NULL);
758752
if (type < 0)
759753
die(_("object %s not found"), oid_to_hex(&ref->new_oid));

0 commit comments

Comments
 (0)