path: root/refs.c
diff options
authorJunio C Hamano <>2011-12-09 21:37:09 (GMT)
committerJunio C Hamano <>2011-12-09 21:37:09 (GMT)
commiteb8aa3d2c2849cb3a44396b89054339df38e2bfa (patch)
tree7af351487a380753f89376e78a9c860378d28bfb /refs.c
parenta4043aeafed7962716a513e38ca1d5e192e7e831 (diff)
parent96b8d93a539f3a9f43f0fc38214db8753cac3c2e (diff)
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag: commit-tree: teach -m/-F options to read logs from elsewhere commit-tree: update the command line parsing commit: teach --amend to carry forward extra headers merge: force edit and no-ff mode when merging a tag object commit: copy merged signed tags to headers of merge commit merge: record tag objects without peeling in MERGE_HEAD merge: make usage of commit->util more extensible fmt-merge-msg: Add contents of merged tag in the merge message fmt-merge-msg: package options into a structure fmt-merge-msg: avoid early returns refs DWIMmery: use the same rule for both "git fetch" and others fetch: allow "git fetch $there v1.0" to fetch a tag merge: notice local merging of tags and keep it unwrapped fetch: do not store peeled tag object names in FETCH_HEAD Split GPG interface into its own helper library Conflicts: builtin/fmt-merge-msg.c builtin/merge.c
Diffstat (limited to 'refs.c')
1 files changed, 0 insertions, 7 deletions
diff --git a/refs.c b/refs.c
index e7843eb..c74b6e2 100644
--- a/refs.c
+++ b/refs.c
@@ -998,13 +998,6 @@ const char *ref_rev_parse_rules[] = {
-const char *ref_fetch_rules[] = {
- "%.*s",
- "refs/%.*s",
- "refs/heads/%.*s",
int refname_match(const char *abbrev_name, const char *full_name, const char **rules)
const char **p;