aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-18 17:39:25 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-18 17:39:25 -0700
commit89df580d0a2e97b0c7c072d87e5e815534deed56 (patch)
treea83d7ebc208890d26cb9343a361b8e671d471bde /builtin-apply.c
parentd28840461d9cebd79f1ec30a4117661b41e2c9a3 (diff)
parent8ae674952c8f301034e8ae9dceff38dda740623b (diff)
downloadgit-89df580d0a2e97b0c7c072d87e5e815534deed56.tar.gz
git-89df580d0a2e97b0c7c072d87e5e815534deed56.tar.xz
Merge branch 'maint'
* maint: Fixed update-hook example allow-users format. Documentation/git-svn: updated design philosophy notes t/t4014: test "am -3" with mode-only change. Fix lapsus in builtin-apply.c git-push: documentation and tests for pushing only branches git-svnimport: Use separate arguments in the pipe for git-rev-parse
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 05ce2205f..86d89a4a7 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -254,7 +254,7 @@ static char *find_name(const char *line, char *def, int p_value, int terminate)
if (name) {
char *cp = name;
while (p_value) {
- cp = strchr(name, '/');
+ cp = strchr(cp, '/');
if (!cp)
break;
cp++;