summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2007-10-05 08:30:00 +0000
committerJan Holesovsky <kendy@suse.cz>2007-10-05 08:30:00 +0000
commit75bf9cf8bf3514e9a32a0030da4f2ffa6de58259 (patch)
tree6a5398fac15389e0a552a7d33007bed5befea11c /git
parentd61d796c4d63b85d0c1078b2c53757a5f5104d8c (diff)
Patch against cvsps to get one commit for the resyncs or integrations.
Diffstat (limited to 'git')
-rw-r--r--git/cvsps.diff40
1 files changed, 40 insertions, 0 deletions
diff --git a/git/cvsps.diff b/git/cvsps.diff
new file mode 100644
index 000000000..2bb70eb56
--- /dev/null
+++ b/git/cvsps.diff
@@ -0,0 +1,40 @@
+diff --git a/cvsps.c b/cvsps.c
+index 981cd78..a07d1f4 100644
+--- a/cvsps.c
++++ b/cvsps.c
+@@ -3,10 +3,12 @@
+ * See COPYING file for license information
+ */
+
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <limits.h>
++#include <assert.h>
+ #include <unistd.h>
+ #include <search.h>
+ #include <time.h>
+@@ -1212,7 +1214,21 @@ PatchSet * get_patch_set(const char * dte, const char * log, const char * author
+
+ convert_date(&retval->date, dte);
+ retval->author = get_string(author);
+- retval->descr = xstrdup(log);
++ // ooo specific
++ if ( strncmp( "INTEGRATION: CWS ", log, 17 ) == 0 )
++ {
++ const char *space = strchr( log + 17, ' ' );
++ if (space)
++ retval->descr = strndup(log, space - log);
++ else
++ retval->descr = xstrdup(log);
++ }
++ else if ( strncmp( "RESYNC:", log, 7 ) == 0 )
++ {
++ retval->descr = strndup(log, 6);
++ }
++ else
++ retval->descr = xstrdup(log);
+ retval->branch = get_string(branch);
+
+ /* we are looking for a patchset suitable for holding this member.