commit - e33e440b685fac5ee693a2d2072d865d36352e89
commit + abc59930d57a2d46c310e1b0c758c948554bc1af
blob - 2b613840d91ea1cbd89ec43808bfa0f9f99fac58
blob + e7638e1bfc66827e100c0706e810805be3fa972e
--- got/got.c
+++ got/got.c
} else
ref = head_ref;
error = got_pathlist_append(&branches, got_ref_get_name(ref),
- NULL);
+ NULL);
if (error)
goto done;
nbranches++;
old_commit_id, repo);
} else {
err = print_backup_ref(branch_name, refname,
- old_commit_id, old_commit, refs_idmap,
- repo);
+ old_commit_id, old_commit, refs_idmap,
+ repo);
}
if (err)
break;
blob - cad8fd52bf0d74bccf0f30ddd4d2173398530bcc
blob + af38ca1d5e925d9e9b1075a3eedd2f72cf292366
--- gotadmin/gotadmin.c
+++ gotadmin/gotadmin.c
cpa.dry_run = dry_run;
cpa.verbosity = verbosity;
error = got_repo_purge_unreferenced_loose_objects(repo,
- &size_before, &size_after, &npacked, dry_run, ignore_mtime,
- cleanup_progress, &cpa, check_cancelled, NULL);
+ &size_before, &size_after, &npacked, dry_run, ignore_mtime,
+ cleanup_progress, &cpa, check_cancelled, NULL);
if (cpa.printed_something)
printf("\n");
if (error)
blob - 360a75d7bbb481e8975ca6e111ac718511e742a3
blob + 7b22d4ac7703c85955d363ec5f1b20d4c17c9f5d
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
return error;
}
- if ((p = gw_trans->gw_req->fieldmap[KEY_COMMIT_ID])) {
+ if ((p = gw_trans->gw_req->fieldmap[KEY_COMMIT_ID])) {
if (asprintf(&gw_trans->commit_id, "%s",
p->parsed.s) == -1)
return got_error_from_errno("asprintf");
break;
case GOT_OBJ_TYPE_TREE:
error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
- "", "", 3, 0, 0, gw_trans->repo, f);
+ "", "", 3, 0, 0, gw_trans->repo, f);
break;
case GOT_OBJ_TYPE_COMMIT:
error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
blob - 5cf85929bb38eed74f828e89ad78c63e26ce9cca
blob + d9ae4873db1e494d8663703aea78cfee34d5f440
--- include/got_worktree.h
+++ include/got_worktree.h
*/
const struct got_error *
got_worktree_integrate_prepare(struct got_fileindex **,
- struct got_reference **, struct got_reference **,
+ struct got_reference **, struct got_reference **,
struct got_worktree *, const char *, struct got_repository *);
/*
blob - fa402b0446d11c215371183b598bd9573467a1d0
blob + 957c2c39351c73dff16d9995d46aa9be345f27ef
--- lib/diff3.c
+++ lib/diff3.c
SEEK_CUR) == -1)
return got_ferror(d3s->fp[1],
GOT_ERR_IO);
- /* original lines end here */
+ /* original lines end here */
d3s->de[j + 1].oldo.to = off + orig_line_len;
err = repos(nchar, d3s);
if (err)
GOT_DIFF_CONFLICT_MARKER_SEP);
if (err)
return err;
- } else {
- err = diff_output(d3s->diffbuf, "%da\n%s\n",
+ } else {
+ err = diff_output(d3s->diffbuf, "%da\n%s\n",
d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
if (err)
return err;
blob - e60e8eb1808bf28909abf7034ebbce19c0dc5100
blob + ce62cbf5e948bfee2b29b0f0524208b1a15a93e9
--- lib/got_lib_privsep.h
+++ lib/got_lib_privsep.h
struct got_object_id **, char **, struct got_pathlist_head *, char **,
off_t *, uint8_t *, struct imsgbuf *);
const struct got_error *got_privsep_send_send_req(struct imsgbuf *, int,
- struct got_pathlist_head *, struct got_pathlist_head *, int);
+ struct got_pathlist_head *, struct got_pathlist_head *, int);
const struct got_error *got_privsep_recv_send_remote_refs(
struct got_pathlist_head *, struct imsgbuf *);
const struct got_error *got_privsep_send_packfd(struct imsgbuf *, int);
blob - 7f21b68ba60596d4c90ebe7b6ea9618f08bb68f4
blob + 743935e3d21d9086783c3a8645b212424250520e
--- lib/got_lib_repository.h
+++ lib/got_lib_repository.h
int pack_cache_size;
/* Handles to child processes for reading loose objects. */
- struct got_privsep_child privsep_children[5];
+ struct got_privsep_child privsep_children[5];
#define GOT_REPO_PRIVSEP_CHILD_OBJECT 0
#define GOT_REPO_PRIVSEP_CHILD_COMMIT 1
#define GOT_REPO_PRIVSEP_CHILD_TREE 2
blob - 5cb13a52c00956e749c0fce5abb67b88742b17b4
blob + e68e173747b3f8c673775b8a2b0926048e870407
--- lib/inflate.c
+++ lib/inflate.c
const struct got_error *
got_inflate_read(struct got_inflate_buf *zb, FILE *f, size_t *outlenp,
- size_t *consumed)
+ size_t *consumed)
{
size_t last_total_out = zb->z.total_out;
size_t last_total_in = zb->z.total_in;
blob - 4846f5880ced5034d986881b1a612ba1062686af
blob + 990151b1a2bdf4ad27602e91cfa25a19c9786813
--- lib/privsep.c
+++ lib/privsep.c
const struct got_error *
got_privsep_send_fetch_req(struct imsgbuf *ibuf, int fd,
- struct got_pathlist_head *have_refs, int fetch_all_branches,
- struct got_pathlist_head *wanted_branches,
- struct got_pathlist_head *wanted_refs, int list_refs_only, int verbosity)
+ struct got_pathlist_head *have_refs, int fetch_all_branches,
+ struct got_pathlist_head *wanted_branches,
+ struct got_pathlist_head *wanted_refs, int list_refs_only, int verbosity)
{
const struct got_error *err = NULL;
struct ibuf *wbuf;
const struct got_error *
got_privsep_send_send_req(struct imsgbuf *ibuf, int fd,
- struct got_pathlist_head *have_refs,
- struct got_pathlist_head *delete_refs,
- int verbosity)
+ struct got_pathlist_head *have_refs,
+ struct got_pathlist_head *delete_refs,
+ int verbosity)
{
const struct got_error *err = NULL;
struct got_pathlist_entry *pe;
const struct got_error *
got_privsep_send_commit_traversal_request(struct imsgbuf *ibuf,
- struct got_object_id *id, int idx, const char *path)
+ struct got_object_id *id, int idx, const char *path)
{
const struct got_error *err = NULL;
struct ibuf *wbuf;
blob - 6f10967566ee57bb91278a816d22af648bed70e3
blob + fde331d19fb3c439f182eec39b182eb68efe2b4e
--- lib/reference.c
+++ lib/reference.c
const struct got_error *
got_ref_open(struct got_reference **ref, struct got_repository *repo,
- const char *refname, int lock)
+ const char *refname, int lock)
{
const struct got_error *err = NULL;
char *path_refs = NULL;
blob - deb44a1116a2fcd589ff0e0db2fcc4a1c0e2c63d
blob + aefced9489544735f291e942d94b7c3fb6fc5395
--- lib/repository.c
+++ lib/repository.c
* Matched an on-disk path inside repository
* database. Treat input as repository-relative.
*/
- free(path);
- path = canonpath;
- canonpath = NULL;
+ free(path);
+ path = canonpath;
+ canonpath = NULL;
} else {
char *child;
/* Strip common prefix with repository path. */
* Matched unrelated on-disk path.
* Treat input as repository-relative.
*/
- free(path);
- path = canonpath;
- canonpath = NULL;
+ free(path);
+ path = canonpath;
+ canonpath = NULL;
}
}
blob - cf1fd8aad18ee23db95c5c4e6417a650c9b5b15d
blob + 865369efec481b7e7d68445a796d1a075ac52e70
--- lib/repository_admin.c
+++ lib/repository_admin.c
packfd = -1;
err = get_reflist_object_ids(&ours, &nours,
- (1 << GOT_OBJ_TYPE_COMMIT) | (1 << GOT_OBJ_TYPE_TAG),
- include_refs, repo, cancel_cb, cancel_arg);
+ (1 << GOT_OBJ_TYPE_COMMIT) | (1 << GOT_OBJ_TYPE_TAG),
+ include_refs, repo, cancel_cb, cancel_arg);
if (err)
goto done;
if (!TAILQ_EMPTY(exclude_refs)) {
err = get_reflist_object_ids(&theirs, &ntheirs,
- (1 << GOT_OBJ_TYPE_COMMIT) | (1 << GOT_OBJ_TYPE_TAG),
- exclude_refs, repo,
- cancel_cb, cancel_arg);
+ (1 << GOT_OBJ_TYPE_COMMIT) | (1 << GOT_OBJ_TYPE_TAG),
+ exclude_refs, repo,
+ cancel_cb, cancel_arg);
if (err)
goto done;
}
if (strncmp(p, "pack-", 5) != 0) {
err = got_error_fmt(GOT_ERR_BAD_PATH,
- "'%s' is not a valid pack file name",
- packfile_name);
+ "'%s' is not a valid pack file name",
+ packfile_name);
goto done;
}
p += 5;
dot = strchr(p, '.');
if (dot == NULL) {
err = got_error_fmt(GOT_ERR_BAD_PATH,
- "'%s' is not a valid pack file name",
- packfile_name);
+ "'%s' is not a valid pack file name",
+ packfile_name);
goto done;
}
if (strcmp(dot + 1, "pack") != 0) {
err = got_error_fmt(GOT_ERR_BAD_PATH,
- "'%s' is not a valid pack file name",
- packfile_name);
+ "'%s' is not a valid pack file name",
+ packfile_name);
goto done;
}
*dot = '\0';
if (!got_parse_sha1_digest(id.sha1, p)) {
err = got_error_fmt(GOT_ERR_BAD_PATH,
- "'%s' is not a valid pack file name",
- packfile_name);
+ "'%s' is not a valid pack file name",
+ packfile_name);
goto done;
}
* we do in fact have a valid packed copy of the object. Otherwise
* we should not delete the loose representation of this object.
*/
- err = got_object_open_packed(&obj, id, repo);
- if (err == NULL) {
+ err = got_object_open_packed(&obj, id, repo);
+ if (err == NULL) {
got_object_close(obj);
/*
* The object is referenced and packed.
blob - 43f9d955895f646cd52000b292a11000f9ed15d6
blob + e8baa2aceccca3befe0c125fd5902bb082f1315f
--- lib/worktree.c
+++ lib/worktree.c
static const struct got_error *
bump_base_commit_id_everywhere(struct got_worktree *worktree,
- struct got_fileindex *fileindex,
- got_worktree_checkout_cb progress_cb, void *progress_arg)
+ struct got_fileindex *fileindex,
+ got_worktree_checkout_cb progress_cb, void *progress_arg)
{
struct bump_base_commit_id_arg bbc_arg;
{
struct got_worktree *worktree = arg;
- /* Reject merges into a work tree with mixed base commits. */
- if (got_fileindex_entry_has_commit(ie) &&
+ /* Reject merges into a work tree with mixed base commits. */
+ if (got_fileindex_entry_has_commit(ie) &&
memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
SHA1_DIGEST_LENGTH) != 0)
- return got_error(GOT_ERR_MIXED_COMMITS);
+ return got_error(GOT_ERR_MIXED_COMMITS);
return NULL;
}
copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
int start_old, int end_old, int start_new, int end_new,
FILE *outfile, FILE *rejectfile)
- {
+{
const struct got_error *err;
/* Copy old file's lines leading up to patch. */
got_worktree_rebase_abort(struct got_worktree *worktree,
struct got_fileindex *fileindex, struct got_repository *repo,
struct got_reference *new_base_branch,
- got_worktree_checkout_cb progress_cb, void *progress_arg)
+ got_worktree_checkout_cb progress_cb, void *progress_arg)
{
const struct got_error *err, *unlockerr, *sync_err;
struct got_reference *resolved = NULL;
blob - 13c0d957cbd80b960d3cc0a41ff1dc32d6fb4629
blob + 6c97b602a6967eed43b39a0b6cd54fa267cebffe
--- libexec/got-read-gotconfig/parse.y
+++ libexec/got-read-gotconfig/parse.y
}
;
remoteopts2 : remoteopts2 remoteopts1 nl
- | remoteopts1 optnl
+ | remoteopts1 optnl
;
remoteopts1 : REPOSITORY STRING {
- remote->repository = $2;
- }
- | SERVER STRING {
- remote->server = $2;
+ remote->repository = $2;
}
+ | SERVER STRING {
+ remote->server = $2;
+ }
| PROTOCOL STRING {
- remote->protocol = $2;
+ remote->protocol = $2;
}
| MIRROR_REFERENCES boolean {
remote->mirror_references = $2;
YYERROR;
}
} '{' optnl sendempty '}'
- ;
+ ;
fetchempty : /* empty */
| fetchopts2
;
fetchopts2 : fetchopts2 fetchopts1 nl
- | fetchopts1 optnl
+ | fetchopts1 optnl
;
fetchopts1 : REPOSITORY STRING {
- remote->fetch_config->repository = $2;
- }
- | SERVER STRING {
- remote->fetch_config->server = $2;
+ remote->fetch_config->repository = $2;
+ }
+ | SERVER STRING {
+ remote->fetch_config->server = $2;
}
| PROTOCOL STRING {
- remote->fetch_config->protocol = $2;
+ remote->fetch_config->protocol = $2;
}
| PORT portplain {
remote->fetch_config->port = $2;
| BRANCH branch {
remote->fetch_config->branch = $2;
}
- ;
+ ;
sendempty : /* empty */
| sendopts2
;
sendopts2 : sendopts2 sendopts1 nl
- | sendopts1 optnl
+ | sendopts1 optnl
;
sendopts1 : REPOSITORY STRING {
- remote->send_config->repository = $2;
- }
- | SERVER STRING {
- remote->send_config->server = $2;
+ remote->send_config->repository = $2;
}
+ | SERVER STRING {
+ remote->send_config->server = $2;
+ }
| PROTOCOL STRING {
- remote->send_config->protocol = $2;
+ remote->send_config->protocol = $2;
}
| PORT portplain {
remote->send_config->port = $2;
| BRANCH branch {
remote->send_config->branch = $2;
}
- ;
+ ;
remote : REMOTE STRING {
static const struct got_error* error;
}
;
author : AUTHOR STRING {
- gotconfig.author = $2;
+ gotconfig.author = $2;
}
;
optnl : '\n' optnl
blob - fc22714cab99aae6b98600a9b4c3bfdb0815c41c
blob + ac6ef5c2976fe590056d360be5438a4c3f05df4c
--- libexec/got-send-pack/got-send-pack.c
+++ libexec/got-send-pack/got-send-pack.c
goto done;
} else if (strncmp(buf, "ok ", 3) == 0) {
err = send_ref_status(ibuf, buf + 3, 1,
- refs, delete_refs);
+ refs, delete_refs);
if (err)
goto done;
} else if (strncmp(buf, "ng ", 3) == 0) {
