allow git-update-ref create refs with slashes in names

Make git-update-ref create references with slashes in them. git-branch
and git-checkout already support such reference names.

git-branch can use git-update-ref to create the references in a more
formal manner now.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-branch.sh b/git-branch.sh
index 67f113acb9abc2bbcd444de42326854bdd88ba4a..11d52fd78ed11887006ba23470083e2560439c0c 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -102,6 +102,5 @@ rev=$(git-rev-parse --verify "$head") || exit
 git-check-ref-format "heads/$branchname" ||
        die "we do not like '$branchname' as a branch name."
 
 git-check-ref-format "heads/$branchname" ||
        die "we do not like '$branchname' as a branch name."
 

-leading=`expr "refs/heads/$branchname" : '\(.*\)/'` &&
-mkdir -p "$GIT_DIR/$leading" &&
-echo $rev > "$GIT_DIR/refs/heads/$branchname"
+git update-ref "refs/heads/$branchname" $rev
+

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 5f98f64de16560d9f6599623e7424efac9dc407f..36f7749bed8a40f50f218bbd6c4dcf7763c5abee 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -24,4 +24,12 @@ test_expect_failure \
     'git branch --help should not have created a bogus branch' \
     'test -f .git/refs/heads/--help'
 
     'git branch --help should not have created a bogus branch' \
     'test -f .git/refs/heads/--help'
 

+test_expect_success \
+    'git branch abc should create a branch' \
+    'git-branch abc && test -f .git/refs/heads/abc'
+
+test_expect_success \
+    'git branch a/b/c should create a branch' \
+    'git-branch a/b/c && test -f .git/refs/heads/a/b/c'
+

 test_done
 test_done

diff --git a/update-ref.c b/update-ref.c
index d79dc52fd7d1eb1117e37c6b400c5f99bc8e4fcd..e6fbddbab6939023c4bbea9e0b685904dc6ba0b0 100644 (file)
--- a/update-ref.c
+++ b/update-ref.c
@@ -19,7 +19,8 @@ static int re_verify(const char *path, unsigned char *oldsha1, unsigned char *cu
 int main(int argc, char **argv)
 {
        char *hex;
 int main(int argc, char **argv)
 {
        char *hex;

-       const char *refname, *value, *oldval, *path, *lockpath;
+       const char *refname, *value, *oldval, *path;
+       char *lockpath;

        unsigned char sha1[20], oldsha1[20], currsha1[20];
        int fd, written;
 
        unsigned char sha1[20], oldsha1[20], currsha1[20];
        int fd, written;
 


@@ -49,6 +50,8 @@ int main(int argc, char **argv)
        }
        path = strdup(path);
        lockpath = mkpath("%s.lock", path);
        }
        path = strdup(path);
        lockpath = mkpath("%s.lock", path);

+       if (safe_create_leading_directories(lockpath) < 0)
+               die("Unable to create all of %s", lockpath);

 
        fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
        if (fd < 0)
 
        fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
        if (fd < 0)