Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #696 from ferhatelmas/simplify-again | Ori Rawlings | 2017-12-17 | 3 | -11/+4 | |
|\ \ \ | |_|/ |/| | | *: simplication | |||||
| * | | *: simplication | ferhat elmas | 2017-12-18 | 3 | -11/+4 | |
|/ / | | | | | | | | | | | - no unnecessary err/bool check, uses them directly Signed-off-by: ferhat elmas <elmas.ferhat@gmail.com> | |||||
* / | git: worktree, add Grep() method for git grep (#686) | Sunny | 2017-12-12 | 4 | -1/+324 | |
|/ | | | This change implemented grep on worktree with options to invert match and specify pathspec. Also, a commit hash or reference can be used to specify the worktree to search. | |||||
* | Merge pull request #687 from smithrobs/sshconfig | Máximo Cuadros | 2017-12-11 | 2 | -0/+110 | |
|\ | | | | | check .ssh/config for host and port overrides; fixes #629 | |||||
| * | plumbing: transport ssh, ssh_config implementation | Máximo Cuadros | 2017-12-11 | 2 | -12/+107 | |
| | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
| * | check .ssh/config for host and port overrides; fixes #629 | Robert Smith | 2017-12-09 | 1 | -0/+15 | |
| | | ||||||
* | | Merge pull request #680 from mcuadros/license-contributing | Máximo Cuadros | 2017-12-11 | 4 | -19/+336 | |
|\ \ | | | | | | | License upgrade, plus code of conduct and contributing guidelines | |||||
| * | | code of conduct from https://www.contributor-covenant.org/ | Máximo Cuadros | 2017-12-07 | 1 | -0/+74 | |
| | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
| * | | contributing guidelines | Máximo Cuadros | 2017-12-07 | 1 | -0/+58 | |
| | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
| * | | *: licence change to Apache 2.0 | Máximo Cuadros | 2017-12-07 | 1 | -19/+201 | |
| | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
| * | | MAINTAINERS: add @mcuadros, @strib and @orirawlings | Máximo Cuadros | 2017-12-07 | 1 | -0/+3 | |
| | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
* | | | Merge pull request #688 from darkowlzz/compat-clean | Máximo Cuadros | 2017-12-11 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | doc: update compatibility for clean | |||||
| * | | doc: update compatibility for clean | Sunny | 2017-12-10 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | Fixed in #675 Signed-off-by: Sunny <me@darkowlzz.space> | |||||
* | | Merge pull request #677 from krylovsk/bugffix/stats-on-empty-patch | Máximo Cuadros | 2017-12-07 | 4 | -5/+51 | |
|\ \ | | | | | | | object: patch, fix stats for submodules (fixes #654) | |||||
| * | | format: diff, remove error when two files are empty, submodules are simply ↵ | Máximo Cuadros | 2017-12-07 | 2 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | ignored Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
| * | | object: patch, test patch on submodules | Máximo Cuadros | 2017-12-07 | 1 | -0/+44 | |
| | | | ||||||
| * | | Ignore empty patches when calculating stats (fixes #654) | Alexandr Krylovskiy | 2017-12-04 | 1 | -0/+5 | |
| | | | ||||||
* | | | storage: filesystem, add support for git alternates (#663) | Sunny | 2017-12-06 | 4 | -1/+148 | |
| |/ |/| | | | | | This change adds a new method Alternates() in DotGit to check and query alternate source. | |||||
* | | Merge pull request #675 from darkowlzz/git-clean | Máximo Cuadros | 2017-12-04 | 3 | -0/+67 | |
|\ \ | |/ |/| | git: worktree, add Clean() method for git clean | |||||
| * | test: git, Worktree.Clean() | Sunny | 2017-12-04 | 1 | -0/+35 | |
| | | ||||||
| * | git: worktree, add Clean() method for git clean | Sunny | 2017-12-04 | 2 | -0/+32 | |
| | | | | | | | | | | | | | | This change implement git clean with a `Dir` option. By default, clean removes only the untracked files in the working directory. If `Dir` option is set to true, untracked files under other directories are also cleaned. | |||||
* | | Merge pull request #674 from ferhatelmas/time-equal | Máximo Cuadros | 2017-12-04 | 1 | -1/+1 | |
|\ \ | |/ |/| | dotgit: use Equal method of time.Time for equality | |||||
| * | dotgit: use Equal method of time.Time for equality | ferhat elmas | 2017-12-04 | 1 | -1/+1 | |
|/ | ||||||
* | Fix revision solver for branch and tag (#660) | Anthony HAMON | 2017-12-01 | 7 | -54/+82 | |
| | | | fix Repository.ResolveRevision for branch and tag | |||||
* | Merge pull request #672 from ferhatelmas/gofmt-s | Máximo Cuadros | 2017-12-01 | 12 | -22/+22 | |
|\ | | | | | all: gofmt -s | |||||
| * | all: gofmt -s | ferhat elmas | 2017-11-30 | 12 | -22/+22 | |
| | | ||||||
* | | Merge pull request #669 from keybase/strib/gh-gc | Máximo Cuadros | 2017-12-01 | 15 | -74/+928 | |
|\ \ | |/ |/| | storage/repository: add new functions for garbage collection | |||||
| * | dotgit: rewrite packed-refs while holding lock | Jeremy Stribling | 2017-11-30 | 3 | -60/+103 | |
| | | | | | | | | | | | | Windows file system doesn't let us rename over a file while holding that file's lock, so use rewrite as a last resort. It could result in a partially-written file, if there's a failure at the wrong time. | |||||
| * | dotgit: open+lock packed-refs file until it doesn't change | Jeremy Stribling | 2017-11-29 | 1 | -18/+46 | |
| | | | | | | | | Windows doesn't like it when we re-open a file we already have locked. | |||||
| * | repository: oops, fix the prune test | Jeremy Stribling | 2017-11-29 | 1 | -2/+3 | |
| | | ||||||
| * | repository: add tests for pruning and object re-packing | Jeremy Stribling | 2017-11-29 | 3 | -0/+150 | |
| | | | | | | | | | | Also, object re-packing should clean up any loose objects that were packed. | |||||
| * | storer: separate loose and packed object mgmt into optional ifaces | Jeremy Stribling | 2017-11-29 | 4 | -49/+58 | |
| | | | | | | | | Suggested by mcuadros. | |||||
| * | storage: some minor code cleanup | Jeremy Stribling | 2017-11-29 | 3 | -13/+5 | |
| | | | | | | | | | | | | Suggested by mcuadros. Issue: #669 | |||||
| * | plumbing: add `HasEncodedObject` method to Storer | Jeremy Stribling | 2017-11-29 | 3 | -0/+43 | |
| | | | | | | | | | | | | | | This allows the user to check whether an object exists, without reading all the object data from storage. Issue: KBFS-2445 | |||||
| * | Use object walker in repacking code | Taru Karttunen | 2017-11-29 | 1 | -12/+9 | |
| | | ||||||
| * | Make prune object walker generic | Taru Karttunen | 2017-11-29 | 2 | -91/+107 | |
| | | ||||||
| * | Use Storer.Config pack window when repacking objects | Taru Karttunen | 2017-11-29 | 1 | -3/+5 | |
| | | ||||||
| * | Make object repacking more configurable | Taru Karttunen | 2017-11-29 | 6 | -15/+44 | |
| | | ||||||
| * | Support for repacking objects | Taru Karttunen | 2017-11-29 | 6 | -13/+107 | |
| | | ||||||
| * | Address CI and move code around | Taru Karttunen | 2017-11-29 | 3 | -126/+149 | |
| | | ||||||
| * | First pass of prune design | Taru Karttunen | 2017-11-29 | 6 | -10/+236 | |
| | | ||||||
| * | dotgit: use bufio for PackRefs | Jeremy Stribling | 2017-11-29 | 1 | -10/+8 | |
| | | | | | | | | | | | | Suggested by taruti. Issue: #13 | |||||
| * | dotgit: during rewriting, re-open packed-refs after locking | Jeremy Stribling | 2017-11-29 | 1 | -9/+21 | |
| | | | | | | | | | | | | The file could have been completely replaced while waiting for the lock, so we need to re-open, otherwise we might be reading a stale file that has already been deleted/overwritten. | |||||
| * | filesystem: todo comment about "all" param | Jeremy Stribling | 2017-11-29 | 1 | -0/+4 | |
| | | | | | | | | Issue: KBFS-2517 | |||||
| * | dotgit: fix up PackRefs comment for upstreaming | Jeremy Stribling | 2017-11-29 | 1 | -26/+8 | |
| | | ||||||
| * | filesystem: implement PackRefs() | Jeremy Stribling | 2017-11-29 | 5 | -0/+205 | |
| | | | | | | | | | | | | | | | | | | | | Currently this implementation is only valid for kbfsgit, since it assumes some things about the filesystem not being updated during the packing, and about conflict resolution rules. In the future, it would be nice to replace this with a more general one, and move this kbfsgit-optimized implementation into kbfsgit. Issue: KBFS-2517 | |||||
* | | Merge pull request #668 from src-d/eiso-patch-1 | Máximo Cuadros | 2017-11-29 | 1 | -7/+6 | |
|\ \ | |/ |/| | Updating the outdated README example to the new one | |||||
| * | Updating the outdated example to the new one | Eiso Kant | 2017-11-29 | 1 | -7/+6 | |
| | | ||||||
* | | Merge pull request #667 from ferhatelmas/simplify | Máximo Cuadros | 2017-11-29 | 27 | -118/+56 | |
|\ \ | | | | | | | all: simplification | |||||
| * | | all: simplification | ferhat elmas | 2017-11-29 | 27 | -118/+56 | |
|/ / | | | | | | | | | | | | | | | | | | | - no length for map initialization - don't check for boolean/error return - don't format string - use string method of bytes buffer instead of converting bytes to string - use `strings.Contains` instead of `strings.Index` - use `bytes.Equal` instead of `bytes.Compare` |