mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-19 20:44:22 -04:00
Ensure executable bit is kept on the web editor (#10607)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
This commit is contained in:
parent
3d5d21133c
commit
4e65d2b8ea
@ -230,6 +230,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
|
|||||||
|
|
||||||
encoding := "UTF-8"
|
encoding := "UTF-8"
|
||||||
bom := false
|
bom := false
|
||||||
|
executable := false
|
||||||
|
|
||||||
if !opts.IsNewFile {
|
if !opts.IsNewFile {
|
||||||
fromEntry, err := commit.GetTreeEntryByPath(fromTreePath)
|
fromEntry, err := commit.GetTreeEntryByPath(fromTreePath)
|
||||||
@ -265,6 +266,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
|
|||||||
return nil, models.ErrSHAOrCommitIDNotProvided{}
|
return nil, models.ErrSHAOrCommitIDNotProvided{}
|
||||||
}
|
}
|
||||||
encoding, bom = detectEncodingAndBOM(fromEntry, repo)
|
encoding, bom = detectEncodingAndBOM(fromEntry, repo)
|
||||||
|
executable = fromEntry.IsExecutable()
|
||||||
}
|
}
|
||||||
|
|
||||||
// For the path where this file will be created/updated, we need to make
|
// For the path where this file will be created/updated, we need to make
|
||||||
@ -388,8 +390,14 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add the object to the index
|
// Add the object to the index
|
||||||
if err := t.AddObjectToIndex("100644", objectHash, treePath); err != nil {
|
if executable {
|
||||||
return nil, err
|
if err := t.AddObjectToIndex("100755", objectHash, treePath); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if err := t.AddObjectToIndex("100644", objectHash, treePath); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now write the tree
|
// Now write the tree
|
||||||
|
Loading…
Reference in New Issue
Block a user