mirror of
https://github.com/git/git.git
synced 2026-03-14 10:53:25 +01:00
6ab2f70c3e
* master: Use column indexes in git-cvsserver where necessary. gitweb: Add '..' (up directory) to tree view if applicable gitweb: Improve git_print_page_path pager: default to LESS=FRSX not LESS=FRS Make prune also run prune-packed git-vc: better installation instructions gitweb: Do not esc_html $basedir argument to git_print_tree_entry gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2) Fix usagestring for git-branch git-merge: show usage if run without arguments
132 lines
2.7 KiB
Bash
Executable File
132 lines
2.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
USAGE='[-l] [-f] <branchname> [<start-point>] | (-d | -D) <branchname> | [-r]'
|
|
LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
|
|
If one argument, create a new branch <branchname> based off of current HEAD.
|
|
If two arguments, create a new branch <branchname> based off of <start-point>.'
|
|
|
|
SUBDIRECTORY_OK='Yes'
|
|
. git-sh-setup
|
|
|
|
headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
|
|
|
|
delete_branch () {
|
|
option="$1"
|
|
shift
|
|
for branch_name
|
|
do
|
|
case ",$headref," in
|
|
",$branch_name,")
|
|
die "Cannot delete the branch you are on." ;;
|
|
,,)
|
|
die "What branch are you on anyway?" ;;
|
|
esac
|
|
branch=$(git-show-ref --verify --hash -- "refs/heads/$branch_name") &&
|
|
branch=$(git-rev-parse --verify "$branch^0") ||
|
|
die "Seriously, what branch are you talking about?"
|
|
case "$option" in
|
|
-D)
|
|
;;
|
|
*)
|
|
mbs=$(git-merge-base -a "$branch" HEAD | tr '\012' ' ')
|
|
case " $mbs " in
|
|
*' '$branch' '*)
|
|
# the merge base of branch and HEAD contains branch --
|
|
# which means that the HEAD contains everything in both.
|
|
;;
|
|
*)
|
|
echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
|
|
If you are sure you want to delete it, run 'git branch -D $branch_name'."
|
|
exit 1
|
|
;;
|
|
esac
|
|
;;
|
|
esac
|
|
git update-ref -d "refs/heads/$branch_name" "$branch"
|
|
echo "Deleted branch $branch_name."
|
|
done
|
|
exit 0
|
|
}
|
|
|
|
ls_remote_branches () {
|
|
git-rev-parse --symbolic --all |
|
|
sed -ne 's|^refs/\(remotes/\)|\1|p' |
|
|
sort
|
|
}
|
|
|
|
force=
|
|
create_log=
|
|
while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
|
|
do
|
|
case "$1" in
|
|
-d | -D)
|
|
delete_branch "$@"
|
|
exit
|
|
;;
|
|
-r)
|
|
ls_remote_branches
|
|
exit
|
|
;;
|
|
-f)
|
|
force="$1"
|
|
;;
|
|
-l)
|
|
create_log="yes"
|
|
;;
|
|
--)
|
|
shift
|
|
break
|
|
;;
|
|
-*)
|
|
usage
|
|
;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
case "$#" in
|
|
0)
|
|
git-rev-parse --symbolic --branches |
|
|
sort |
|
|
while read ref
|
|
do
|
|
if test "$headref" = "$ref"
|
|
then
|
|
pfx='*'
|
|
else
|
|
pfx=' '
|
|
fi
|
|
echo "$pfx $ref"
|
|
done
|
|
exit 0 ;;
|
|
1)
|
|
head=HEAD ;;
|
|
2)
|
|
head="$2^0" ;;
|
|
esac
|
|
branchname="$1"
|
|
|
|
rev=$(git-rev-parse --verify "$head") || exit
|
|
|
|
git-check-ref-format "heads/$branchname" ||
|
|
die "we do not like '$branchname' as a branch name."
|
|
|
|
prev=''
|
|
if git-show-ref --verify --quiet -- "refs/heads/$branchname"
|
|
then
|
|
if test '' = "$force"
|
|
then
|
|
die "$branchname already exists."
|
|
elif test "$branchname" = "$headref"
|
|
then
|
|
die "cannot force-update the current branch."
|
|
fi
|
|
prev=`git rev-parse --verify "refs/heads/$branchname"`
|
|
fi
|
|
if test "$create_log" = 'yes'
|
|
then
|
|
mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$branchname")
|
|
touch "$GIT_DIR/logs/refs/heads/$branchname"
|
|
fi
|
|
git update-ref -m "branch: Created from $head" "refs/heads/$branchname" "$rev" "$prev"
|