THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

daemon: cleanup: replace loop with if

Replace a loop around an enter_repo() call, which was used to retry
a single time with a different parameter in case the first call fails,
with two calls and an if.  This is shorter and cleaner.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
tags/v1.6.1.1
René Scharfe Junio C Hamano 11 years ago
parent
commit
a583971f15
1 changed files with 5 additions and 13 deletions
  1. +5
    -13
      daemon.c

+ 5
- 13
daemon.c View File

@@ -150,7 +150,6 @@ static char *path_ok(char *directory)
{
static char rpath[PATH_MAX];
static char interp_path[PATH_MAX];
int retried_path = 0;
char *path;
char *dir;

@@ -219,22 +218,15 @@ static char *path_ok(char *directory)
dir = rpath;
}

do {
path = enter_repo(dir, strict_paths);
if (path)
break;

path = enter_repo(dir, strict_paths);
if (!path && base_path && base_path_relaxed) {
/*
* if we fail and base_path_relaxed is enabled, try without
* prefixing the base path
*/
if (base_path && base_path_relaxed && !retried_path) {
dir = directory;
retried_path = 1;
continue;
}
break;
} while (1);
dir = directory;
path = enter_repo(dir, strict_paths);
}

if (!path) {
logerror("'%s': unable to chdir or not a git archive", dir);


Loading…
Cancel
Save