99 lines
2.7 KiB
Plaintext
99 lines
2.7 KiB
Plaintext
|
# $Id$
|
||
|
|
# vim:et:ft=sh:sts=2:sw=2
|
||
|
|
#
|
||
|
|
# git-flow -- A collection of Git extensions to provide high-level
|
||
|
|
# repository operations for Vincent Driessen's branching model.
|
||
|
|
#
|
||
|
|
# A blog post presenting this model is found at:
|
||
|
|
# http://blog.avirtualhome.com/development-workflow-using-git/
|
||
|
|
#
|
||
|
|
# Feel free to contribute to this project at:
|
||
|
|
# http://github.com/petervanderdoes/gitflow
|
||
|
|
#
|
||
|
|
# Authors:
|
||
|
|
# Copyright 2012-2019 Peter van der Does. All rights reserved.
|
||
|
|
#
|
||
|
|
# Original Author:
|
||
|
|
# Copyright 2010 Vincent Driessen. All rights reserved.
|
||
|
|
#
|
||
|
|
# Redistribution and use in source and binary forms, with or without
|
||
|
|
# modification, are permitted provided that the following conditions are met:
|
||
|
|
#
|
||
|
|
# 1. Redistributions of source code must retain the above copyright notice, this
|
||
|
|
# list of conditions and the following disclaimer.
|
||
|
|
# 2. Redistributions in binary form must reproduce the above copyright notice,
|
||
|
|
# this list of conditions and the following disclaimer in the documentation
|
||
|
|
# and/or other materials provided with the distribution.
|
||
|
|
#
|
||
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||
|
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||
|
|
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||
|
|
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||
|
|
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||
|
|
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||
|
|
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||
|
|
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||
|
|
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||
|
|
#
|
||
|
|
|
||
|
|
|
||
|
|
initialize() {
|
||
|
|
require_git_repo
|
||
|
|
require_gitflow_initialized
|
||
|
|
gitflow_load_settings
|
||
|
|
}
|
||
|
|
|
||
|
|
usage() {
|
||
|
|
OPTIONS_SPEC="\
|
||
|
|
git flow log
|
||
|
|
|
||
|
|
shows current branch log compared to develop
|
||
|
|
'git help log' for arguments
|
||
|
|
--
|
||
|
|
"
|
||
|
|
flags_help
|
||
|
|
}
|
||
|
|
|
||
|
|
# Parse arguments and set common variables
|
||
|
|
parse_args() {
|
||
|
|
FLAGS "$@" || exit $?
|
||
|
|
eval set -- "${FLAGS_ARGV}"
|
||
|
|
}
|
||
|
|
|
||
|
|
cmd_default() {
|
||
|
|
cmd_list "$@"
|
||
|
|
}
|
||
|
|
|
||
|
|
cmd_list() {
|
||
|
|
OPTIONS_SPEC="\
|
||
|
|
git flow feature log [<options>]
|
||
|
|
|
||
|
|
Show log on <feature> branch since the fork of <develop> branch
|
||
|
|
Options come from git log
|
||
|
|
--
|
||
|
|
h,help! Show this help
|
||
|
|
showcommands! Show git commands while executing them
|
||
|
|
"
|
||
|
|
|
||
|
|
# Parse arguments
|
||
|
|
parse_args "$@"
|
||
|
|
|
||
|
|
# get base branch from current branch
|
||
|
|
local base=$(gitflow_config_get_base_branch $(git_current_branch))
|
||
|
|
|
||
|
|
# no base branch found, comparing against $master
|
||
|
|
if [ -z $base ]; then
|
||
|
|
base=$MASTER_BRANCH
|
||
|
|
fi
|
||
|
|
|
||
|
|
# Get the log
|
||
|
|
echo "Comparing against \"$base\" branch\n"
|
||
|
|
git_do log "$@""$base.."
|
||
|
|
}
|
||
|
|
|
||
|
|
cmd_help() {
|
||
|
|
usage
|
||
|
|
exit 0
|
||
|
|
}
|