From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 19/26] refs: add expand_ref()
Date: Wed, 13 Apr 2016 19:55:03 +0700 [thread overview]
Message-ID: <1460552110-5554-20-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1460552110-5554-1-git-send-email-pclouds@gmail.com>
This is basically dwim_ref() without @{} support. To be used on the
server side where we want to expand abbreviated to full ref names and
nothing else. The first user is "git clone/fetch --shallow-exclude".
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
refs.c | 8 +++++++-
refs.h | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index e2d34b2..842e4d8 100644
--- a/refs.c
+++ b/refs.c
@@ -392,6 +392,13 @@ static char *substitute_branch_name(const char **string, int *len)
int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
{
char *last_branch = substitute_branch_name(&str, &len);
+ int refs_found = expand_ref(str, len, sha1, ref);
+ free(last_branch);
+ return refs_found;
+}
+
+int expand_ref(const char *str, int len, unsigned char *sha1, char **ref)
+{
const char **p, *r;
int refs_found = 0;
@@ -417,7 +424,6 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
warning("ignoring broken ref %s.", fullref);
}
}
- free(last_branch);
return refs_found;
}
diff --git a/refs.h b/refs.h
index 3c3da29..31a2fa6 100644
--- a/refs.h
+++ b/refs.h
@@ -90,6 +90,7 @@ extern int resolve_gitlink_ref(const char *path, const char *refname, unsigned c
*/
extern int refname_match(const char *abbrev_name, const char *full_name);
+extern int expand_ref(const char *str, int len, unsigned char *sha1, char **ref);
extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
--
2.8.0.rc0.210.gd302cd2
next prev parent reply other threads:[~2016-04-13 12:56 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 12:54 [PATCH 00/26] nd/shallow-deepen updates Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 01/26] remote-curl.c: convert fetch_git() to use argv_array Nguyễn Thái Ngọc Duy
2016-05-25 6:41 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 02/26] transport-helper.c: refactor set_helper_option() Nguyễn Thái Ngọc Duy
2016-05-25 6:47 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 03/26] upload-pack: move shallow deepen code out of receive_needs() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 04/26] upload-pack: move "shallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 05/26] upload-pack: remove unused variable "backup" Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 06/26] upload-pack: move "unshallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 07/26] upload-pack: use skip_prefix() instead of starts_with() Nguyễn Thái Ngọc Duy
2016-05-25 7:02 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 08/26] upload-pack: tighten number parsing at "deepen" lines Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 09/26] upload-pack: move rev-list code out of check_non_tip() Nguyễn Thái Ngọc Duy
2016-05-25 7:36 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 10/26] fetch-pack: use skip_prefix() instead of starts_with() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 11/26] fetch-pack: use a common function for verbose printing Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 12/26] fetch-pack.c: mark strings for translating Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 13/26] fetch-pack: use a separate flag for fetch in deepening mode Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 14/26] shallow.c: implement a generic shallow boundary finder based on rev-list Nguyễn Thái Ngọc Duy
2016-05-27 4:00 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 15/26] upload-pack: add deepen-since to cut shallow repos based on time Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 16/26] fetch: define shallow boundary with --shallow-since Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 17/26] clone: define shallow clone boundary based on time " Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 18/26] t5500, t5539: tests for shallow depth since a specific date Nguyễn Thái Ngọc Duy
2016-06-05 4:43 ` Eric Sunshine
2016-04-13 12:55 ` Nguyễn Thái Ngọc Duy [this message]
2016-04-13 12:55 ` [PATCH 20/26] upload-pack: support define shallow boundary by excluding revisions Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 21/26] fetch: define shallow boundary with --shallow-exclude Nguyễn Thái Ngọc Duy
2016-06-05 5:03 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 22/26] clone: define shallow clone " Nguyễn Thái Ngọc Duy
2016-06-05 5:05 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 23/26] t5500, t5539: tests for shallow depth excluding a ref Nguyễn Thái Ngọc Duy
2016-06-05 5:09 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 24/26] upload-pack: split check_unreachable() in two, prep for get_reachable_list() Nguyễn Thái Ngọc Duy
2016-06-05 19:43 ` Eric Sunshine
2016-06-10 12:14 ` Duy Nguyen
2016-04-13 12:55 ` [PATCH 25/26] upload-pack: add get_reachable_list() Nguyễn Thái Ngọc Duy
2016-06-05 19:51 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 26/26] fetch, upload-pack: --deepen=N extends shallow boundary by N commits Nguyễn Thái Ngọc Duy
2016-04-14 16:12 ` [PATCH 00/26] nd/shallow-deepen updates Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460552110-5554-20-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).