Compare commits

..

No commits in common. "master" and "1.1.1" have entirely different histories.

3 changed files with 6 additions and 47 deletions

21
LICENSE
View file

@ -1,21 +0,0 @@
MIT License Copyright (c) 2020 davidosomething
Permission is hereby granted,
free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to the
following conditions:
The above copyright notice and this permission notice
(including the next paragraph) shall be included in all copies or substantial
portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View file

@ -21,17 +21,8 @@ Here's a screenshot:
## Installation
- Requires BASH 4+
- Add the `git-my` file somewhere in your path, e.g. `/usr/local/bin/`
### zplug installation
Super simple if you use zplug:
```sh
zplug "davidosomething/git-my", as:command
```
## Usage
From command line execute:
@ -59,5 +50,5 @@ merged into `origin/qa`.
----
Copyright (c) 2017 David O'Trakoun <me@davidosomething.com>
Copyright (c) 2015 David O'Trakoun <me@davidosomething.com>

21
git-my
View file

@ -1,19 +1,18 @@
#!/usr/bin/env bash
# git-my v1.1.2
# git-my v1.1.1
#
# Lists a user's remote branches and shows if it was merged
# and/or available locally.
# and/or available locally
#
# Copyright (c) 2017 David O'Trakoun <me@davidosomething.com>
#
# Requires:
# bash 4+ for readarray
# Copyright (c) 2015 David O'Trakoun <me@davidosomething.com>
#
# Usage:
# git my
#
set -eu
# is_repository
#
# Exits with error if not a git repository
@ -234,17 +233,7 @@ main() {
local remote_ref=${remote#*/}
git_user=$(git config --get user.name)
if [ -z "$git_user" ]; then
echo "ERROR: user.name is not set in git config"
exit 1
fi
git_remote=$(git config --get "remote.${remote_name}.url")
if [ -z "$git_remote" ]; then
echo "ERROR: remote.${remote_name}.url is not set"
exit 1
fi
everyones_remotes=$(get_everyones_remotes "$remote_name")
my_remotes=$(filter_mine "$git_user" "$everyones_remotes")
merged_remote_branches=$(get_merged_remote_branches "$remote_name/$remote_ref")