Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use git stashes for gitWorkflow #663

Merged
merged 37 commits into from
Oct 31, 2019
Merged

feat: use git stashes for gitWorkflow #663

merged 37 commits into from
Oct 31, 2019

Commits on Oct 31, 2019

  1. feat: use git stashes for gitWorkflow

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    bfd2adc View commit details
    Browse the repository at this point in the history

  2. ci: print git version number in AppVeyor

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    bdf0faf View commit details
    Browse the repository at this point in the history

  3. refactor: simplify gitWorkflow by creating only one stash

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    5c165fa View commit details
    Browse the repository at this point in the history

  4. test: update test for restoring changes

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    b008ab8 View commit details
    Browse the repository at this point in the history

  5. fix: retry failing apply with 3-way merge

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    30939b9 View commit details
    Browse the repository at this point in the history

  6. refactor: improvements

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    8ec8bfb View commit details
    Browse the repository at this point in the history

  7. refactor: GitWorkflow is a class

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    340c1c2 View commit details
    Browse the repository at this point in the history

  8. test: increase jest timeout for slow CI runners

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    31e440e View commit details
    Browse the repository at this point in the history

  9. fix: try applying unstaged changes before handling errors

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    080f1c6 View commit details
    Browse the repository at this point in the history

  10. test: add some runAll tests

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e8d5e27 View commit details
    Browse the repository at this point in the history

  11. test: add test for failing merge conflict resolution 

    lint-staged loses the MERGE_HEAD while stashing backups, so the current behaviour breaks merge conflict resolution. Solution is to manually check, save, and restore the MERGE_HEAD during runtime. This should be fixed and the test adjusted for successful run
    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    7b798fd View commit details
    Browse the repository at this point in the history

  12. refactor: use execa.command to avoid parsing of commands

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    89e6de0 View commit details
    Browse the repository at this point in the history

  13. fix: gitWorkflow handles active merge mode

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    959d9d9 View commit details
    Browse the repository at this point in the history

  14. test: move mock files inside test directory

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    66381f0 View commit details
    Browse the repository at this point in the history

  15. test: rework usage of tmp module

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e535e76 View commit details
    Browse the repository at this point in the history

  16. refactor: no need to use path.resolve since path is normalized

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d087155 View commit details
    Browse the repository at this point in the history

  17. refactor: check for merge using fs.access before fs.readfile

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    af77588 View commit details
    Browse the repository at this point in the history

  18. refactor: move file operations to separate file

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    3d8c753 View commit details
    Browse the repository at this point in the history

  19. test: scope global jest timeout to only runAll.unmocked.spec

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    45688b2 View commit details
    Browse the repository at this point in the history

  20. test: remove non-functioning, throwing tests

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    6239830 View commit details
    Browse the repository at this point in the history

  21. refactor: rename src/ to lib/ since it's not compiled

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d2e4253 View commit details
    Browse the repository at this point in the history

  22. refactor: improve long argument warning indentation

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    dded921 View commit details
    Browse the repository at this point in the history

  23. refactor: show helpful warning about git failures

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    647abd7 View commit details
    Browse the repository at this point in the history

  24. test: do not use tmp for creation of tmp directories

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    05f53b3 View commit details
    Browse the repository at this point in the history

  25. test: add mock console

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    b591ba8 View commit details
    Browse the repository at this point in the history

  26. test: further increase timeout for long test

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    19e6c11 View commit details
    Browse the repository at this point in the history

  27. fix: keep untracked files around by backing them up 

    Git diff completely ignores new, untracked files, but they can be read/written separately
    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d20c5be View commit details
    Browse the repository at this point in the history

  28. refactor: improvements based on PR review

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0018949 View commit details
    Browse the repository at this point in the history

  29. docs: remove bit about next release

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e3da610 View commit details
    Browse the repository at this point in the history

  30. fix: workaround for stashing deleted files for git < 2.23

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    50afea0 View commit details
    Browse the repository at this point in the history

  31. test: should work when amending previous commit with unstaged changes

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    35b0616 View commit details
    Browse the repository at this point in the history

  32. test: improve coverage of gitWorkflow

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    de82960 View commit details
    Browse the repository at this point in the history

  33. feat: automatically stage task modifications

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    7d0379d View commit details
    Browse the repository at this point in the history

  34. feat: warn when task contains "git add"

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    4014f3c View commit details
    Browse the repository at this point in the history

  35. test: add test for supplying object config via node api

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    473b93b View commit details
    Browse the repository at this point in the history

  36. fix: correctly restore untracked files from backup stash

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0111f48 View commit details
    Browse the repository at this point in the history

  37. fix: prevent Listr from hiding git add warning

    @iiroj
    iiroj authored and Andrey Okonetchnikov committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    2b57db0 View commit details
    Browse the repository at this point in the history