X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-branch.sh;h=e0501ec23f5c40134af0e6211cf1ba28e69e1d5b;hb=7a97de4e19757b5576f32ce67d90cb792dbb893b;hp=d1e37307617abd6144f36f93decbebd95a97fb32;hpb=67644a4d77f55cd1c960d046079d26719f1e7cd6;p=git.git diff --git a/git-branch.sh b/git-branch.sh index d1e37307..e0501ec2 100755 --- a/git-branch.sh +++ b/git-branch.sh @@ -1,6 +1,6 @@ #!/bin/sh -USAGE='[(-d | -D) ] | [[-f] []] | -r' +USAGE='[-l] [(-d | -D) ] | [[-f] []] | -r' LONG_USAGE='If no arguments, show available branches and mark current branch with a star. If one argument, create a new branch based off of current HEAD. If two arguments, create a new branch based off of .' @@ -42,6 +42,7 @@ If you are sure you want to delete it, run 'git branch -D $branch_name'." esac ;; esac + rm -f "$GIT_DIR/logs/refs/heads/$branch_name" rm -f "$GIT_DIR/refs/heads/$branch_name" echo "Deleted branch $branch_name." done @@ -55,6 +56,7 @@ ls_remote_branches () { } force= +create_log= while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac do case "$1" in @@ -69,6 +71,9 @@ do -f) force="$1" ;; + -l) + create_log="yes" + ;; --) shift break @@ -117,4 +122,9 @@ then die "cannot force-update the current branch." fi 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