about summary refs log tree commit diff stats
path: root/cmd.c
diff options
context:
space:
mode:
authorJune McEnroe2022-02-13 12:07:49 -0500
committerJune McEnroe2022-02-13 12:10:49 -0500
commit516175469a8c6895496ef909b487992deb45f460 (patch)
treee0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /cmd.c
parentFix crash trying to print "this commit" on 404s (diff)
parentgit: update to v2.32.0 (diff)
downloadcgit-516175469a8c6895496ef909b487992deb45f460.tar.gz
cgit-516175469a8c6895496ef909b487992deb45f460.zip
Merge up to git v2.32.0
Diffstat (limited to 'cmd.c')
-rw-r--r--cmd.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd.c b/cmd.c index bf6d8f5..0eb75b1 100644 --- a/cmd.c +++ b/cmd.c
@@ -74,22 +74,22 @@ static void blame_fn(void)
74 74
75static void blob_fn(void) 75static void blob_fn(void)
76{ 76{
77 cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0); 77 cgit_print_blob(ctx.qry.oid, ctx.qry.path, ctx.qry.head, 0);
78} 78}
79 79
80static void commit_fn(void) 80static void commit_fn(void)
81{ 81{
82 cgit_print_commit(ctx.qry.sha1, ctx.qry.path); 82 cgit_print_commit(ctx.qry.oid, ctx.qry.path);
83} 83}
84 84
85static void diff_fn(void) 85static void diff_fn(void)
86{ 86{
87 cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 0); 87 cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
88} 88}
89 89
90static void rawdiff_fn(void) 90static void rawdiff_fn(void)
91{ 91{
92 cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 1); 92 cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 1);
93} 93}
94 94
95static void info_fn(void) 95static void info_fn(void)
@@ -99,7 +99,7 @@ static void info_fn(void)
99 99
100static void log_fn(void) 100static void log_fn(void)
101{ 101{
102 cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, ctx.cfg.max_commit_count, 102 cgit_print_log(ctx.qry.oid, ctx.qry.ofs, ctx.cfg.max_commit_count,
103 ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1, 103 ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1,
104 ctx.repo->enable_commit_graph, 104 ctx.repo->enable_commit_graph,
105 ctx.repo->commit_sort); 105 ctx.repo->commit_sort);
@@ -125,7 +125,7 @@ static void repolist_fn(void)
125 125
126static void patch_fn(void) 126static void patch_fn(void)
127{ 127{
128 cgit_print_patch(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path); 128 cgit_print_patch(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path);
129} 129}
130 130
131static void plain_fn(void) 131static void plain_fn(void)
@@ -140,7 +140,7 @@ static void refs_fn(void)
140 140
141static void snapshot_fn(void) 141static void snapshot_fn(void)
142{ 142{
143 cgit_print_snapshot(ctx.qry.head, ctx.qry.sha1, ctx.qry.path, 143 cgit_print_snapshot(ctx.qry.head, ctx.qry.oid, ctx.qry.path,
144 ctx.qry.nohead); 144 ctx.qry.nohead);
145} 145}
146 146
@@ -156,12 +156,12 @@ static void summary_fn(void)
156 156
157static void tag_fn(void) 157static void tag_fn(void)
158{ 158{
159 cgit_print_tag(ctx.qry.sha1); 159 cgit_print_tag(ctx.qry.oid);
160} 160}
161 161
162static void tree_fn(void) 162static void tree_fn(void)
163{ 163{
164 cgit_print_tree(ctx.qry.sha1, ctx.qry.path); 164 cgit_print_tree(ctx.qry.oid, ctx.qry.path);
165} 165}
166 166
167#define def_cmd(name, want_repo, want_vpath, is_clone) \ 167#define def_cmd(name, want_repo, want_vpath, is_clone) \