From: Junio C Hamano <junkio@cox.net>
Date: Wed, 27 Sep 2006 07:53:29 +0000 (-0700)
Subject: Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking
X-Git-Tag: v1.4.4-rc1~43^2~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9800b28c24465377dc2b8e26b322d362912647c?hp=-c

Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking

* jc/lt-ref2-with-lt-refs:
Fix show-ref usage for --dereference.
Document git-show-ref [-s|--hash] option.
Add man page for git-show-ref
gitignore: git-show-ref is a generated file.
Use Linus' show ref in "git-branch.sh".
Add [-s|--hash] option to Linus' show-ref.
Teach "git checkout" to use git-show-ref
Add "git show-ref" builtin command
---

e9800b28c24465377dc2b8e26b322d362912647c
diff --combined .gitignore
index 688a502d9c,6ca371ae16..0ffe14ac4e
--- a/.gitignore
+++ b/.gitignore
@@@ -37,7 -37,6 +37,7 @@@ git-fetc
  git-fetch-pack
  git-findtags
  git-fmt-merge-msg
 +git-for-each-ref
  git-format-patch
  git-fsck-objects
  git-get-tar-commit-id
@@@ -106,6 -105,7 +106,7 @@@ git-shortlo
  git-show
  git-show-branch
  git-show-index
+ git-show-ref
  git-ssh-fetch
  git-ssh-pull
  git-ssh-push
diff --combined Makefile
index 54ac74e984,563b921d92..af4d68fd7e
--- a/Makefile
+++ b/Makefile
@@@ -271,7 -271,6 +271,7 @@@ BUILTIN_OBJS = 
  	builtin-diff-stages.o \
  	builtin-diff-tree.o \
  	builtin-fmt-merge-msg.o \
 +	builtin-for-each-ref.o \
  	builtin-grep.o \
  	builtin-init-db.o \
  	builtin-log.o \
@@@ -303,6 -302,7 +303,7 @@@
  	builtin-verify-pack.o \
  	builtin-write-tree.o \
  	builtin-zip-tree.o \
+ 	builtin-show-ref.o \
  	builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
diff --combined builtin.h
index fc704bae18,37c2e4ac43..6bf0ace375
--- a/builtin.h
+++ b/builtin.h
@@@ -26,7 -26,6 +26,7 @@@ extern int cmd_diff(int argc, const cha
  extern int cmd_diff_stages(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
 +extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
  extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
  extern int cmd_grep(int argc, const char **argv, const char *prefix);
@@@ -49,8 -48,8 +49,8 @@@ extern int cmd_rev_list(int argc, cons
  extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
  extern int cmd_rm(int argc, const char **argv, const char *prefix);
  extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
 -extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
  extern int cmd_show(int argc, const char **argv, const char *prefix);
 +extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
  extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
  extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
@@@ -64,6 -63,7 +64,7 @@@ extern int cmd_version(int argc, const 
  extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
  extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
  extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
+ extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
  
  #endif
diff --combined git.c
index 561be303dc,9afb94d790..f7e7841649
--- a/git.c
+++ b/git.c
@@@ -232,7 -232,6 +232,7 @@@ static void handle_internal_command(in
  		{ "diff-stages", cmd_diff_stages, RUN_SETUP },
  		{ "diff-tree", cmd_diff_tree, RUN_SETUP },
  		{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
 +		{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
  		{ "format-patch", cmd_format_patch, RUN_SETUP },
  		{ "get-tar-commit-id", cmd_get_tar_commit_id },
  		{ "grep", cmd_grep, RUN_SETUP },
@@@ -270,6 -269,7 +270,7 @@@
  		{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
  		{ "write-tree", cmd_write_tree, RUN_SETUP },
  		{ "verify-pack", cmd_verify_pack },
+ 		{ "show-ref", cmd_show_ref, RUN_SETUP },
  		{ "pack-refs", cmd_pack_refs, RUN_SETUP },
  	};
  	int i;