1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

6 Commits

Author SHA1 Message Date
Zetok Zalbavar
2a420b85ef
chore(test-pr.sh): commit merge as qTox testing <>
With this one doesn't need to even have git properly configured to test
a PR.
2016-07-13 20:50:40 +01:00
Zetok Zalbavar
784d42d8d7
chore(test-pr.sh): add test-pr.sh script as requested
Add missing copyright stuff to `merge-pr.sh`.

Refactored & split `merge-pr.sh` script, since most of required
code for `test-pr.sh` already existed there.

Differences from `merge-pr.sh`:
  * if there's no `upstream` remote, https version is used instead of
    git
  * merge commit *is not* GPG-signed (less hassle)
  * merge branch is named e.g. `test1234` instead of `merge1234`
  * instructions for pushing test branch onto upstream master are not
    printed
2016-06-19 10:22:02 +01:00
sudden6
91cff39e6f
chore(merge-pr.sh): improve usability
* make copying commands easier by adding some space around them
* add command to discard any changes made by this script
2016-05-15 22:18:58 +02:00
Zetok Zalbavar
b9abea636e
chore(merge-script): add check for number and a useful failure message
Message appears only if merge was unsuccessful and makes deleting
as quick as copypasting.

Check makes sure that supplied argument is actually an number, which
helps avoid waiting for git to eror out on "no remote branch".

Additionally, renamed `original` upstream to `upstream`, according to
@sudden6's suggestion.
2016-03-29 01:24:01 +01:00
Zetok Zalbavar
65608596d5
chore(merge-script): add a way to add optional merge message
This allows to close related to PR issues when PR submitter forgets to
include that in commit message, or add some other additional info.

E.g. `./merge-pr.sh 3033 'Fu fu fu. :3'` would result in:
```
    Merge pull request #3033

    Fu fu fu. :3

    sudden6 (1):
          update friend activity on groupchat events     fixes #2848
```
2016-03-22 15:13:05 +00:00
Zetok Zalbavar
7c30bf6836
chore: add script for creating signed merge commits
Merge messages are composed of PR number + appended shortlog.
Script is supposed to work only if there are no merge conflicts.

Example usage: `./merge-pr.sh 1234`
2016-03-21 18:02:01 +00:00