From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] Don't allow newlines to occur in $Id:$ collapse
Date: Fri, 25 May 2007 14:13:42 +0100 [thread overview]
Message-ID: <200705251413.42389.andyparkins@gmail.com> (raw)
In-Reply-To: <200705251412.06196.andyparkins@gmail.com>
If a newline ever made it into an repository-side expanded $Id$ field,
the keyword would still be detected as a keyword and collapsed, before
rexpansion, e.g.
$Id: all of this text would be removed, even if there
were a newline in the middle of it$
This patch catches newlines in this case and abandons treating this as a
keyword expansion, this text would be left untouched in the working
checkout.
Signed-off-by: Andy Parkins <andyparkins@gmail.com>
---
convert.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/convert.c b/convert.c
index 3c44e3d..051366c 100644
--- a/convert.c
+++ b/convert.c
@@ -547,12 +547,14 @@ static char *ident_to_worktree(const char *path, const char *src, unsigned long
ch = *cp;
if (ch == '$')
break;
+ if (ch == '\n')
+ break;
cp++;
rem--;
} while (rem);
/* If the above finished because it ran out of characters, then
* this is an incomplete keyword, so don't run the expansion */
- if (!rem)
+ if (!rem || ch == '\n')
continue;
} else if (src[2] == '$')
cp = src + 2;
--
1.5.2.763.g8c5e-dirty
next prev parent reply other threads:[~2007-05-25 13:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-25 10:50 [PATCH] Fix mishandling of $Id$ expanded in the repository copy in convert.c Andy Parkins
2007-05-25 10:58 ` Joshua N Pritikin
2007-05-25 13:12 ` Andy Parkins
2007-05-25 13:13 ` Andy Parkins [this message]
2007-05-25 13:28 ` [PATCH] Don't allow newlines to occur in $Id:$ collapse Joshua N Pritikin
2007-05-25 13:47 ` Nicolas Pitre
2007-05-25 13:50 ` Andy Parkins
2007-05-25 14:40 ` Joshua N Pritikin
2007-05-26 8:09 ` [PATCH] Fix mishandling of $Id$ expanded in the repository copy in convert.c Junio C Hamano
2007-05-26 9:12 ` Andy Parkins
2007-05-26 19:05 ` Junio C Hamano
2007-05-27 10:50 ` Andy Parkins
2007-05-27 10:52 ` [PATCH] Add test case for $Id$ expanded in the repository Andy Parkins
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200705251413.42389.andyparkins@gmail.com \
--to=andyparkins@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.
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 NNTP newsgroup(s).