summaryrefslogtreecommitdiff
path: root/builtin-for-each-ref.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-29 00:16:39 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-29 00:16:39 -0700
commit445cac18c015809a7fcb4a570d3c6571b1ddaf7d (patch)
tree89eeb8e6618d9eb582ea5bd1a2cf781625ebc001 /builtin-for-each-ref.c
parente990501312e22cfa910d88dc7143bc4eb3632ae1 (diff)
parent53d1589ff6bd336e3ece39e0a963a3d2a537cf96 (diff)
downloadgit-445cac18c015809a7fcb4a570d3c6571b1ddaf7d.tar.gz
Merge branch 'maint'
* maint: tutorial: gentler illustration of Alice/Bob workflow using gitk pretty=format: respect date format options make git-shell paranoid about closed stdin/stdout/stderr Document gitk --argscmd flag. Fix '--dirstat' with cross-directory renaming for-each-ref: Allow a trailing slash in the patterns
Diffstat (limited to 'builtin-for-each-ref.c')
-rw-r--r--builtin-for-each-ref.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 4d25ec51d0..21e92bbcb5 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -652,7 +652,8 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f
if ((plen <= namelen) &&
!strncmp(refname, p, plen) &&
(refname[plen] == '\0' ||
- refname[plen] == '/'))
+ refname[plen] == '/' ||
+ p[plen-1] == '/'))
break;
if (!fnmatch(p, refname, FNM_PATHNAME))
break;