1
0
mirror of https://github.com/TheLocehiliosan/yadm synced 2025-06-13 13:03:58 +00:00
Commit Graph

232 Commits

Author SHA1 Message Date
Ross Smith II
509b9d2c01 Merge remote-tracking branch 'origin/patch-2' 2018-08-21 14:47:17 -07:00
Ross Smith II
a739c3c178 Merge remote-tracking branch 'origin/patch-1' 2018-08-21 14:47:10 -07:00
Ross Smith II
8061c5ead6
Remove dependency on hostname 2018-08-16 13:33:24 -07:00
Ross Smith II
e2e8f727b3
Fix formatting in .notes.md 2018-06-16 08:03:21 -07:00
Ross Smith II
f5af9cd947 Merge branch 'rasa/fix-brace-expansion' 2018-03-10 11:09:39 -08:00
Ross Smith II
ebc4ed01a9 Merge branch 'rasa/ignore-encrypted-files' 2018-03-10 11:06:00 -08:00
Ross Smith II
ec873d1ecd Add yadm ignore to ignore encrypted files
The new ignore command does the following:

1. Scans ~/.yadm/encrypt and adds its entries to ~/.gitignore.
   If  ~/.gitignore doesn't exist, it's created. Any lines that begin
   with # or ! are skipped, as well. If the entry is already in
   ~/.gitignore (either as /file, !/file, file, or !file), it's
   skipped. While 'file' and '!file' could lead to unintended skips,
   not including them would more likely lead to unintended skips.

2. Scans the list of actual files found that match ~/.yadm/encrypt
   entries, and adds them to ~/.gitignore. For example, if
   ~/.yadm/encrypt contains .ssh/config##Linux, and .ssh/config exists,
   it adds .ssh/config to ~/.gitignore, unless the entry is already in
   ~/.gitignore (either as /file, !/file, file, or !file).

- Since ~/.yadm/encrypt entries are rooted in $YADM_WORK without a
  leading slash, a leading slash is added to the ~/.gitignore entries
  to provide matching equivalency.

- A new option --yadm-ignore allows the user to override the location
  of ~/.gitignore.

- Uses sed to trim any leading or trailing whitespace when reading
  ~/.yadm/encrypt and ~/.gitignore.
2018-03-10 11:01:48 -08:00
Ross Smith II
d45344dbe2 Fix brace expansion (fixes #106) 2018-03-08 19:22:28 -08:00
Ross Smith II
6394110201 Merge branch 'rasa-dont-encrypt-nothingness' 2018-03-07 15:52:20 -08:00
Ross Smith II
96f127a859 Merge branch 'rasa-dotglob' 2018-03-07 15:52:12 -08:00
Ross Smith II
f57a01b0d4 Don't encrypt nothingness 2018-03-07 15:48:15 -08:00
Ross Smith II
5bb192a869 Have yadm encrypt match dotfiles (like .gitignore does) 2018-03-07 15:29:21 -08:00
Ross Smith II
0362f1bfe6 Merge branch 'rasa-add-mingw-msys-support' 2018-03-05 07:03:06 -08:00
Ross Smith II
54f7cbcebe Fix OS name match for Cygwin/Msys 2018-03-05 07:02:46 -08:00
Ross Smith II
6ae3ef1d03 Merge branch 'rasa-relative-symlinks' 2018-03-04 07:39:10 -08:00
Ross Smith II
6328fac5d2 Make symlinks relative (fixes #100) 2018-03-04 07:35:23 -08:00
Ross Smith II
315ad0873e Fix OS check to match (Cygwin|Msys)* 2018-03-04 06:34:08 -08:00
Ross Smith II
adfedf4b64 Add Mingw/Msys support 2018-03-03 20:02:45 -08:00
Tim Byrne
09a018ea5a
Release 1.12.0
Update version number and update documentation

* Add basic Zsh completion (#71, #79)
* Support directories in `.yadm/encrypt` (#81, #82)
* Support exclusions in `.yadm/encrypt` (#86)
* Improve portability with printf (#87)
* Eliminate usage of `eval` and `ls`
2017-10-24 22:12:23 -05:00
Tim Byrne
8af5425dc3
Capitalize headings 2017-10-24 07:40:40 -05:00
Tim Byrne
805d7647a8
Update documentation to reflect new .yadm/encrypt functionality 2017-10-24 07:38:13 -05:00
Tim Byrne
db9c00287b
Fix contrib target 2017-10-16 17:36:14 -05:00
Tim Byrne
75e0bf94bb
Merge pull request #91 from luzat/fix-whitespace 2017-10-16 17:24:22 -05:00
Thomas Luzat
ac2aed9ab4
Indentation: Convert tab to space 2017-10-09 15:21:32 +02:00
Tim Byrne
d411db9f6f
Consolidate cd to YADM_WORK 2017-09-22 12:30:24 -05:00
Tim Byrne
c24906ec10
Handle exclusions in .yadm/encrypt (#86) 2017-09-21 14:21:23 -05:00
Tim Byrne
2517e4b4ac
Add test-case for exclusions in .yadm/encrypt (#86) 2017-09-21 14:21:22 -05:00
Tim Byrne
cc30dfc24b
Re-number unit tests 2017-09-16 09:33:12 -05:00
Tim Byrne
f23bdb8147
Remove last use of LS_PROGRAM
Globs are not determined by an `eval` of `ls` anymore. The only other
use of `ls` can be replaced with a simple `printf`.
2017-09-16 09:33:12 -05:00
Tim Byrne
b78bb1eef4
Eliminate the use of eval
`eval` has always been used to process the globs in `.yadm/encrypt`.
This is being removed, as there is a risk of executing "dirty" data
found in `.yadm/encrypt`.

Caveats of this change:
  * Brace and tilde expansion will no longer work in `.yadm/encrypt`
  * Paths with spaces must not be quoted anymore
2017-09-16 09:32:38 -05:00
Tim Byrne
57866714c4
Replace echo with printf (#87) 2017-09-15 18:35:41 -05:00
Tim Byrne
abf6cd1c4c
Merge pull request #81 from japm48/patch-1
Add support for directories in .yadm/encrypt
2017-09-04 13:22:21 -05:00
Tim Byrne
df952094a1
Add test case for supporting directories in .yadm/encrypt (#81) 2017-09-04 13:19:04 -05:00
Tim Byrne
e09b5a551e
Declare PHONY targets in Makefile 2017-09-04 11:59:06 -05:00
Tim Byrne
eef9bfa2f7
Add a testhost target
This target runs Bash in an ephemeral docker container with the HEAD
revision of yadm mounted at /bin/yadm. You can override the version
using any "commit-ish". Eg. `target=1.06 make testhost`
2017-09-04 11:59:06 -05:00
Tim Byrne
f0886ef622
Merge pull request #79 from Mellbourn/zsh-completion
* Unified the naming between bash and zsh
* Cleaned up indentations, line endings
* Tweaked documentation
2017-08-24 18:35:17 -05:00
Tim Byrne
5d4f3aac5b
Release 1.11.1
Update version number and update documentation

* Create private dirs prior to merge (#74)
2017-08-23 07:28:35 -05:00
Tim Byrne
ebc90bfc98
Create secured private dirs (#74)
Directories are created prior to merge during clone, and prior to any
Git command run.

This directly addresses CVE-2017-11353.

When cloning a repo which includes data in a .ssh or .gnupg directory,
if those directories do not exist at the time of cloning, yadm will
create the directories with mask 0700 prior to merging the fetched data
into the work-tree.

When running a Git command and .ssh or .gnupg directories do not exist,
create those directories with mask 0700 prior to running the Git
command. However, do not create those directories if
yadm.auto-private-dirs is false.
2017-08-22 21:28:07 -05:00
japm48
8e3a5dbf47 Fix for issue #81
See details in #81
2017-08-20 06:55:59 +02:00
Klas Mellbourn
38318cff84 zsh completion - improve documentation 2017-08-11 20:09:27 +02:00
Klas Mellbourn
ded14fce73 add zsh completions 2017-08-11 19:50:25 +02:00
Tim Byrne
c20973c306
Fix date in SPEC
Months must be three letters for compatibility
2017-07-10 07:57:38 -05:00
Tim Byrne
4b5b6c44d3
Release 1.11.0
Update version number and update documentation

* Option for Cygwin to copy files instead of symlink (#62)
* Support `YADM_DISTRO` in Jinja templates (#68)
* Support pre/post hooks for every command (#70)
2017-07-09 23:07:50 -05:00
Tim Byrne
df1f7493ab
Add documentation for YADM_DISTRO support in Jinja templates 2017-07-07 08:33:14 -05:00
Tim Byrne
bf61ad662d
Add new detail to HOOKS documentation 2017-07-06 21:53:23 -05:00
Tim Byrne
557ce93fab
Add tests for hooks 2017-07-05 16:33:50 -05:00
Tim Byrne
0168bcfb5e
Query worktree directly from repo 2017-07-05 16:32:54 -05:00
Tim Byrne
61270c8277
Prevent command from running if "pre" hook fails 2017-07-05 08:12:29 -05:00
Tim Byrne
f73c873681
Expose some internal data to all hooks
* Command run by yadm
* Full commandline arguments
* Repo directory
* Worktree
* Exit status (for post hooks)
2017-07-05 08:12:29 -05:00
Tim Byrne
35743e3711
Tie "post" hooks to yadm exits
There are many cases where yadm may exit early (particularly when
encountering an error).
2017-07-03 16:25:23 -05:00