global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-04 06:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kj/path-micro-code-cleanup' into jch

Browse Source 
* kj/path-micro-code-cleanup:
  path: remove redundant function calls
  path: use the right datatype
  path: remove unused header
This commit is contained in:
Junio C Hamano
2026-03-03 11:08:35 -08:00
parent 2a554ddd35 c815ab0acd
commit 463fa77653
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
path.c
View File

@@ -4,7 +4,6 @@
#include "git-compat-util.h"
#include "abspath.h"
#include "environment.h"
#include "gettext.h"
#include "repository.h"
#include "strbuf.h"
@@ -59,7 +58,7 @@ static void strbuf_cleanup_path(struct strbuf *sb)
static int dir_prefix(const char *buf, const char *dir)
{
int len = strlen(dir);
size_t len = strlen(dir);
return !strncmp(buf, dir, len) &&
(is_dir_sep(buf[len]) || buf[len] == '\0');
}
@@ -741,18 +740,18 @@ int calc_shared_perm(struct repository *repo,
int mode)
{
int tweak;
if (repo_settings_get_shared_repository(repo) < 0)
tweak = -repo_settings_get_shared_repository(repo);
int shared_repo = repo_settings_get_shared_repository(repo);
if (shared_repo < 0)
tweak = -shared_repo;
else
tweak = repo_settings_get_shared_repository(repo);
tweak = shared_repo;
if (!(mode & S_IWUSR))
tweak &= ~0222;
if (mode & S_IXUSR)
/* Copy read bits to execute bits */
tweak |= (tweak & 0444) >> 2;
if (repo_settings_get_shared_repository(repo) < 0)
if (shared_repo < 0)
mode = (mode & ~0777) | tweak;
else
mode |= tweak;