diff options
Diffstat (limited to 'ex/HEAD/diff.html')
| -rw-r--r-- | ex/HEAD/diff.html | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/ex/HEAD/diff.html b/ex/HEAD/diff.html index 847eb24db..6e9ef4d0f 100644 --- a/ex/HEAD/diff.html +++ b/ex/HEAD/diff.html @@ -276,8 +276,8 @@ are not supported in this example</p> </td> <td class=code> <div class='highlight'><pre> <span class="n"><a name="git_diff_free-3" class="fnlink" href="../../#HEAD/group/diff/git_diff_free">git_diff_free</a></span><span class="p">(</span><span class="n">diff</span><span class="p">);</span> - <span class="n"><a name="git_tree_free-18" class="fnlink" href="../../#HEAD/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">t1</span><span class="p">);</span> - <span class="n"><a name="git_tree_free-19" class="fnlink" href="../../#HEAD/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">t2</span><span class="p">);</span> + <span class="n"><a name="git_tree_free-19" class="fnlink" href="../../#HEAD/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">t1</span><span class="p">);</span> + <span class="n"><a name="git_tree_free-20" class="fnlink" href="../../#HEAD/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">t2</span><span class="p">);</span> <span class="k">return</span> <span class="mi">0</span><span class="p">;</span> <span class="p">}</span> @@ -300,15 +300,23 @@ are not supported in this example</p> <span class="n">usage</span><span class="p">(</span><span class="s">"file cannot be read"</span><span class="p">,</span> <span class="n">o</span><span class="o">-></span><span class="n">treeish2</span><span class="p">);</span> <span class="p">}</span> <span class="n">check_lg2</span><span class="p">(</span> - <span class="n"><a name="git_patch_from_buffers-15" class="fnlink" href="../../#HEAD/group/patch/git_patch_from_buffers">git_patch_from_buffers</a></span><span class="p">(</span><span class="o">&</span><span class="n">patch</span><span class="p">,</span> <span class="n">file1_str</span><span class="p">,</span> <span class="n">strlen</span><span class="p">(</span><span class="n">file1_str</span><span class="p">),</span> <span class="n">o</span><span class="o">-></span><span class="n">treeish1</span><span class="p">,</span> <span class="n">file2_str</span><span class="p">,</span> <span class="n">strlen</span><span class="p">(</span><span class="n">file2_str</span><span class="p">),</span> <span class="n">o</span><span class="o">-></span><span class="n">treeish2</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="o">-></span><span class="n">diffopts</span><span class="p">),</span> + <span class="n"><a name="git_patch_from_buffers-16" class="fnlink" href="../../#HEAD/group/patch/git_patch_from_buffers">git_patch_from_buffers</a></span><span class="p">(</span><span class="o">&</span><span class="n">patch</span><span class="p">,</span> <span class="n">file1_str</span><span class="p">,</span> <span class="n">strlen</span><span class="p">(</span><span class="n">file1_str</span><span class="p">),</span> <span class="n">o</span><span class="o">-></span><span class="n">treeish1</span><span class="p">,</span> <span class="n">file2_str</span><span class="p">,</span> <span class="n">strlen</span><span class="p">(</span><span class="n">file2_str</span><span class="p">),</span> <span class="n">o</span><span class="o">-></span><span class="n">treeish2</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="o">-></span><span class="n">diffopts</span><span class="p">),</span> <span class="s">"patch buffers"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> <span class="n">check_lg2</span><span class="p">(</span> - <span class="n"><a name="git_patch_to_buf-17" class="fnlink" href="../../#HEAD/group/patch/git_patch_to_buf">git_patch_to_buf</a></span><span class="p">(</span><span class="o">&</span><span class="n">buf</span><span class="p">,</span> <span class="n">patch</span><span class="p">),</span> + <span class="n"><a name="git_patch_to_buf-18" class="fnlink" href="../../#HEAD/group/patch/git_patch_to_buf">git_patch_to_buf</a></span><span class="p">(</span><span class="o">&</span><span class="n">buf</span><span class="p">,</span> <span class="n">patch</span><span class="p">),</span> <span class="s">"patch to buf"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> + +<span class="cp">#ifdef GIT_EXPERIMENTAL_SHA256</span> + <span class="n">check_lg2</span><span class="p">(</span> + <span class="n"><a name="git_diff_from_buffer-11" class="fnlink" href="../../#HEAD/group/diff/git_diff_from_buffer">git_diff_from_buffer</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">ptr</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">size</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">),</span> + <span class="s">"diff from patch"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> +<span class="cp">#else</span> <span class="n">check_lg2</span><span class="p">(</span> - <span class="n"><a name="git_diff_from_buffer-11" class="fnlink" href="../../#HEAD/group/diff/git_diff_from_buffer">git_diff_from_buffer</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">ptr</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">size</span><span class="p">),</span> + <span class="n"><a name="git_diff_from_buffer-12" class="fnlink" href="../../#HEAD/group/diff/git_diff_from_buffer">git_diff_from_buffer</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">ptr</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">size</span><span class="p">),</span> <span class="s">"diff from patch"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> - <span class="n"><a name="git_patch_free-16" class="fnlink" href="../../#HEAD/group/patch/git_patch_free">git_patch_free</a></span><span class="p">(</span><span class="n">patch</span><span class="p">);</span> +<span class="cp">#endif</span> + + <span class="n"><a name="git_patch_free-17" class="fnlink" href="../../#HEAD/group/patch/git_patch_free">git_patch_free</a></span><span class="p">(</span><span class="n">patch</span><span class="p">);</span> <span class="n"><a name="git_buf_dispose-1" class="fnlink" href="../../#HEAD/group/buf/git_buf_dispose">git_buf_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">buf</span><span class="p">);</span> <span class="n">free</span><span class="p">(</span><span class="n">file1_str</span><span class="p">);</span> <span class="n">free</span><span class="p">(</span><span class="n">file2_str</span><span class="p">);</span> @@ -490,7 +498,7 @@ are not supported in this example</p> <span class="n">git_diff_stats_format_t</span> <span class="n">format</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">check_lg2</span><span class="p">(</span> - <span class="n"><a name="git_diff_get_stats-12" class="fnlink" href="../../#HEAD/group/diff/git_diff_get_stats">git_diff_get_stats</a></span><span class="p">(</span><span class="o">&</span><span class="n">stats</span><span class="p">,</span> <span class="n">diff</span><span class="p">),</span> <span class="s">"generating stats for diff"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> + <span class="n"><a name="git_diff_get_stats-13" class="fnlink" href="../../#HEAD/group/diff/git_diff_get_stats">git_diff_get_stats</a></span><span class="p">(</span><span class="o">&</span><span class="n">stats</span><span class="p">,</span> <span class="n">diff</span><span class="p">),</span> <span class="s">"generating stats for diff"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> <span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="o">-></span><span class="n">output</span> <span class="o">&</span> <span class="n">OUTPUT_STAT</span><span class="p">)</span> <span class="n">format</span> <span class="o">|=</span> <span class="n">GIT_DIFF_STATS_FULL</span><span class="p">;</span> @@ -502,12 +510,12 @@ are not supported in this example</p> <span class="n">format</span> <span class="o">|=</span> <span class="n">GIT_DIFF_STATS_INCLUDE_SUMMARY</span><span class="p">;</span> <span class="n">check_lg2</span><span class="p">(</span> - <span class="n"><a name="git_diff_stats_to_buf-13" class="fnlink" href="../../#HEAD/group/diff/git_diff_stats_to_buf">git_diff_stats_to_buf</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">,</span> <span class="n">stats</span><span class="p">,</span> <span class="n">format</span><span class="p">,</span> <span class="mi">80</span><span class="p">),</span> <span class="s">"formatting stats"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> + <span class="n"><a name="git_diff_stats_to_buf-14" class="fnlink" href="../../#HEAD/group/diff/git_diff_stats_to_buf">git_diff_stats_to_buf</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">,</span> <span class="n">stats</span><span class="p">,</span> <span class="n">format</span><span class="p">,</span> <span class="mi">80</span><span class="p">),</span> <span class="s">"formatting stats"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span> <span class="n">fputs</span><span class="p">(</span><span class="n">b</span><span class="p">.</span><span class="n">ptr</span><span class="p">,</span> <span class="n">stdout</span><span class="p">);</span> <span class="n"><a name="git_buf_dispose-2" class="fnlink" href="../../#HEAD/group/buf/git_buf_dispose">git_buf_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">);</span> - <span class="n"><a name="git_diff_stats_free-14" class="fnlink" href="../../#HEAD/group/diff/git_diff_stats_free">git_diff_stats_free</a></span><span class="p">(</span><span class="n">stats</span><span class="p">);</span> + <span class="n"><a name="git_diff_stats_free-15" class="fnlink" href="../../#HEAD/group/diff/git_diff_stats_free">git_diff_stats_free</a></span><span class="p">(</span><span class="n">stats</span><span class="p">);</span> <span class="p">}</span></pre></div> </td> </tr> |