Skip to content
This repository was archived by the owner on Sep 3, 2020. It is now read-only.
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rakyll/drive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1f271fc4a89eb0dbaaebf10d141f85715b1818b7
Choose a base ref
..
head repository: rakyll/drive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 60e35836f35de44ad3830457eba74246318f1f8e
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +1 −1 changes.go
  2. +1 −1 pull.go
  3. +1 −1 push.go
2 changes: 1 addition & 1 deletion changes.go
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ func (d *dirList) Name() string {

// Resolves the local path relative to the root directory
// then performs either Push or Pull depending on 'isPush'
func (g *Commands) relativePathResolve(isPush bool) (err error) {
func (g *Commands) syncByRelativePath(isPush bool) (err error) {
root := g.context.AbsPathOf("")
absPath := g.context.AbsPathOf(g.opts.Path)
relPath := ""
2 changes: 1 addition & 1 deletion pull.go
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ const (
// directory, it recursively pulls from the remote if there are remote changes.
// It doesn't check if there are remote changes if isForce is set.
func (g *Commands) Pull() (err error) {
return g.relativePathResolve(false)
return g.syncByRelativePath(false)
}

func (g *Commands) playPullChangeList(cl []*Change) (err error) {
2 changes: 1 addition & 1 deletion push.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ import (
// directory, it recursively pushes to the remote if there are local changes.
// It doesn't check if there are local changes if isForce is set.
func (g *Commands) Push() (err error) {
return g.relativePathResolve(true)
return g.syncByRelativePath(true)
}

func (g *Commands) playPushChangeList(cl []*Change) (err error) {