Make git-update-ref a builtin
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Lukas Sandström committed
Jun 13, 2006 at 22:22 UTC
854b4629f97fb216a91805706cd61b33beb49172
4 files changed
+11
-5
Makefile
+4
-3
@@ -159,11 +159,11 @@ PROGRAMS = \
159
git-ssh-upload$X git-unpack-file$X \
160
git-unpack-objects$X git-update-server-info$X \
161
git-upload-pack$X git-verify-pack$X \
162
- git-update-ref$X git-symbolic-ref$X \
162
+ git-symbolic-ref$X \
163
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
164
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
165
166
-BUILT_INS = git-log$X git-whatchanged$X git-show$X \
166
+BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
167
git-count-objects$X git-diff$X git-push$X git-mailsplit$X \
168
git-grep$X git-add$X git-rm$X git-rev-list$X git-stripspace$X \
169
git-check-ref-format$X git-rev-parse$X git-mailinfo$X \
@@ -226,7 +226,8 @@ BUILTIN_OBJS = \
226
builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.o \
227
builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
228
builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
229
- builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o
229
+ builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
230
+ builtin-update-ref.o
231
232
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
233
LIBS = $(GITLIBS) -lz
builtin-update-ref.c
renamed
+4
-1
@@ -1,10 +1,11 @@
1
#include "cache.h"
2
#include "refs.h"
3
+#include "builtin.h"
4
5
static const char git_update_ref_usage[] =
6
"git-update-ref <refname> <value> [<oldval>] [-m <reason>]";
7
7
-int main(int argc, char **argv)
8
+int cmd_update_ref(int argc, const char **argv, char **envp)
9
{
10
const char *refname=NULL, *value=NULL, *oldval=NULL, *msg=NULL;
11
struct ref_lock *lock;
@@ -52,5 +53,7 @@ int main(int argc, char **argv)
53
return 1;
54
if (write_ref_sha1(lock, sha1, msg) < 0)
55
return 1;
56
+
57
+ /* write_ref_sha1 always unlocks the ref, no need to do it explicitly */
58
return 0;
59
}
builtin.h
+1
@@ -48,6 +48,7 @@ extern int cmd_diff_tree(int argc, const char **argv, char **envp);
48
extern int cmd_cat_file(int argc, const char **argv, char **envp);
49
extern int cmd_rev_parse(int argc, const char **argv, char **envp);
50
extern int cmd_update_index(int argc, const char **argv, char **envp);
51
+extern int cmd_update_ref(int argc, const char **argv, char **envp);
52
53
extern int cmd_write_tree(int argc, const char **argv, char **envp);
54
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
git.c
+2
-1
@@ -183,7 +183,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
183
{ "mailsplit", cmd_mailsplit },
184
{ "mailinfo", cmd_mailinfo },
185
{ "stripspace", cmd_stripspace },
186
- { "update-index", cmd_update_index }
186
+ { "update-index", cmd_update_index },
187
+ { "update-ref", cmd_update_ref }
188
};
189
int i;
190