summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-05-24 23:34:04 -0400
committerJunio C Hamano <junkio@cox.net>2006-05-24 22:26:47 -0700
commitd7fb7a373a8ea4a8ecf6421be92226bab74f474e (patch)
tree154a0ac662c32ee78a46c22d63dedd14507471e3 /git-checkout.sh
parent9c7466fa248608ff8a91f8b4dca48dac7dda02d5 (diff)
downloadgit-d7fb7a373a8ea4a8ecf6421be92226bab74f474e.tar.gz
Test that git-branch -l works.
If the user supplies -l to git-branch when creating a new branch then the new branch's log should be created automatically and the branch creation should be logged in that log. Further if a branch is being deleted and it had a log then also verify that the log was deleted. Test git-checkout -b foo -l for creating a new branch foo with a log and checking out that branch. Fixed git-checkout -b foo -l as the branch variable name was incorrect in the script. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 360aabf9e3..564117f006 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -197,8 +197,8 @@ fi
if [ "$?" -eq 0 ]; then
if [ "$newbranch" ]; then
if [ "$newbranch_log" ]; then
- mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$branchname")
- touch "$GIT_DIR/logs/refs/heads/$branchname"
+ mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$newbranch")
+ touch "$GIT_DIR/logs/refs/heads/$newbranch"
fi
git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit
branch="$newbranch"