diff options
Diffstat (limited to 'src/content/tils/2020/09')
| -rw-r--r-- | src/content/tils/2020/09/04/cli-email-fun-profit.adoc | 76 | ||||
| -rw-r--r-- | src/content/tils/2020/09/05/oldschool-pr.adoc | 110 |
2 files changed, 0 insertions, 186 deletions
diff --git a/src/content/tils/2020/09/04/cli-email-fun-profit.adoc b/src/content/tils/2020/09/04/cli-email-fun-profit.adoc deleted file mode 100644 index 1da1154..0000000 --- a/src/content/tils/2020/09/04/cli-email-fun-profit.adoc +++ /dev/null @@ -1,76 +0,0 @@ -= Send emails using the command line for fun and profit! - -:ssmtp: https://wiki.archlinux.org/index.php/SSMTP -:mailutils: https://mailutils.org/ - -Here are a few reasons why: - -. send yourself and other people notification of cronjobs, scripts runs, CI - jobs, _etc._ -. leverage the POSIX pipe `|`, and pipe emails away! -. because you can. - -Reason 3 is the fun part, reasons 1 and 2 are the profit part. - -First {ssmpt}[install and configure SSMTP] for using, say, Gmail as the email -server: - -[source,sh] ----- -# file /etc/ssmtp/ssmtp.conf -FromLineOverride=YES -MailHub=smtp.gmail.com:587 -UseSTARTTLS=YES -UseTLS=YES -rewriteDomain=gmail.com -root=username@gmail.com -AuthUser=username -AuthPass=password ----- - -Now install {mailutils}[GNU Mailutils] (`sudo apt-get install mailutils` or the -equivalent on your OS), and send yourself your first email: - -[source,sh] ----- -echo body | mail -aFrom:email@example.com email@example.com -s subject ----- - -And that's about it, you've got mail. Here are some more places where it might -be applicable: - -[source,sh] ----- -# report a backup cronjob, attaching logs -set -e - -finish() { - status=$? - if [[ $status = 0 ]]; then - STATUS="SUCCESS (status $status)" - else - STATUS="FAILURE (status $status)" - fi - - mail user@example.com \ - -s "Backup job report on $(hostname): ${STATUS}" \ - --content-type 'text/plain; charset=utf-8' \ - -A"$LOG_FILE" <<< 'The log report is in the attachment.' -} -trap finish EXIT - -do-long-backup-cmd-here ----- - -[source,sh] ----- -# share the output of a cmd with someone -some-program | mail someone@example.com -s "The weird logs that I was talking about" ----- - -...and so on. - -You may consider adding a `alias mail='mail -aFrom:email@example.com'` so you -don't keep re-entering the ``From:'' part. - -Send yourself some emails to see it working! diff --git a/src/content/tils/2020/09/05/oldschool-pr.adoc b/src/content/tils/2020/09/05/oldschool-pr.adoc deleted file mode 100644 index 392ec67..0000000 --- a/src/content/tils/2020/09/05/oldschool-pr.adoc +++ /dev/null @@ -1,110 +0,0 @@ -= Pull requests with Git, the old school way -:categories: git - -:empty: -:cgit: https://git.zx2c4.com/cgit/ - -It might be news to you, as it was to me, that "pull requests" that you can -create on a Git hosting provider’s web -UI{empty}footnote:pr-webui[ - And maybe even using the Git hosting provider’s API from the command line! -] like GitLab/Bitbucket/GitHub actually comes from Git itself: -`git request-pull`. - -At the very core, they accomplish the same thing: both the original and the web -UI ones are ways for you to request the project maintainers to pull in your -changes from your fork. It’s like saying: "hi there, I did some changes on my -clone of the repository, what do you think about bringing those in?". - -The only difference is that you’re working with only Git itself, so you’re not -tied to any Git hosting provider: you can send pull requests across them -transparently! You could even use your own {cgit}[cgit] installation. No need -to be locked in by any of them, putting the "D" back in "DVCS": it’s a -*distributed* version control system. - -== `git request-pull` introduction - -Here’s the raw output of a `git request-pull`: - -[source,sh] ----- -$ git request-pull HEAD public-origin -The following changes since commit 302c9f2f035c0360acd4e13142428c100a10d43f: - - db post: Add link to email exchange (2020-09-03 21:23:55 -0300) - -are available in the Git repository at: - - https://euandre.org/git/euandre.org/ - -for you to fetch changes up to 524c646cdac4153e54f2163e280176adbc4873fa: - - db post: better pinpoint sqlite unsuitability (2020-09-03 22:08:56 -0300) - ----------------------------------------------------------------- -EuAndreh (1): - db post: better pinpoint sqlite unsuitability - - _posts/2020-08-31-the-database-i-wish-i-had.md | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) ----- - -That very first line is saying: "create me a pull request with only a single -commit, defined by `HEAD`, and use the URL defined by `public-origin`". - -Here’s a pitfall: you may try using your `origin` remote at first where I put -`public-origin`, but that is many times pointing to something like -`git@example.com`, or `git.example.com:repo.git` (check that with -`git remote -v | grep origin`). On both cases those are addresses available for -interaction via SSH, and it would be better if your pull requests used an -address ready for public consumption. - -A simple solution for that is for you to add the `public-origin` alias as the -HTTPS alternative to the SSH version: - -[source,sh] ----- -$ git remote add public-origin https://example.com/user/repo ----- - -Every Git hosting provider exposes repositories via HTTPS. - -Experiment it yourself, and get acquainted with the CLI. - -== Delivering decentralized pull requests - -:cli-email: link:../04/cli-email-fun-profit.html - -Now that you can create the content of a pull request, you can just -{cli-email}[deliver it] to the interested parties email: - -[source,sh] ----- -# send a PR with your last commit to the author's email -git request-pull HEAD public-origin | mail author@example.com -s "PR: Add thing to repo" - -# send a PR with your last 5 commits to the project's mailing -# list, including the patch -git request-pull -p HEAD~5 public-origin | \ - mail list@example.com -s "PR: Add another thing to repo" - -# send every commit that is new in "other-branch" -git request-pull master public-origin other-branch | \ - mail list@example.com -s 'PR: All commits from my "other-brach"' ----- - -== Conclusion - -:distgit: https://drewdevault.com/2018/07/23/Git-is-already-distributed.html - -In practice, I’ve never used or seen anyone use pull requests this way: -everybody is just {distgit}[sending patches via email]. - -If you stop to think about this model, the problem of "Git hosting providers -becoming too centralized" is a non-issue, and "Git federation" proposals are a -less attractive as they may sound initially. - -Using Git this way is not scary or so weird as the first impression may suggest. -It is actually how Git was designed to be used. - -Check `git help request-pull` for more info. |