aboutsummaryrefslogtreecommitdiffstats
path: root/ui-tree.c
diff options
context:
space:
mode:
authorJason A. Donenfeld2013-03-20 20:21:25 +0100
committerJason A. Donenfeld2013-03-20 20:21:25 +0100
commit0255821e22678d4c58c809efe17bf2798835d5b9 (patch)
treed4679ff23796406648cf83ff0b98940ba844c5e1 /ui-tree.c
parent6d8a789d61f3a682bc040f1f7f44050b1f723546 (diff)
parent59fe348deaa270434f05afc56ca8d13618af9ca9 (diff)
downloadcgit-0255821e22678d4c58c809efe17bf2798835d5b9.tar.gz
cgit-0255821e22678d4c58c809efe17bf2798835d5b9.tar.bz2
cgit-0255821e22678d4c58c809efe17bf2798835d5b9.zip
Merge branch 'wip'
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 561f9e7..b692b56 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -271,7 +271,6 @@ void cgit_print_tree(const char *rev, char *path)
271 if (!rev) 271 if (!rev)
272 rev = ctx.qry.head; 272 rev = ctx.qry.head;
273 273
274 walk_tree_ctx.curr_rev = xstrdup(rev);
275 if (get_sha1(rev, sha1)) { 274 if (get_sha1(rev, sha1)) {
276 cgit_print_error(fmt("Invalid revision name: %s", rev)); 275 cgit_print_error(fmt("Invalid revision name: %s", rev));
277 return; 276 return;
@@ -282,12 +281,17 @@ void cgit_print_tree(const char *rev, char *path)
282 return; 281 return;
283 } 282 }
284 283
284 walk_tree_ctx.curr_rev = xstrdup(rev);
285
285 if (path == NULL) { 286 if (path == NULL) {
286 ls_tree(commit->tree->object.sha1, NULL, &walk_tree_ctx); 287 ls_tree(commit->tree->object.sha1, NULL, &walk_tree_ctx);
287 return; 288 goto cleanup;
288 } 289 }
289 290
290 read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); 291 read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
291 if (walk_tree_ctx.state == 1) 292 if (walk_tree_ctx.state == 1)
292 ls_tail(); 293 ls_tail();
294
295cleanup:
296 free(walk_tree_ctx.curr_rev);
293} 297}