Commit 711d9cd95d584b2dade8466499cbce1984cee332
2019-07-12T14:39:07
eliminate a pointless goto in worktree.c
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/lib/worktree.c b/lib/worktree.c
index 50dd2a7..fef9f1c 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -1697,7 +1697,6 @@ got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
struct got_fileindex *fileindex = NULL;
char *fileindex_path = NULL;
char *relpath = NULL, *entry_name = NULL;
- struct bump_base_commit_id_arg bbc_arg;
int entry_type;
err = lock_worktree(worktree, LOCK_EX);
@@ -1728,18 +1727,17 @@ got_worktree_checkout_files(struct got_worktree *worktree, const char *path,
err = checkout_files(worktree, fileindex, relpath, tree_id, entry_name,
repo, progress_cb, progress_arg, cancel_cb, cancel_arg);
- if (err)
- goto sync;
-
- bbc_arg.base_commit_id = worktree->base_commit_id;
- bbc_arg.entry_name = entry_name;
- bbc_arg.path = path;
- bbc_arg.path_len = strlen(path);
- bbc_arg.progress_cb = progress_cb;
- bbc_arg.progress_arg = progress_arg;
- err = got_fileindex_for_each_entry_safe(fileindex,
- bump_base_commit_id, &bbc_arg);
-sync:
+ if (err == NULL) {
+ struct bump_base_commit_id_arg bbc_arg;
+ bbc_arg.base_commit_id = worktree->base_commit_id;
+ bbc_arg.entry_name = entry_name;
+ bbc_arg.path = path;
+ bbc_arg.path_len = strlen(path);
+ bbc_arg.progress_cb = progress_cb;
+ bbc_arg.progress_arg = progress_arg;
+ err = got_fileindex_for_each_entry_safe(fileindex,
+ bump_base_commit_id, &bbc_arg);
+ }
sync_err = sync_fileindex(fileindex, fileindex_path);
if (sync_err && err == NULL)
err = sync_err;