WindyMadman/seafile
1
0
Fork 0
mirror of https://github.com/haiwen/seafile.git synced 2025-01-09 04:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't generate case conflict files.

Browse Source
This commit is contained in:
Jiaqiang Xu 2016-12-01 17:41:08 +08:00 committed by Jiaqiang Xu
parent b0eebff656
commit 76220e5a4d
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
daemon/repo-mgr.c
View File

@ -4521,14 +4521,7 @@ checkout_file (const char *repo_id,
gboolean force_conflict = FALSE;
gboolean update_mode_only = FALSE;
#ifndef __linux__
path = build_case_conflict_free_path (worktree, name,
conflict_hash, no_conflict_hash,
&case_conflict,
FALSE);
#else
path = build_checkout_path (worktree, name, strlen(name));
#endif
if (!path)
return FETCH_CHECKOUT_FAILED;
@ -4697,14 +4690,7 @@ checkout_empty_dir (const char *worktree,
char *path;
gboolean case_conflict = FALSE;
#ifndef __linux__
path = build_case_conflict_free_path (worktree, name,
conflict_hash, no_conflict_hash,
&case_conflict,
FALSE);
#else
path = build_checkout_path (worktree, name, strlen(name));
#endif
if (!path)
return FETCH_CHECKOUT_FAILED;
@ -5118,16 +5104,7 @@ schedule_file_fetch (GThreadPool *tpool,
}
if (!skip_fetch) {
#ifndef __linux__
gboolean case_conflict = FALSE;
path = build_case_conflict_free_path (worktree, de->name,
conflict_hash, no_conflict_hash,
&case_conflict,
FALSE);
#else
path = build_checkout_path (worktree, de->name, strlen(de->name));
#endif
if (!path) {
if (new_ce)
cache_entry_free (ce);
@ -5265,14 +5242,7 @@ checkout_file_http (FileTxData *data,
* A.txt to checkout, we can only detect case conflict after one file is checkecd
* out. So we need to generate a new one here.
*/
#ifndef __linux__
path = build_case_conflict_free_path (worktree, de->name,
conflict_hash, no_conflict_hash,
&case_conflict,
FALSE);
#else
path = build_checkout_path (worktree, de->name, strlen(de->name));
#endif
if (!path) {
return FETCH_CHECKOUT_FAILED;
@ -5649,16 +5619,7 @@ do_rename_in_worktree (DiffEntry *de, const char *worktree,
old_path = g_build_filename (worktree, de->name, NULL);
if (seaf_util_exists (old_path)) {
#ifndef __linux__
gboolean case_conflict;
new_path = build_case_conflict_free_path (worktree, de->new_name,
conflict_hash, no_conflict_hash,
&case_conflict,
TRUE);
#else
new_path = build_checkout_path (worktree, de->new_name, strlen(de->new_name));
#endif
if (!new_path) {
ret = -1;
goto out;

4
daemon/vc-utils.c
View File

@ -680,8 +680,6 @@ error:
#endif /* defined WIN32 || defined __APPLE__ */
#ifdef __linux__
char *
build_checkout_path (const char *worktree, const char *ce_name, int len)
{
@ -723,8 +721,6 @@ build_checkout_path (const char *worktree, const char *ce_name, int len)
return g_strdup(path);
}
#endif /* __linux__ */
static int
checkout_entry (struct cache_entry *ce,
struct unpack_trees_options *o,