int fmt_merge_msg(struct strbuf *in, struct strbuf *out, struct fmt_merge_msg_opts *opts) { int i = 0, pos = 0; unsigned char head_sha1[20]; const char *current_branch; void *current_branch_to_free; /* get current branch */ current_branch = current_branch_to_free = resolve_refdup("HEAD", head_sha1, 1, NULL); if (!current_branch) die("No current branch"); if (!prefixcmp(current_branch, "refs/heads/")) current_branch += 11; /* get a line */ while (pos < in->len) { int len; char *newline, *p = in->buf + pos; newline = strchr(p, '\n'); len = newline ? newline - p : strlen(p); pos += len + !!newline; i++; p[len] = 0; if (handle_line(p)) die ("Error in line %d: %.*s", i, len, p); } if (opts->add_title && srcs.nr) fmt_merge_msg_title(out, current_branch); if (origins.nr) fmt_merge_msg_sigs(out); if (opts->shortlog_len) { struct commit *head; struct rev_info rev; head = lookup_commit_or_die(head_sha1, "HEAD"); init_revisions(&rev, NULL); rev.commit_format = CMIT_FMT_ONELINE; rev.ignore_merges = 1; rev.limited = 1; if (suffixcmp(out->buf, "\n")) strbuf_addch(out, '\n'); for (i = 0; i < origins.nr; i++) shortlog(origins.items[i].string, origins.items[i].util, head, &rev, opts->shortlog_len, out); } strbuf_complete_line(out); free(current_branch_to_free); return 0; }
static void fmt_tag_signature(struct strbuf *tagbuf, struct strbuf *sig, const char *buf, unsigned long len) { const char *tag_body = strstr(buf, "\n\n"); if (tag_body) { tag_body += 2; strbuf_add(tagbuf, tag_body, buf + len - tag_body); } strbuf_complete_line(tagbuf); strbuf_add_lines(tagbuf, "# ", sig->buf, sig->len); }
void strbuf_add_lines(struct strbuf *out, const char *prefix, const char *buf, size_t size) { while (size) { const char *next = memchr(buf, '\n', size); next = next ? (next + 1) : (buf + size); strbuf_addstr(out, prefix); strbuf_add(out, buf, next - buf); size -= next - buf; buf = next; } strbuf_complete_line(out); }
static int opt_parse_m(const struct option *opt, const char *arg, int unset) { struct strbuf *buf = opt->value; if (unset) { have_option_m = 0; strbuf_setlen(buf, 0); } else { have_option_m = 1; if (buf->len) strbuf_addch(buf, '\n'); strbuf_addstr(buf, arg); strbuf_complete_line(buf); } return 0; }
static void add_lines(struct strbuf *out, const char *prefix1, const char *prefix2, const char *buf, size_t size) { while (size) { const char *prefix; const char *next = memchr(buf, '\n', size); next = next ? (next + 1) : (buf + size); prefix = (prefix2 && buf[0] == '\n') ? prefix2 : prefix1; strbuf_addstr(out, prefix); strbuf_add(out, buf, next - buf); size -= next - buf; buf = next; } strbuf_complete_line(out); }
void commit_notes(struct notes_tree *t, const char *msg) { struct strbuf buf = STRBUF_INIT; unsigned char commit_sha1[20]; if (!t) t = &default_notes_tree; if (!t->initialized || !t->ref || !*t->ref) die(_("Cannot commit uninitialized/unreferenced notes tree")); if (!t->dirty) return; /* don't have to commit an unchanged tree */ /* Prepare commit message and reflog message */ strbuf_addstr(&buf, msg); strbuf_complete_line(&buf); create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1); strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */ update_ref(buf.buf, t->ref, commit_sha1, NULL, 0, UPDATE_REFS_DIE_ON_ERR); strbuf_release(&buf); }
int cmd_commit_tree(int argc, const char **argv, const char *prefix) { int i, got_tree = 0; struct commit_list *parents = NULL; unsigned char tree_sha1[20]; unsigned char commit_sha1[20]; struct strbuf buffer = STRBUF_INIT; git_config(commit_tree_config, NULL); if (argc < 2 || !strcmp(argv[1], "-h")) usage(commit_tree_usage); for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (!strcmp(arg, "-p")) { unsigned char sha1[20]; if (argc <= ++i) usage(commit_tree_usage); if (get_sha1_commit(argv[i], sha1)) die("Not a valid object name %s", argv[i]); assert_sha1_type(sha1, OBJ_COMMIT); new_parent(lookup_commit(sha1), &parents); continue; } if (skip_prefix(arg, "-S", &sign_commit)) continue; if (!strcmp(arg, "--no-gpg-sign")) { sign_commit = NULL; continue; } if (!strcmp(arg, "-m")) { if (argc <= ++i) usage(commit_tree_usage); if (buffer.len) strbuf_addch(&buffer, '\n'); strbuf_addstr(&buffer, argv[i]); strbuf_complete_line(&buffer); continue; } if (!strcmp(arg, "-F")) { int fd; if (argc <= ++i) usage(commit_tree_usage); if (buffer.len) strbuf_addch(&buffer, '\n'); if (!strcmp(argv[i], "-")) fd = 0; else { fd = open(argv[i], O_RDONLY); if (fd < 0) die_errno("git commit-tree: failed to open '%s'", argv[i]); } if (strbuf_read(&buffer, fd, 0) < 0) die_errno("git commit-tree: failed to read '%s'", argv[i]); if (fd && close(fd)) die_errno("git commit-tree: failed to close '%s'", argv[i]); strbuf_complete_line(&buffer); continue; } if (get_sha1_tree(arg, tree_sha1)) die("Not a valid object name %s", arg); if (got_tree) die("Cannot give more than one trees"); got_tree = 1; } if (!buffer.len) { if (strbuf_read(&buffer, 0, 0) < 0) die_errno("git commit-tree: failed to read"); } if (commit_tree(buffer.buf, buffer.len, tree_sha1, parents, commit_sha1, NULL, sign_commit)) { strbuf_release(&buffer); return 1; } printf("%s\n", sha1_to_hex(commit_sha1)); strbuf_release(&buffer); return 0; }
int fmt_merge_msg(struct strbuf *in, struct strbuf *out, struct fmt_merge_msg_opts *opts) { int i = 0, pos = 0; unsigned char head_sha1[20]; const char *current_branch; void *current_branch_to_free; struct merge_parents merge_parents; memset(&merge_parents, 0, sizeof(merge_parents)); /* get current branch */ current_branch = current_branch_to_free = resolve_refdup("HEAD", RESOLVE_REF_READING, head_sha1, NULL); if (!current_branch) die("No current branch"); if (starts_with(current_branch, "refs/heads/")) current_branch += 11; find_merge_parents(&merge_parents, in, head_sha1); /* get a line */ while (pos < in->len) { int len; char *newline, *p = in->buf + pos; newline = strchr(p, '\n'); len = newline ? newline - p : strlen(p); pos += len + !!newline; i++; p[len] = 0; if (handle_line(p, &merge_parents)) die ("Error in line %d: %.*s", i, len, p); } if (opts->add_title && srcs.nr) fmt_merge_msg_title(out, current_branch); if (origins.nr) fmt_merge_msg_sigs(out); if (opts->shortlog_len) { struct commit *head; struct rev_info rev; head = lookup_commit_or_die(head_sha1, "HEAD"); init_revisions(&rev, NULL); rev.commit_format = CMIT_FMT_ONELINE; rev.merge_diff_mode = MERGE_DIFF_IGNORE; rev.limited = 1; strbuf_complete_line(out); for (i = 0; i < origins.nr; i++) shortlog(origins.items[i].string, origins.items[i].util, head, &rev, opts, out); } strbuf_complete_line(out); free(current_branch_to_free); free(merge_parents.item); return 0; }