@matheusbsbs / matheus-bagliano / commits / 8b5157e407
Fork 0

add logref support to git-symbolic-ref

Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Nicolas Pitre committed Jan 26, 2007 at 17:26 UTC 8b5157e40718a2ee1d645c342d93df4e66335479
6 files changed +35 -8
Documentation/git-symbolic-ref.txt
+5 -1
@@ -7,7 +7,7 @@ git-symbolic-ref - Read and modify symbolic refs
7
8 SYNOPSIS
9 --------
10 -'git-symbolic-ref' [-q] <name> [<ref>]
10 +'git-symbolic-ref' [-q] [-m <reason>] <name> [<ref>]
11
12 DESCRIPTION
13 -----------
@@ -31,6 +31,10 @@ OPTIONS
31 symbolic ref but a detached HEAD; instead exit with
32 non-zero status silently.
33
34 +-m::
35 + Update the reflog for <name> with <reason>. This is valid only
36 + when creating or updating a symbolic ref.
37 +
38 NOTES
39 -----
40 In the past, `.git/HEAD` was a symbolic link pointing at
builtin-branch.c
+2 -1
@@ -381,7 +381,8 @@ static void rename_branch(const char *oldname, const char *newname, int force)
381 if (rename_ref(oldref, newref, logmsg))
382 die("Branch rename failed");
383
384 - if (!strcmp(oldname, head) && create_symref("HEAD", newref))
384 + /* no need to pass logmsg here as HEAD didn't really move */
385 + if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL))
386 die("Branch renamed to %s, but HEAD is not updated!", newname);
387 }
388
builtin-init-db.c
+1 -1
@@ -231,7 +231,7 @@ static int create_default_files(const char *git_dir, const char *template_path)
231 strcpy(path + len, "HEAD");
232 reinit = !read_ref("HEAD", sha1);
233 if (!reinit) {
234 - if (create_symref("HEAD", "refs/heads/master") < 0)
234 + if (create_symref("HEAD", "refs/heads/master", NULL) < 0)
235 exit(1);
236 }
237
builtin-symbolic-ref.c
+14 -2
@@ -3,7 +3,7 @@
3 #include "refs.h"
4
5 static const char git_symbolic_ref_usage[] =
6 -"git-symbolic-ref [-q] name [ref]";
6 +"git-symbolic-ref [-q] [-m <reason>] name [ref]";
7
8 static void check_symref(const char *HEAD, int quiet)
9 {
@@ -25,6 +25,7 @@ static void check_symref(const char *HEAD, int quiet)
25 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
26 {
27 int quiet = 0;
28 + const char *msg = NULL;
29
30 git_config(git_default_config);
31
@@ -34,6 +35,17 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
35 break;
36 else if (!strcmp("-q", arg))
37 quiet = 1;
38 + else if (!strcmp("-m", arg)) {
39 + argc--;
40 + argv++;
41 + if (argc <= 1)
42 + break;
43 + msg = argv[1];
44 + if (!*msg)
45 + die("Refusing to perform update with empty message");
46 + if (strchr(msg, '\n'))
47 + die("Refusing to perform update with \\n in message");
48 + }
49 else if (!strcmp("--", arg)) {
50 argc--;
51 argv++;
@@ -50,7 +62,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
62 check_symref(argv[1], quiet);
63 break;
64 case 3:
53 - create_symref(argv[1], argv[2]);
65 + create_symref(argv[1], argv[2], msg);
66 break;
67 default:
68 usage(git_symbolic_ref_usage);
cache.h
+1 -1
@@ -302,7 +302,7 @@ extern int read_ref(const char *filename, unsigned char *sha1);
302 extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
303 extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
304
305 -extern int create_symref(const char *ref, const char *refs_heads_master);
305 +extern int create_symref(const char *ref, const char *refs_heads_master, const char *logmsg);
306 extern int validate_headref(const char *ref);
307
308 extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
refs.c
+12 -2
@@ -986,18 +986,23 @@ int write_ref_sha1(struct ref_lock *lock,
986 return 0;
987 }
988
989 -int create_symref(const char *ref_target, const char *refs_heads_master)
989 +int create_symref(const char *ref_target, const char *refs_heads_master,
990 + const char *logmsg)
991 {
992 const char *lockpath;
993 char ref[1000];
994 int fd, len, written;
995 const char *git_HEAD = git_path("%s", ref_target);
996 + unsigned char old_sha1[20], new_sha1[20];
997 +
998 + if (logmsg && read_ref(ref_target, old_sha1))
999 + hashclr(old_sha1);
1000
1001 #ifndef NO_SYMLINK_HEAD
1002 if (prefer_symlink_refs) {
1003 unlink(git_HEAD);
1004 if (!symlink(refs_heads_master, git_HEAD))
1000 - return 0;
1005 + goto done;
1006 fprintf(stderr, "no symlink - falling back to symbolic ref\n");
1007 }
1008 #endif
@@ -1030,6 +1035,11 @@ int create_symref(const char *ref_target, const char *refs_heads_master)
1035 error("Unable to fix permissions on %s", lockpath);
1036 return -4;
1037 }
1038 +
1039 + done:
1040 + if (logmsg && !read_ref(refs_heads_master, new_sha1))
1041 + log_ref_write(ref_target, old_sha1, new_sha1, logmsg);
1042 +
1043 return 0;
1044 }
1045