aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #695 from darkowlzz/grep-multiple-patterns-pathspecMáximo Cuadros2017-12-203-35/+124
|\ | | | | git: Worktree.Grep() support multiple patterns and pathspecs
| * git: Worktree.Grep() support multiple patterns and pathspecsSunny2017-12-203-35/+124
| | | | | | | | Signed-off-by: Sunny <me@darkowlzz.space>
* | Merge pull request #690 from mcuadros/readmeMáximo Cuadros2017-12-191-18/+14
|\ \ | | | | | | README.md update
| * | README.md updateMáximo Cuadros2017-12-181-18/+14
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | Merge pull request #696 from ferhatelmas/simplify-againOri Rawlings2017-12-173-11/+4
|\ \ \ | |_|/ |/| | *: simplication
| * | *: simplicationferhat elmas2017-12-183-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)Sunny2017-12-124-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/sshconfigMáximo Cuadros2017-12-112-0/+110
|\ | | | | check .ssh/config for host and port overrides; fixes #629
| * plumbing: transport ssh, ssh_config implementationMáximo Cuadros2017-12-112-12/+107
| | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * check .ssh/config for host and port overrides; fixes #629Robert Smith2017-12-091-0/+15
| |
* | Merge pull request #680 from mcuadros/license-contributingMáximo Cuadros2017-12-114-19/+336
|\ \ | | | | | | License upgrade, plus code of conduct and contributing guidelines
| * | code of conduct from https://www.contributor-covenant.org/Máximo Cuadros2017-12-071-0/+74
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | contributing guidelinesMáximo Cuadros2017-12-071-0/+58
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | *: licence change to Apache 2.0Máximo Cuadros2017-12-071-19/+201
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | MAINTAINERS: add @mcuadros, @strib and @orirawlingsMáximo Cuadros2017-12-071-0/+3
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | Merge pull request #688 from darkowlzz/compat-cleanMáximo Cuadros2017-12-111-1/+1
|\ \ \ | |_|/ |/| | doc: update compatibility for clean
| * | doc: update compatibility for cleanSunny2017-12-101-1/+1
|/ / | | | | | | | | | | Fixed in #675 Signed-off-by: Sunny <me@darkowlzz.space>
* | Merge pull request #677 from krylovsk/bugffix/stats-on-empty-patchMáximo Cuadros2017-12-074-5/+51
|\ \ | | | | | | object: patch, fix stats for submodules (fixes #654)
| * | format: diff, remove error when two files are empty, submodules are simply ↵Máximo Cuadros2017-12-072-5/+2
| | | | | | | | | | | | | | | | | | ignored Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | object: patch, test patch on submodulesMáximo Cuadros2017-12-071-0/+44
| | |
| * | Ignore empty patches when calculating stats (fixes #654)Alexandr Krylovskiy2017-12-041-0/+5
| | |
* | | storage: filesystem, add support for git alternates (#663)Sunny2017-12-064-1/+148
| |/ |/| | | | | This change adds a new method Alternates() in DotGit to check and query alternate source.
* | Merge pull request #675 from darkowlzz/git-cleanMáximo Cuadros2017-12-043-0/+67
|\ \ | |/ |/| git: worktree, add Clean() method for git clean
| * test: git, Worktree.Clean()Sunny2017-12-041-0/+35
| |
| * git: worktree, add Clean() method for git cleanSunny2017-12-042-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-equalMáximo Cuadros2017-12-041-1/+1
|\ \ | |/ |/| dotgit: use Equal method of time.Time for equality
| * dotgit: use Equal method of time.Time for equalityferhat elmas2017-12-041-1/+1
|/
* Fix revision solver for branch and tag (#660)Anthony HAMON2017-12-017-54/+82
| | | fix Repository.ResolveRevision for branch and tag
* Merge pull request #672 from ferhatelmas/gofmt-sMáximo Cuadros2017-12-0112-22/+22
|\ | | | | all: gofmt -s
| * all: gofmt -sferhat elmas2017-11-3012-22/+22
| |
* | Merge pull request #669 from keybase/strib/gh-gcMáximo Cuadros2017-12-0115-74/+928
|\ \ | |/ |/| storage/repository: add new functions for garbage collection
| * dotgit: rewrite packed-refs while holding lockJeremy Stribling2017-11-303-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 changeJeremy Stribling2017-11-291-18/+46
| | | | | | | | Windows doesn't like it when we re-open a file we already have locked.
| * repository: oops, fix the prune testJeremy Stribling2017-11-291-2/+3
| |
| * repository: add tests for pruning and object re-packingJeremy Stribling2017-11-293-0/+150
| | | | | | | | | | Also, object re-packing should clean up any loose objects that were packed.
| * storer: separate loose and packed object mgmt into optional ifacesJeremy Stribling2017-11-294-49/+58
| | | | | | | | Suggested by mcuadros.
| * storage: some minor code cleanupJeremy Stribling2017-11-293-13/+5
| | | | | | | | | | | | Suggested by mcuadros. Issue: #669
| * plumbing: add `HasEncodedObject` method to StorerJeremy Stribling2017-11-293-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 codeTaru Karttunen2017-11-291-12/+9
| |
| * Make prune object walker genericTaru Karttunen2017-11-292-91/+107
| |
| * Use Storer.Config pack window when repacking objectsTaru Karttunen2017-11-291-3/+5
| |
| * Make object repacking more configurableTaru Karttunen2017-11-296-15/+44
| |
| * Support for repacking objectsTaru Karttunen2017-11-296-13/+107
| |
| * Address CI and move code aroundTaru Karttunen2017-11-293-126/+149
| |
| * First pass of prune designTaru Karttunen2017-11-296-10/+236
| |
| * dotgit: use bufio for PackRefsJeremy Stribling2017-11-291-10/+8
| | | | | | | | | | | | Suggested by taruti. Issue: #13
| * dotgit: during rewriting, re-open packed-refs after lockingJeremy Stribling2017-11-291-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" paramJeremy Stribling2017-11-291-0/+4
| | | | | | | | Issue: KBFS-2517
| * dotgit: fix up PackRefs comment for upstreamingJeremy Stribling2017-11-291-26/+8
| |
| * filesystem: implement PackRefs()Jeremy Stribling2017-11-295-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
generated by cgit (git 2.34.1) at 2024-11-14 19:08:26 +0000