mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-12-08 17:38:08 +00:00
Code Issues Releases Wiki Activity

Rename WikiDir to WikiGitDir

Browse Source 
Rhymes well with the forecoming Structure.
This commit is contained in:
Timur Ismagilov
2021-06-15 01:30:17 +05:00
parent b4e0ff2e34
commit 839b1e2448
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
history/history.go
View File

@@ -162,7 +162,7 @@ func (rev *Revision) bestLink() string {
func gitsh(args ...string) (out bytes.Buffer, err error) {
fmt.Printf("$ %v\n", args)
cmd := exec.Command(gitpath, args...)
cmd.Dir = cfg.WikiDir
cmd.Dir = cfg.WikiGitDir
cmd.Env = gitEnv
b, err := cmd.CombinedOutput()
@@ -175,7 +175,7 @@ func gitsh(args ...string) (out bytes.Buffer, err error) {
// silentGitsh is like gitsh, except it writes less to the stdout.
func silentGitsh(args ...string) (out bytes.Buffer, err error) {
cmd := exec.Command(gitpath, args...)
cmd.Dir = cfg.WikiDir
cmd.Dir = cfg.WikiGitDir
cmd.Env = gitEnv
b, err := cmd.CombinedOutput()

2
history/information.go
View File

@@ -176,7 +176,7 @@ func parseRevisionLine(line string) Revision {
// FileAtRevision shows how the file with the given file path looked at the commit with the hash. It may return an error if git fails.
func FileAtRevision(filepath, hash string) (string, error) {
out, err := gitsh("show", hash+":"+strings.TrimPrefix(filepath, cfg.WikiDir+"/"))
out, err := gitsh("show", hash+":"+strings.TrimPrefix(filepath, cfg.WikiGitDir+"/"))
if err != nil {
return "", err
}