← Back to branch summary

~ubuntu-branches/ubuntu/karmic/git-core/karmic

« back to all changes in this revision

Viewing changes to builtin-log.c

  • Committer: Package Import Robot
  • Author(s): Kees Cook
  • Date: 2008-11-13 15:11:17 UTC
  • mfrom: (1.1.30) (18.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20081113151117-1z51cdgqzhun6e6x
Tags: 1:1.6.0.4-1ubuntu1
* Merge from debian experimental, remaining changes:
  - debian/control:
    - Drop recently introduced cvsps build dependency; it's only necessary
      or some self tests, but is in universe (Ubuntu specific).
    - Added libauthen-sasl-perl on Recommends and libnet-smtp-ssl-perl on
      Depends for git-email (debian bug 505636).

Show diffs side-by-side

added added

removed removed

Lines of Context:
builtin-log.c
313
313
 
314
314
static int show_tree_object(const unsigned char *sha1,
315
315
                const char *base, int baselen,
316
 
                const char *pathname, unsigned mode, int stage)
 
316
                const char *pathname, unsigned mode, int stage, void *context)
317
317
{
318
318
        printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
319
319
        return 0;
366
366
                                        name,
367
367
                                        diff_get_color_opt(&rev.diffopt, DIFF_RESET));
368
368
                        read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
369
 
                                        show_tree_object);
 
369
                                        show_tree_object, NULL);
370
370
                        break;
371
371
                case OBJ_COMMIT:
372
372
                        rev.pending.nr = rev.pending.alloc = 0;
461
461
static void add_header(const char *value)
462
462
{
463
463
        int len = strlen(value);
464
 
        while (value[len - 1] == '\n')
 
464
        while (len && value[len - 1] == '\n')
465
465
                len--;
466
466
        if (!strncasecmp(value, "to: ", 4)) {
467
467
                ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc);
835
835
                        committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
836
836
                        endpos = strchr(committer, '>');
837
837
                        if (!endpos)
838
 
                                die("bogos committer info %s\n", committer);
 
838
                                die("bogus committer info %s\n", committer);
839
839
                        add_signoff = xmemdupz(committer, endpos - committer + 1);
840
840
                }
841
841
                else if (!strcmp(argv[i], "--attach")) {
1082
1082
}
1083
1083
 
1084
1084
static const char cherry_usage[] =
1085
 
"git-cherry [-v] <upstream> [<head>] [<limit>]";
 
1085
"git cherry [-v] <upstream> [<head>] [<limit>]";
1086
1086
int cmd_cherry(int argc, const char **argv, const char *prefix)
1087
1087
{
1088
1088
        struct rev_info revs;