summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorAndy Parkins <andyparkins@gmail.com>2007-05-14 13:37:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-15 02:03:32 (GMT)
commitaf9b54bb2cb0e15780bf3e820b5f1ce399deb2c4 (patch)
treedc589b574cbadd85b0c573d6b5aed00262e6a693 /convert.c
parent3545193735522f733fdb4e345f16ddf131e2007a (diff)
downloadgit-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.zip
git-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.tar.gz
git-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.tar.bz2
Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
$Id$ is present already in SVN and CVS; it would mean that people converting their existing repositories won't have to make any changes to the source files should they want to make use of the ident attribute. Given that it's a feature that's meant to calm those very people, it seems obtuse to make them edit every file just to make use of it. I think that bzr uses $Id$; Mercurial has examples hooks for $Id$; monotone has $Id$ on its wishlist. I can't think of a good reason not to stick with the de-facto standard and call ours $Id$ instead of $ident$. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'convert.c')
-rw-r--r--convert.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/convert.c b/convert.c
index 9ee31b0..12abdaf 100644
--- a/convert.c
+++ b/convert.c
@@ -412,7 +412,7 @@ static void setup_convert_check(struct git_attr_check *check)
static int count_ident(const char *cp, unsigned long size)
{
/*
- * "$ident: 0000000000000000000000000000000000000000 $" <=> "$ident$"
+ * "$Id: 0000000000000000000000000000000000000000 $" <=> "$Id$"
*/
int cnt = 0;
char ch;
@@ -422,20 +422,20 @@ static int count_ident(const char *cp, unsigned long size)
size--;
if (ch != '$')
continue;
- if (size < 6)
+ if (size < 3)
break;
- if (memcmp("ident", cp, 5))
+ if (memcmp("Id", cp, 2))
continue;
- ch = cp[5];
- cp += 6;
- size -= 6;
+ ch = cp[2];
+ cp += 3;
+ size -= 3;
if (ch == '$')
- cnt++; /* $ident$ */
+ cnt++; /* $Id$ */
if (ch != ':')
continue;
/*
- * "$ident: ... "; scan up to the closing dollar sign and discard.
+ * "$Id: ... "; scan up to the closing dollar sign and discard.
*/
while (size) {
ch = *cp++;
@@ -466,10 +466,10 @@ static char *ident_to_git(const char *path, const char *src, unsigned long *size
for (dst = buf; size; size--) {
char ch = *src++;
*dst++ = ch;
- if ((ch == '$') && (6 <= size) &&
- !memcmp("ident:", src, 6)) {
- unsigned long rem = size - 6;
- const char *cp = src + 6;
+ if ((ch == '$') && (3 <= size) &&
+ !memcmp("Id:", src, 3)) {
+ unsigned long rem = size - 3;
+ const char *cp = src + 3;
do {
ch = *cp++;
if (ch == '$')
@@ -478,8 +478,8 @@ static char *ident_to_git(const char *path, const char *src, unsigned long *size
} while (rem);
if (!rem)
continue;
- memcpy(dst, "ident$", 6);
- dst += 6;
+ memcpy(dst, "Id$", 3);
+ dst += 3;
size -= (cp - src);
src = cp;
}
@@ -511,13 +511,13 @@ static char *ident_to_worktree(const char *path, const char *src, unsigned long
const char *cp;
char ch = *src++;
*dst++ = ch;
- if ((ch != '$') || (size < 6) || memcmp("ident", src, 5))
+ if ((ch != '$') || (size < 3) || memcmp("Id", src, 2))
continue;
- if (src[5] == ':') {
+ if (src[2] == ':') {
/* discard up to but not including the closing $ */
- unsigned long rem = size - 6;
- cp = src + 6;
+ unsigned long rem = size - 3;
+ cp = src + 3;
do {
ch = *cp++;
if (ch == '$')
@@ -527,13 +527,13 @@ static char *ident_to_worktree(const char *path, const char *src, unsigned long
if (!rem)
continue;
size -= (cp - src);
- } else if (src[5] == '$')
- cp = src + 5;
+ } else if (src[2] == '$')
+ cp = src + 2;
else
continue;
- memcpy(dst, "ident: ", 7);
- dst += 7;
+ memcpy(dst, "Id: ", 4);
+ dst += 4;
memcpy(dst, sha1_to_hex(sha1), 40);
dst += 40;
*dst++ = ' ';