summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 19:38:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-20 19:38:10 (GMT)
commitf406140baa5128bfa537c271c7292a866c08b7d4 (patch)
treec52ee64bfc197e86ee928f8e40056f46ab0f7be9 /cache.h
parent005a1de380733477382c50e2e44ed8042c401fed (diff)
parent9ba89f484e023827eca6ad44baf69af37dac4db3 (diff)
downloadgit-f406140baa5128bfa537c271c7292a866c08b7d4.zip
git-f406140baa5128bfa537c271c7292a866c08b7d4.tar.gz
git-f406140baa5128bfa537c271c7292a866c08b7d4.tar.bz2
Merge branch 'fc/at-head'
Instead of typing four capital letters "HEAD", you can say "@" now, e.g. "git log @". * fc/at-head: Add new @ shortcut for HEAD sha1-name: pass len argument to interpret_branch_name()
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index a47b9c0..51d6602 100644
--- a/cache.h
+++ b/cache.h
@@ -880,7 +880,7 @@ extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, i
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);
-extern int interpret_branch_name(const char *str, struct strbuf *);
+extern int interpret_branch_name(const char *str, int len, struct strbuf *);
extern int get_sha1_mb(const char *str, unsigned char *sha1);
extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);