@matheusbsbs / matheus-bagliano / commits / e41bf352e3

remote.c: drop default_remote_name variable

When we read the remote config from disk, we update a default_remote_name variable if we see branch.*.remote config for the current branch. This isn't wrong, or even all that complicated, but it is a bit simpler (because it reduces our overall state) to just lazily compute the default when we need it. The ulterior motive here is that the push config uses a similar structure, and _is_ much more complicated as a result. That will be simplified in a future patch, and it's more readable if the logic for remotes and push-remotes matches. Note that we also used default_remote_name as a signal that the remote config has been loaded; after this patch, we now use an explicit flag. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 1, 2015 at 18:44 UTC e41bf352e3280e6990605a18ebbbd40c6f1c0d6d

1 file changed +11 -12

remote.c

+11 -12

@@ -49,10 +49,8 @@ static int branches_alloc;

49 static int branches_nr;

51 static struct branch *current_branch;

52 -static const char *default_remote_name;

52 static const char *branch_pushremote_name;

53 static const char *pushremote_name;

55 -static int explicit_default_remote_name;

55 static struct rewrites rewrites;

56 static struct rewrites rewrites_push;

@@ -367,12 +365,7 @@ static int handle_config(const char *key, const char *value, void *cb)

365 return 0;

366 branch = make_branch(name, subkey - name);

367 if (!strcmp(subkey, ".remote")) {

370 - if (git_config_string(&branch->remote_name, key, value))

371 - return -1;

372 - if (branch == current_branch) {

373 - default_remote_name = branch->remote_name;

374 - explicit_default_remote_name = 1;

375 - }

368 + return git_config_string(&branch->remote_name, key, value);

369 } else if (!strcmp(subkey, ".pushremote")) {

370 if (branch == current_branch)

371 if (git_config_string(&branch_pushremote_name, key, value))

@@ -501,12 +494,15 @@ static void alias_all_urls(void)

494

495 static void read_config(void)

496 {

497 + static int loaded;

498 unsigned char sha1[20];

499 const char *head_ref;

500 int flag;

507 - if (default_remote_name) /* did this already */

501 +

502 + if (loaded)

503 return;

509 - default_remote_name = "origin";

504 + loaded = 1;

505 +

506 current_branch = NULL;

507 head_ref = resolve_ref_unsafe("HEAD", 0, sha1, &flag);

508 if (head_ref && (flag & REF_ISSYMREF) &&

@@ -708,8 +704,11 @@ static struct remote *remote_get_1(const char *name, const char *pushremote_name

704 name = pushremote_name;

705 name_given = 1;

706 } else {

711 - name = default_remote_name;

712 - name_given = explicit_default_remote_name;

707 + if (current_branch && current_branch->remote_name) {

708 + name = current_branch->remote_name;

709 + name_given = 1;

710 + } else

711 + name = "origin";

712 }

713 }

714