mirror of
https://github.com/libgit2/libgit2.git
synced 2026-01-25 02:56:17 +00:00
generated docs
This commit is contained in:
Documentation Generation
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -131,7 +131,7 @@ on files passed as its parameters.</p>
|
||||
<span class="n">strarray_from_args</span><span class="p">(</span><span class="o">&</span><span class="n">array</span><span class="p">,</span> <span class="o">&</span><span class="n">args</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Grab the repository's index. */</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_index-5" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Could not open repository index"</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_repository_index-5" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Could not open repository index"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Setup a callback if the requested options need it */</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">verbose</span> <span class="o">||</span> <span class="n">options</span><span class="p">.</span><span class="n">dry_run</span><span class="p">)</span> <span class="p">{</span>
|
||||
@@ -142,14 +142,14 @@ on files passed as its parameters.</p>
|
||||
|
||||
<span class="cm">/* Perform the requested action with the index and files */</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">options</span><span class="p">.</span><span class="n">add_update</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_index_update_all-4" class="fnlink" href="../../#v1.6.0/group/index/git_index_update_all">git_index_update_all</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="o">&</span><span class="n">array</span><span class="p">,</span> <span class="n">matched_cb</span><span class="p">,</span> <span class="o">&</span><span class="n">options</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_update_all-4" class="fnlink" href="../../#v1.6.1/group/index/git_index_update_all">git_index_update_all</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="o">&</span><span class="n">array</span><span class="p">,</span> <span class="n">matched_cb</span><span class="p">,</span> <span class="o">&</span><span class="n">options</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_index_add_all-3" class="fnlink" href="../../#v1.6.0/group/index/git_index_add_all">git_index_add_all</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="o">&</span><span class="n">array</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">matched_cb</span><span class="p">,</span> <span class="o">&</span><span class="n">options</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_add_all-3" class="fnlink" href="../../#v1.6.1/group/index/git_index_add_all">git_index_add_all</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="o">&</span><span class="n">array</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">matched_cb</span><span class="p">,</span> <span class="o">&</span><span class="n">options</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Cleanup memory */</span>
|
||||
<span class="n"><a name="git_index_write-2" class="fnlink" href="../../#v1.6.0/group/index/git_index_write">git_index_write</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_free-1" class="fnlink" href="../../#v1.6.0/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_write-2" class="fnlink" href="../../#v1.6.1/group/index/git_index_write">git_index_write</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_free-1" class="fnlink" href="../../#v1.6.1/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
@@ -167,7 +167,7 @@ on files passed as its parameters.</p>
|
||||
<span class="p">(</span><span class="kt">void</span><span class="p">)</span><span class="n">matched_pathspec</span><span class="p">;</span>
|
||||
|
||||
<span class="cm">/* Get the file status */</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_status_file-6" class="fnlink" href="../../#v1.6.0/group/status/git_status_file">git_status_file</a></span><span class="p">(</span><span class="o">&</span><span class="n">status</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_status_file-6" class="fnlink" href="../../#v1.6.1/group/status/git_status_file">git_status_file</a></span><span class="p">(</span><span class="o">&</span><span class="n">status</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">status</span> <span class="o">&</span> <span class="n">GIT_STATUS_WT_MODIFIED</span><span class="p">)</span> <span class="o">||</span> <span class="p">(</span><span class="n">status</span> <span class="o">&</span> <span class="n">GIT_STATUS_WT_NEW</span><span class="p">))</span> <span class="p">{</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -131,15 +131,15 @@ nail down the end points.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">commitspec</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_revparse-23" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse">git_revparse</a></span><span class="p">(</span><span class="o">&</span><span class="n">revspec</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">commitspec</span><span class="p">),</span> <span class="s">"Couldn't parse commit spec"</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_revparse-23" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse">git_revparse</a></span><span class="p">(</span><span class="o">&</span><span class="n">revspec</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">commitspec</span><span class="p">),</span> <span class="s">"Couldn't parse commit spec"</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">revspec</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_REVSPEC_SINGLE</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_cpy-18" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_cpy">git_oid_cpy</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">,</span> <span class="n"><a name="git_object_id-8" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_object_free-12" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_cpy-18" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_cpy">git_oid_cpy</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">,</span> <span class="n"><a name="git_object_id-8" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_object_free-12" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_cpy-19" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_cpy">git_oid_cpy</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">oldest_commit</span><span class="p">,</span> <span class="n"><a name="git_object_id-9" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_cpy-20" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_cpy">git_oid_cpy</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">,</span> <span class="n"><a name="git_object_id-10" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">to</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_object_free-13" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-14" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">to</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_cpy-19" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_cpy">git_oid_cpy</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">oldest_commit</span><span class="p">,</span> <span class="n"><a name="git_object_id-9" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_cpy-20" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_cpy">git_oid_cpy</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">,</span> <span class="n"><a name="git_object_id-10" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">to</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_object_free-13" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-14" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">revspec</span><span class="p">.</span><span class="n">to</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -152,7 +152,7 @@ nail down the end points.</p>
|
||||
<p>Run the blame.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_blame_file-2" class="fnlink" href="../../#v1.6.0/group/blame/git_blame_file">git_blame_file</a></span><span class="p">(</span><span class="o">&</span><span class="n">blame</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">path</span><span class="p">,</span> <span class="o">&</span><span class="n">blameopts</span><span class="p">),</span> <span class="s">"Blame error"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_blame_file-2" class="fnlink" href="../../#v1.6.1/group/blame/git_blame_file">git_blame_file</a></span><span class="p">(</span><span class="o">&</span><span class="n">blame</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">path</span><span class="p">,</span> <span class="o">&</span><span class="n">blameopts</span><span class="p">),</span> <span class="s">"Blame error"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-5'>
|
||||
@@ -164,19 +164,19 @@ nail down the end points.</p>
|
||||
<code>committish:path/to/file.txt</code> format to find it.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_oid_is_zero-21" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_is_zero">git_oid_is_zero</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">))</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_oid_is_zero-21" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_is_zero">git_oid_is_zero</a></span><span class="p">(</span><span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">))</span>
|
||||
<span class="n">strcpy</span><span class="p">(</span><span class="n">spec</span><span class="p">,</span> <span class="s">"HEAD"</span><span class="p">);</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n"><a name="git_oid_tostr-16" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">spec</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">spec</span><span class="p">),</span> <span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_tostr-16" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">spec</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">spec</span><span class="p">),</span> <span class="o">&</span><span class="n">blameopts</span><span class="p">.</span><span class="n">newest_commit</span><span class="p">);</span>
|
||||
<span class="n">strcat</span><span class="p">(</span><span class="n">spec</span><span class="p">,</span> <span class="s">":"</span><span class="p">);</span>
|
||||
<span class="n">strcat</span><span class="p">(</span><span class="n">spec</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">path</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-22" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">spec</span><span class="p">),</span> <span class="s">"Object lookup error"</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_blob_lookup-4" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_lookup">git_blob_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">blob</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_object_id-11" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span> <span class="s">"Blob lookup error"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-15" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-22" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">spec</span><span class="p">),</span> <span class="s">"Object lookup error"</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_blob_lookup-4" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_lookup">git_blob_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">blob</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_object_id-11" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span> <span class="s">"Blob lookup error"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-15" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
|
||||
<span class="n">rawdata</span> <span class="o">=</span> <span class="n"><a name="git_blob_rawcontent-6" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawcontent">git_blob_rawcontent</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span>
|
||||
<span class="n">rawsize</span> <span class="o">=</span> <span class="n"><a name="git_blob_rawsize-7" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawsize">git_blob_rawsize</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span></pre></div>
|
||||
<span class="n">rawdata</span> <span class="o">=</span> <span class="n"><a name="git_blob_rawcontent-6" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawcontent">git_blob_rawcontent</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span>
|
||||
<span class="n">rawsize</span> <span class="o">=</span> <span class="n"><a name="git_blob_rawsize-7" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawsize">git_blob_rawsize</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-6'>
|
||||
@@ -193,7 +193,7 @@ nail down the end points.</p>
|
||||
<span class="k">while</span> <span class="p">(</span><span class="n">i</span> <span class="o"><</span> <span class="n">rawsize</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">eol</span> <span class="o">=</span> <span class="n">memchr</span><span class="p">(</span><span class="n">rawdata</span> <span class="o">+</span> <span class="n">i</span><span class="p">,</span> <span class="sc">'\n'</span><span class="p">,</span> <span class="p">(</span><span class="kt">size_t</span><span class="p">)(</span><span class="n">rawsize</span> <span class="o">-</span> <span class="n">i</span><span class="p">));</span>
|
||||
<span class="kt">char</span> <span class="n">oid</span><span class="p">[</span><span class="mi">10</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="mi">0</span><span class="p">};</span>
|
||||
<span class="k">const</span> <span class="n">git_blame_hunk</span> <span class="o">*</span><span class="n">hunk</span> <span class="o">=</span> <span class="n"><a name="git_blame_get_hunk_byline-1" class="fnlink" href="../../#v1.6.0/group/blame/git_blame_get_hunk_byline">git_blame_get_hunk_byline</a></span><span class="p">(</span><span class="n">blame</span><span class="p">,</span> <span class="n">line</span><span class="p">);</span>
|
||||
<span class="k">const</span> <span class="n">git_blame_hunk</span> <span class="o">*</span><span class="n">hunk</span> <span class="o">=</span> <span class="n"><a name="git_blame_get_hunk_byline-1" class="fnlink" href="../../#v1.6.1/group/blame/git_blame_get_hunk_byline">git_blame_get_hunk_byline</a></span><span class="p">(</span><span class="n">blame</span><span class="p">,</span> <span class="n">line</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">break_on_null_hunk</span> <span class="o">&&</span> <span class="o">!</span><span class="n">hunk</span><span class="p">)</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
@@ -202,7 +202,7 @@ nail down the end points.</p>
|
||||
<span class="kt">char</span> <span class="n">sig</span><span class="p">[</span><span class="mi">128</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="mi">0</span><span class="p">};</span>
|
||||
<span class="n">break_on_null_hunk</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-17" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oid</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="o">&</span><span class="n">hunk</span><span class="o">-></span><span class="n">final_commit_id</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_tostr-17" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oid</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="o">&</span><span class="n">hunk</span><span class="o">-></span><span class="n">final_commit_id</span><span class="p">);</span>
|
||||
<span class="n">snprintf</span><span class="p">(</span><span class="n">sig</span><span class="p">,</span> <span class="mi">30</span><span class="p">,</span> <span class="s">"%s <%s>"</span><span class="p">,</span> <span class="n">hunk</span><span class="o">-></span><span class="n">final_signature</span><span class="o">-></span><span class="n">name</span><span class="p">,</span> <span class="n">hunk</span><span class="o">-></span><span class="n">final_signature</span><span class="o">-></span><span class="n">email</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s ( %-30s %3d) %.*s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
@@ -226,8 +226,8 @@ nail down the end points.</p>
|
||||
<p>Cleanup.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_blob_free-5" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_free">git_blob_free</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_blame_free-3" class="fnlink" href="../../#v1.6.0/group/blame/git_blame_free">git_blame_free</a></span><span class="p">(</span><span class="n">blame</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_blob_free-5" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_free">git_blob_free</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_blame_free-3" class="fnlink" href="../../#v1.6.1/group/blame/git_blame_free">git_blame_free</a></span><span class="p">(</span><span class="n">blame</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -117,7 +117,7 @@
|
||||
<div class='highlight'><pre><span class="k">static</span> <span class="kt">void</span> <span class="nf">show_blob</span><span class="p">(</span><span class="k">const</span> <span class="n">git_blob</span> <span class="o">*</span><span class="n">blob</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="cm">/* ? Does this need crlf filtering? */</span>
|
||||
<span class="n">fwrite</span><span class="p">(</span><span class="n"><a name="git_blob_rawcontent-1" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawcontent">git_blob_rawcontent</a></span><span class="p">(</span><span class="n">blob</span><span class="p">),</span> <span class="p">(</span><span class="kt">size_t</span><span class="p">)</span><span class="n"><a name="git_blob_rawsize-2" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawsize">git_blob_rawsize</a></span><span class="p">(</span><span class="n">blob</span><span class="p">),</span> <span class="mi">1</span><span class="p">,</span> <span class="n">stdout</span><span class="p">);</span>
|
||||
<span class="n">fwrite</span><span class="p">(</span><span class="n"><a name="git_blob_rawcontent-1" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawcontent">git_blob_rawcontent</a></span><span class="p">(</span><span class="n">blob</span><span class="p">),</span> <span class="p">(</span><span class="kt">size_t</span><span class="p">)</span><span class="n"><a name="git_blob_rawsize-2" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawsize">git_blob_rawsize</a></span><span class="p">(</span><span class="n">blob</span><span class="p">),</span> <span class="mi">1</span><span class="p">,</span> <span class="n">stdout</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -131,19 +131,19 @@
|
||||
<td class=code>
|
||||
<div class='highlight'><pre><span class="k">static</span> <span class="kt">void</span> <span class="nf">show_tree</span><span class="p">(</span><span class="k">const</span> <span class="n">git_tree</span> <span class="o">*</span><span class="n">tree</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">,</span> <span class="n">max_i</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_tree_entrycount-37" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entrycount">git_tree_entrycount</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">,</span> <span class="n">max_i</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_tree_entrycount-37" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entrycount">git_tree_entrycount</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="kt">char</span> <span class="n">oidstr</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span> <span class="o">+</span> <span class="mi">1</span><span class="p">];</span>
|
||||
<span class="k">const</span> <span class="n">git_tree_entry</span> <span class="o">*</span><span class="n">te</span><span class="p">;</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">max_i</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">te</span> <span class="o">=</span> <span class="n"><a name="git_tree_entry_byindex-38" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_byindex">git_tree_entry_byindex</a></span><span class="p">(</span><span class="n">tree</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">te</span> <span class="o">=</span> <span class="n"><a name="git_tree_entry_byindex-38" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_byindex">git_tree_entry_byindex</a></span><span class="p">(</span><span class="n">tree</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-24" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_tree_entry_id-40" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_id">git_tree_entry_id</a></span><span class="p">(</span><span class="n">te</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-24" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_tree_entry_id-40" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_id">git_tree_entry_id</a></span><span class="p">(</span><span class="n">te</span><span class="p">));</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%06o %s %s</span><span class="se">\t</span><span class="s">%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_tree_entry_filemode-42" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_filemode">git_tree_entry_filemode</a></span><span class="p">(</span><span class="n">te</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_object_type2string-16" class="fnlink" href="../../#v1.6.0/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_tree_entry_type-41" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_type">git_tree_entry_type</a></span><span class="p">(</span><span class="n">te</span><span class="p">)),</span>
|
||||
<span class="n">oidstr</span><span class="p">,</span> <span class="n"><a name="git_tree_entry_name-39" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_name">git_tree_entry_name</a></span><span class="p">(</span><span class="n">te</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_tree_entry_filemode-42" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_filemode">git_tree_entry_filemode</a></span><span class="p">(</span><span class="n">te</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_object_type2string-16" class="fnlink" href="../../#v1.6.1/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_tree_entry_type-41" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_type">git_tree_entry_type</a></span><span class="p">(</span><span class="n">te</span><span class="p">)),</span>
|
||||
<span class="n">oidstr</span><span class="p">,</span> <span class="n"><a name="git_tree_entry_name-39" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_name">git_tree_entry_name</a></span><span class="p">(</span><span class="n">te</span><span class="p">));</span>
|
||||
<span class="p">}</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -161,34 +161,34 @@
|
||||
<span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">i</span><span class="p">,</span> <span class="n">max_i</span><span class="p">;</span>
|
||||
<span class="kt">char</span> <span class="n">oidstr</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span> <span class="o">+</span> <span class="mi">1</span><span class="p">];</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-25" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_commit_tree_id-7" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_tree_id">git_commit_tree_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-25" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_commit_tree_id-7" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_tree_id">git_commit_tree_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"tree %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oidstr</span><span class="p">);</span>
|
||||
|
||||
<span class="n">max_i</span> <span class="o">=</span> <span class="p">(</span><span class="kt">unsigned</span> <span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_commit_parentcount-8" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">max_i</span> <span class="o">=</span> <span class="p">(</span><span class="kt">unsigned</span> <span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_commit_parentcount-8" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">max_i</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_tostr-26" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_commit_parent_id-9" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parent_id">git_commit_parent_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">,</span> <span class="n">i</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-26" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_commit_parent_id-9" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parent_id">git_commit_parent_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">,</span> <span class="n">i</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"parent %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oidstr</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">print_signature</span><span class="p">(</span><span class="s">"author"</span><span class="p">,</span> <span class="n"><a name="git_commit_author-6" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n">print_signature</span><span class="p">(</span><span class="s">"committer"</span><span class="p">,</span> <span class="n"><a name="git_commit_committer-5" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_committer">git_commit_committer</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n">print_signature</span><span class="p">(</span><span class="s">"author"</span><span class="p">,</span> <span class="n"><a name="git_commit_author-6" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n">print_signature</span><span class="p">(</span><span class="s">"committer"</span><span class="p">,</span> <span class="n"><a name="git_commit_committer-5" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_committer">git_commit_committer</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_commit_message-3" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_commit_message-4" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_commit_message-3" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_commit_message-4" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">void</span> <span class="nf">show_tag</span><span class="p">(</span><span class="k">const</span> <span class="n">git_tag</span> <span class="o">*</span><span class="n">tag</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="kt">char</span> <span class="n">oidstr</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span> <span class="o">+</span> <span class="mi">1</span><span class="p">];</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-27" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_tag_target_id-31" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_target_id">git_tag_target_id</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));;</span>
|
||||
<span class="n"><a name="git_oid_tostr-27" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_tag_target_id-31" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_target_id">git_tag_target_id</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));;</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"object %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oidstr</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"type %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_object_type2string-17" class="fnlink" href="../../#v1.6.0/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_tag_target_type-32" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_target_type">git_tag_target_type</a></span><span class="p">(</span><span class="n">tag</span><span class="p">)));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"tag %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_tag_name-33" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_name">git_tag_name</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
<span class="n">print_signature</span><span class="p">(</span><span class="s">"tagger"</span><span class="p">,</span> <span class="n"><a name="git_tag_tagger-34" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_tagger">git_tag_tagger</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"type %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_object_type2string-17" class="fnlink" href="../../#v1.6.1/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_tag_target_type-32" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_target_type">git_tag_target_type</a></span><span class="p">(</span><span class="n">tag</span><span class="p">)));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"tag %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_tag_name-33" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_name">git_tag_name</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
<span class="n">print_signature</span><span class="p">(</span><span class="s">"tagger"</span><span class="p">,</span> <span class="n"><a name="git_tag_tagger-34" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_tagger">git_tag_tagger</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_tag_message-35" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">))</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_tag_message-36" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_tag_message-35" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">))</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_tag_message-36" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">typedef</span> <span class="k">enum</span> <span class="p">{</span>
|
||||
@@ -225,33 +225,33 @@
|
||||
|
||||
<span class="n">parse_opts</span><span class="p">(</span><span class="o">&</span><span class="n">o</span><span class="p">,</span> <span class="n">argc</span><span class="p">,</span> <span class="n">argv</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-30" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">rev</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-30" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">rev</span><span class="p">),</span>
|
||||
<span class="s">"Could not resolve"</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">rev</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">verbose</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="kt">char</span> <span class="n">oidstr</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span> <span class="o">+</span> <span class="mi">1</span><span class="p">];</span>
|
||||
<span class="n"><a name="git_oid_tostr-28" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_object_id-10" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-28" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">oidstr</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oidstr</span><span class="p">),</span> <span class="n"><a name="git_object_id-10" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">));</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s %s</span><span class="se">\n</span><span class="s">--</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_object_type2string-18" class="fnlink" href="../../#v1.6.0/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_object_type-12" class="fnlink" href="../../#v1.6.0/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span> <span class="n">oidstr</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_type2string-18" class="fnlink" href="../../#v1.6.1/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_object_type-12" class="fnlink" href="../../#v1.6.1/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span> <span class="n">oidstr</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">action</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">case</span> <span class="nl">SHOW_TYPE</span><span class="p">:</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_object_type2string-19" class="fnlink" href="../../#v1.6.0/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_object_type-13" class="fnlink" href="../../#v1.6.0/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_object_type2string-19" class="fnlink" href="../../#v1.6.1/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n"><a name="git_object_type-13" class="fnlink" href="../../#v1.6.1/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)));</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
<span class="k">case</span> <span class="nl">SHOW_SIZE</span><span class="p">:</span> <span class="p">{</span>
|
||||
<span class="n">git_odb</span> <span class="o">*</span><span class="n">odb</span><span class="p">;</span>
|
||||
<span class="n">git_odb_object</span> <span class="o">*</span><span class="n">odbobj</span><span class="p">;</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_odb-29" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_odb">git_repository_odb</a></span><span class="p">(</span><span class="o">&</span><span class="n">odb</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Could not open ODB"</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_odb_read-21" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_read">git_odb_read</a></span><span class="p">(</span><span class="o">&</span><span class="n">odbobj</span><span class="p">,</span> <span class="n">odb</span><span class="p">,</span> <span class="n"><a name="git_object_id-11" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_odb-29" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_odb">git_repository_odb</a></span><span class="p">(</span><span class="o">&</span><span class="n">odb</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Could not open ODB"</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_odb_read-21" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_read">git_odb_read</a></span><span class="p">(</span><span class="o">&</span><span class="n">odbobj</span><span class="p">,</span> <span class="n">odb</span><span class="p">,</span> <span class="n"><a name="git_object_id-11" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span>
|
||||
<span class="s">"Could not find obj"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%ld</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">long</span><span class="p">)</span><span class="n"><a name="git_odb_object_size-23" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_object_size">git_odb_object_size</a></span><span class="p">(</span><span class="n">odbobj</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%ld</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">long</span><span class="p">)</span><span class="n"><a name="git_odb_object_size-23" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_object_size">git_odb_object_size</a></span><span class="p">(</span><span class="n">odbobj</span><span class="p">));</span>
|
||||
|
||||
<span class="n"><a name="git_odb_object_free-22" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_object_free">git_odb_object_free</a></span><span class="p">(</span><span class="n">odbobj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_odb_free-20" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_free">git_odb_free</a></span><span class="p">(</span><span class="n">odb</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_odb_object_free-22" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_object_free">git_odb_object_free</a></span><span class="p">(</span><span class="n">odbobj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_odb_free-20" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_free">git_odb_free</a></span><span class="p">(</span><span class="n">odb</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
<span class="k">case</span> <span class="nl">SHOW_NONE</span><span class="p">:</span>
|
||||
@@ -259,7 +259,7 @@
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
<span class="k">case</span> <span class="nl">SHOW_PRETTY</span><span class="p">:</span>
|
||||
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n"><a name="git_object_type-14" class="fnlink" href="../../#v1.6.0/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n"><a name="git_object_type-14" class="fnlink" href="../../#v1.6.1/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">case</span> <span class="nl">GIT_OBJECT_BLOB</span><span class="p">:</span>
|
||||
<span class="n">show_blob</span><span class="p">((</span><span class="k">const</span> <span class="n">git_blob</span> <span class="o">*</span><span class="p">)</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
@@ -279,7 +279,7 @@
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_object_free-15" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-15" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -236,9 +236,9 @@ a branch-based checkout.</p>
|
||||
<p>Grab the commit we're interested to move to</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_commit_lookup-9" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">target_commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_annotated_commit_id-2" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">target</span><span class="p">));</span>
|
||||
<div class='highlight'><pre> <span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_commit_lookup-9" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">target_commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_annotated_commit_id-2" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">target</span><span class="p">));</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to lookup commit: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-11" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to lookup commit: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-11" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -255,9 +255,9 @@ contains.</p>
|
||||
peeled to a tree.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_checkout_tree-8" class="fnlink" href="../../#v1.6.0/group/checkout/git_checkout_tree">git_checkout_tree</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="p">(</span><span class="k">const</span> <span class="n">git_object</span> <span class="o">*</span><span class="p">)</span><span class="n">target_commit</span><span class="p">,</span> <span class="o">&</span><span class="n">checkout_opts</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_checkout_tree-8" class="fnlink" href="../../#v1.6.1/group/checkout/git_checkout_tree">git_checkout_tree</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="p">(</span><span class="k">const</span> <span class="n">git_object</span> <span class="o">*</span><span class="p">)</span><span class="n">target_commit</span><span class="p">,</span> <span class="o">&</span><span class="n">checkout_opts</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to checkout tree: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-12" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to checkout tree: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-12" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -273,35 +273,35 @@ peeled to a tree.</p>
|
||||
we might need to detach HEAD.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_annotated_commit_ref-3" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_ref">git_annotated_commit_ref</a></span><span class="p">(</span><span class="n">target</span><span class="p">))</span> <span class="p">{</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_annotated_commit_ref-3" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_ref">git_annotated_commit_ref</a></span><span class="p">(</span><span class="n">target</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">target_head</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_lookup-15" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_annotated_commit_ref-4" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_ref">git_annotated_commit_ref</a></span><span class="p">(</span><span class="n">target</span><span class="p">)))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_lookup-15" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_annotated_commit_ref-4" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_ref">git_annotated_commit_ref</a></span><span class="p">(</span><span class="n">target</span><span class="p">)))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">error</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_reference_is_remote-21" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_is_remote">git_reference_is_remote</a></span><span class="p">(</span><span class="n">ref</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_branch_create_from_annotated-7" class="fnlink" href="../../#v1.6.0/group/branch/git_branch_create_from_annotated">git_branch_create_from_annotated</a></span><span class="p">(</span><span class="o">&</span><span class="n">branch</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">target_ref</span><span class="p">,</span> <span class="n">target</span><span class="p">,</span> <span class="mi">0</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_reference_is_remote-21" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_is_remote">git_reference_is_remote</a></span><span class="p">(</span><span class="n">ref</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_branch_create_from_annotated-7" class="fnlink" href="../../#v1.6.1/group/branch/git_branch_create_from_annotated">git_branch_create_from_annotated</a></span><span class="p">(</span><span class="o">&</span><span class="n">branch</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">target_ref</span><span class="p">,</span> <span class="n">target</span><span class="p">,</span> <span class="mi">0</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="n">target_head</span> <span class="o">=</span> <span class="n"><a name="git_reference_name-17" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_name">git_reference_name</a></span><span class="p">(</span><span class="n">branch</span><span class="p">);</span>
|
||||
<span class="n">target_head</span> <span class="o">=</span> <span class="n"><a name="git_reference_name-17" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_name">git_reference_name</a></span><span class="p">(</span><span class="n">branch</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n">target_head</span> <span class="o">=</span> <span class="n"><a name="git_annotated_commit_ref-5" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_ref">git_annotated_commit_ref</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="n">target_head</span> <span class="o">=</span> <span class="n"><a name="git_annotated_commit_ref-5" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_ref">git_annotated_commit_ref</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_repository_set_head-23" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_set_head">git_repository_set_head</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target_head</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_repository_set_head-23" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_set_head">git_repository_set_head</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target_head</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_repository_set_head_detached_from_annotated-24" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_set_head_detached_from_annotated">git_repository_set_head_detached_from_annotated</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_repository_set_head_detached_from_annotated-24" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_set_head_detached_from_annotated">git_repository_set_head_detached_from_annotated</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="nl">error</span><span class="p">:</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to update HEAD reference: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-13" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to update HEAD reference: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-13" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="nl">cleanup</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_commit_free-10" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">target_commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-18" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">branch</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-19" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-10" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">target_commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-18" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">branch</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-19" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">err</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -329,7 +329,7 @@ to check whether the ref is unique across all remotes.</p>
|
||||
<span class="kt">int</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_list-22" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_list">git_remote_list</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">,</span> <span class="n">repo</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_list-22" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_list">git_remote_list</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">,</span> <span class="n">repo</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">out</span><span class="p">;</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">remotes</span><span class="p">.</span><span class="n">count</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
@@ -343,7 +343,7 @@ to check whether the ref is unique across all remotes.</p>
|
||||
<span class="p">}</span>
|
||||
<span class="n">snprintf</span><span class="p">(</span><span class="n">refname</span><span class="p">,</span> <span class="n">reflen</span> <span class="o">+</span> <span class="mi">1</span><span class="p">,</span> <span class="s">"refs/remotes/%s/%s"</span><span class="p">,</span> <span class="n">remotes</span><span class="p">.</span><span class="n">strings</span><span class="p">[</span><span class="n">i</span><span class="p">],</span> <span class="n">ref</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_reference_lookup-16" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">refname</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_reference_lookup-16" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">refname</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">next</span><span class="p">;</span>
|
||||
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
@@ -358,12 +358,12 @@ to check whether the ref is unique across all remotes.</p>
|
||||
<span class="k">goto</span> <span class="n">out</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_annotated_commit_from_ref-1" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_from_ref">git_annotated_commit_from_ref</a></span><span class="p">(</span><span class="n">out</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">remote_ref</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_annotated_commit_from_ref-1" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_from_ref">git_annotated_commit_from_ref</a></span><span class="p">(</span><span class="n">out</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">remote_ref</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">out</span><span class="p">;</span>
|
||||
|
||||
<span class="nl">out</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_reference_free-20" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">remote_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_strarray_dispose-26" class="fnlink" href="../../#v1.6.0/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-20" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">remote_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_strarray_dispose-26" class="fnlink" href="../../#v1.6.1/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -405,7 +405,7 @@ to check whether the ref is unique across all remotes.</p>
|
||||
<p>Make sure we're not about to checkout while something else is going on</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">state</span> <span class="o">=</span> <span class="n"><a name="git_repository_state-25" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_state">git_repository_state</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">state</span> <span class="o">=</span> <span class="n"><a name="git_repository_state-25" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_state">git_repository_state</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">state</span> <span class="o">!=</span> <span class="n">GIT_REPOSITORY_STATE_NONE</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"repository is in unexpected state %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">state</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
@@ -439,14 +439,14 @@ to check whether the ref is unique across all remotes.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n">resolve_refish</span><span class="p">(</span><span class="o">&</span><span class="n">checkout_target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">args</span><span class="p">.</span><span class="n">argv</span><span class="p">[</span><span class="n">args</span><span class="p">.</span><span class="n">pos</span><span class="p">]))</span> <span class="o"><</span> <span class="mi">0</span> <span class="o">&&</span>
|
||||
<span class="p">(</span><span class="n">err</span> <span class="o">=</span> <span class="n">guess_refish</span><span class="p">(</span><span class="o">&</span><span class="n">checkout_target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">args</span><span class="p">.</span><span class="n">argv</span><span class="p">[</span><span class="n">args</span><span class="p">.</span><span class="n">pos</span><span class="p">]))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to resolve %s: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">args</span><span class="p">.</span><span class="n">argv</span><span class="p">[</span><span class="n">args</span><span class="p">.</span><span class="n">pos</span><span class="p">],</span> <span class="n"><a name="git_error_last-14" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to resolve %s: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">args</span><span class="p">.</span><span class="n">argv</span><span class="p">[</span><span class="n">args</span><span class="p">.</span><span class="n">pos</span><span class="p">],</span> <span class="n"><a name="git_error_last-14" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n">perform_checkout_ref</span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">checkout_target</span><span class="p">,</span> <span class="n">args</span><span class="p">.</span><span class="n">argv</span><span class="p">[</span><span class="n">args</span><span class="p">.</span><span class="n">pos</span><span class="p">],</span> <span class="o">&</span><span class="n">opts</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="nl">cleanup</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_annotated_commit_free-6" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_free">git_annotated_commit_free</a></span><span class="p">(</span><span class="n">checkout_target</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_annotated_commit_free-6" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_free">git_annotated_commit_free</a></span><span class="p">(</span><span class="n">checkout_target</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">err</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -124,25 +124,25 @@ simulate <code>git commit</code> with the commit message argument.</p>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_revparse_ext-9" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_ext">git_revparse_ext</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="o">&</span><span class="n">ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"HEAD"</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_revparse_ext-9" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_ext">git_revparse_ext</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="o">&</span><span class="n">ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"HEAD"</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">error</span> <span class="o">==</span> <span class="n">GIT_ENOTFOUND</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"HEAD not found. Creating first commit</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">error</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="n">git_error</span> <span class="o">*</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_error_last-2" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">();</span>
|
||||
<span class="k">const</span> <span class="n">git_error</span> <span class="o">*</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_error_last-2" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">();</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="n">printf</span><span class="p">(</span><span class="s">"ERROR %d: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">err</span><span class="o">-></span><span class="n">klass</span><span class="p">,</span> <span class="n">err</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">else</span> <span class="n">printf</span><span class="p">(</span><span class="s">"ERROR %d: no detailed info</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">error</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_repository_index-8" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Could not open repository index"</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_index_write_tree-5" class="fnlink" href="../../#v1.6.0/group/index/git_index_write_tree">git_index_write_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree_oid</span><span class="p">,</span> <span class="n">index</span><span class="p">),</span> <span class="s">"Could not write tree"</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_index_write-4" class="fnlink" href="../../#v1.6.0/group/index/git_index_write">git_index_write</a></span><span class="p">(</span><span class="n">index</span><span class="p">),</span> <span class="s">"Could not write index"</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_repository_index-8" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Could not open repository index"</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_index_write_tree-5" class="fnlink" href="../../#v1.6.1/group/index/git_index_write_tree">git_index_write_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree_oid</span><span class="p">,</span> <span class="n">index</span><span class="p">),</span> <span class="s">"Could not write tree"</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_index_write-4" class="fnlink" href="../../#v1.6.1/group/index/git_index_write">git_index_write</a></span><span class="p">(</span><span class="n">index</span><span class="p">),</span> <span class="s">"Could not write index"</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_tree_lookup-12" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_oid</span><span class="p">),</span> <span class="s">"Error looking up tree"</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_tree_lookup-12" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_oid</span><span class="p">),</span> <span class="s">"Error looking up tree"</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_signature_default-10" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_default">git_signature_default</a></span><span class="p">(</span><span class="o">&</span><span class="n">signature</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Error creating signature"</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_signature_default-10" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_default">git_signature_default</a></span><span class="p">(</span><span class="o">&</span><span class="n">signature</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"Error creating signature"</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_commit_create_v-1" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_create_v">git_commit_create_v</a></span><span class="p">(</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_commit_create_v-1" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_create_v">git_commit_create_v</a></span><span class="p">(</span>
|
||||
<span class="o">&</span><span class="n">commit_oid</span><span class="p">,</span>
|
||||
<span class="n">repo</span><span class="p">,</span>
|
||||
<span class="s">"HEAD"</span><span class="p">,</span>
|
||||
@@ -153,11 +153,11 @@ simulate <code>git commit</code> with the commit message argument.</p>
|
||||
<span class="n">tree</span><span class="p">,</span>
|
||||
<span class="n">parent</span> <span class="o">?</span> <span class="mi">1</span> <span class="o">:</span> <span class="mi">0</span><span class="p">,</span> <span class="n">parent</span><span class="p">),</span> <span class="s">"Error creating commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_index_free-3" class="fnlink" href="../../#v1.6.0/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-11" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">signature</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-13" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-6" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-7" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_free-3" class="fnlink" href="../../#v1.6.1/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-11" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">signature</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-13" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-6" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-7" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -86,24 +86,24 @@
|
||||
<span class="n">git_config_entry</span> <span class="o">*</span><span class="n">entry</span><span class="p">;</span>
|
||||
<span class="kt">int</span> <span class="n">error</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_config_get_entry-4" class="fnlink" href="../../#v1.6.0/group/config/git_config_get_entry">git_config_get_entry</a></span><span class="p">(</span><span class="o">&</span><span class="n">entry</span><span class="p">,</span> <span class="n">cfg</span><span class="p">,</span> <span class="n">key</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_config_get_entry-4" class="fnlink" href="../../#v1.6.1/group/config/git_config_get_entry">git_config_get_entry</a></span><span class="p">(</span><span class="o">&</span><span class="n">entry</span><span class="p">,</span> <span class="n">cfg</span><span class="p">,</span> <span class="n">key</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">error</span> <span class="o">!=</span> <span class="n">GIT_ENOTFOUND</span><span class="p">)</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Unable to get configuration: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-6" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Unable to get configuration: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-6" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">puts</span><span class="p">(</span><span class="n">entry</span><span class="o">-></span><span class="n">value</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Free the git_config_entry after use with `<a name="git_config_entry_free-1" class="fnlink" href="../../#v1.6.0/group/config/git_config_entry_free">git_config_entry_free</a>()`. */</span>
|
||||
<span class="n"><a name="git_config_entry_free-2" class="fnlink" href="../../#v1.6.0/group/config/git_config_entry_free">git_config_entry_free</a></span><span class="p">(</span><span class="n">entry</span><span class="p">);</span>
|
||||
<span class="cm">/* Free the git_config_entry after use with `<a name="git_config_entry_free-1" class="fnlink" href="../../#v1.6.1/group/config/git_config_entry_free">git_config_entry_free</a>()`. */</span>
|
||||
<span class="n"><a name="git_config_entry_free-2" class="fnlink" href="../../#v1.6.1/group/config/git_config_entry_free">git_config_entry_free</a></span><span class="p">(</span><span class="n">entry</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">int</span> <span class="nf">config_set</span><span class="p">(</span><span class="n">git_config</span> <span class="o">*</span><span class="n">cfg</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">key</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">value</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_config_set_string-5" class="fnlink" href="../../#v1.6.0/group/config/git_config_set_string">git_config_set_string</a></span><span class="p">(</span><span class="n">cfg</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Unable to set configuration: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-7" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_config_set_string-5" class="fnlink" href="../../#v1.6.1/group/config/git_config_set_string">git_config_set_string</a></span><span class="p">(</span><span class="n">cfg</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Unable to set configuration: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-7" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -114,8 +114,8 @@
|
||||
<span class="n">git_config</span> <span class="o">*</span><span class="n">cfg</span><span class="p">;</span>
|
||||
<span class="kt">int</span> <span class="n">error</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_config-9" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_config">git_repository_config</a></span><span class="p">(</span><span class="o">&</span><span class="n">cfg</span><span class="p">,</span> <span class="n">repo</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Unable to obtain repository config: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-8" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_config-9" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_config">git_repository_config</a></span><span class="p">(</span><span class="o">&</span><span class="n">cfg</span><span class="p">,</span> <span class="n">repo</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Unable to obtain repository config: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_error_last-8" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">out</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
@@ -139,7 +139,7 @@ being used by the user.</p>
|
||||
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_config_free-3" class="fnlink" href="../../#v1.6.0/group/config/git_config_free">git_config_free</a></span><span class="p">(</span><span class="n">cfg</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_config_free-3" class="fnlink" href="../../#v1.6.1/group/config/git_config_free">git_config_free</a></span><span class="p">(</span><span class="n">cfg</span><span class="p">);</span>
|
||||
<span class="nl">out</span><span class="p">:</span>
|
||||
<span class="k">return</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -146,17 +146,17 @@ all of the use cases.</p>
|
||||
<span class="n">git_buf</span> <span class="n">buf</span> <span class="o">=</span> <span class="p">{</span> <span class="mi">0</span> <span class="p">};</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">rev</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_revparse_single-6" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">rev</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-6" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">rev</span><span class="p">),</span>
|
||||
<span class="s">"Failed to lookup rev"</span><span class="p">,</span> <span class="n">rev</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_describe_commit-3" class="fnlink" href="../../#v1.6.0/group/describe/git_describe_commit">git_describe_commit</a></span><span class="p">(</span><span class="o">&</span><span class="n">describe_result</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">describe_options</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_describe_commit-3" class="fnlink" href="../../#v1.6.1/group/describe/git_describe_commit">git_describe_commit</a></span><span class="p">(</span><span class="o">&</span><span class="n">describe_result</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">describe_options</span><span class="p">),</span>
|
||||
<span class="s">"Failed to describe rev"</span><span class="p">,</span> <span class="n">rev</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_describe_workdir-4" class="fnlink" href="../../#v1.6.0/group/describe/git_describe_workdir">git_describe_workdir</a></span><span class="p">(</span><span class="o">&</span><span class="n">describe_result</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">describe_options</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_describe_workdir-4" class="fnlink" href="../../#v1.6.1/group/describe/git_describe_workdir">git_describe_workdir</a></span><span class="p">(</span><span class="o">&</span><span class="n">describe_result</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">describe_options</span><span class="p">),</span>
|
||||
<span class="s">"Failed to describe workdir"</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_describe_format-5" class="fnlink" href="../../#v1.6.0/group/describe/git_describe_format">git_describe_format</a></span><span class="p">(</span><span class="o">&</span><span class="n">buf</span><span class="p">,</span> <span class="n">describe_result</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">format_options</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_describe_format-5" class="fnlink" href="../../#v1.6.1/group/describe/git_describe_format">git_describe_format</a></span><span class="p">(</span><span class="o">&</span><span class="n">buf</span><span class="p">,</span> <span class="n">describe_result</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">format_options</span><span class="p">),</span>
|
||||
<span class="s">"Failed to format describe rev"</span><span class="p">,</span> <span class="n">rev</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">buf</span><span class="p">.</span><span class="n">ptr</span><span class="p">);</span>
|
||||
@@ -246,8 +246,8 @@ all of the use cases.</p>
|
||||
|
||||
<span class="n">opts</span><span class="o">-></span><span class="n">commits</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span>
|
||||
<span class="n">opts</span><span class="o">-></span><span class="n">commit_count</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="n"><a name="git_describe_options_init-1" class="fnlink" href="../../#v1.6.0/group/describe/git_describe_options_init">git_describe_options_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">describe_options</span><span class="p">,</span> <span class="n">GIT_DESCRIBE_OPTIONS_VERSION</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_describe_format_options_init-2" class="fnlink" href="../../#v1.6.0/group/describe/git_describe_format_options_init">git_describe_format_options_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">format_options</span><span class="p">,</span> <span class="n">GIT_DESCRIBE_FORMAT_OPTIONS_VERSION</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_describe_options_init-1" class="fnlink" href="../../#v1.6.1/group/describe/git_describe_options_init">git_describe_options_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">describe_options</span><span class="p">,</span> <span class="n">GIT_DESCRIBE_OPTIONS_VERSION</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_describe_format_options_init-2" class="fnlink" href="../../#v1.6.1/group/describe/git_describe_format_options_init">git_describe_format_options_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="o">-></span><span class="n">format_options</span><span class="p">,</span> <span class="n">GIT_DESCRIBE_FORMAT_OPTIONS_VERSION</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="kt">int</span> <span class="nf">lg2_describe</span><span class="p">(</span><span class="n">git_repository</span> <span class="o">*</span><span class="n">repo</span><span class="p">,</span> <span class="kt">int</span> <span class="n">argc</span><span class="p">,</span> <span class="kt">char</span> <span class="o">**</span><span class="n">argv</span><span class="p">)</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -200,7 +200,7 @@ are not supported in this example</p>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">t1</span> <span class="o">&&</span> <span class="n">t2</span><span class="p">)</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_tree_to_tree-4" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_tree_to_tree">git_diff_tree_to_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="n">t2</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_tree_to_tree-4" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_tree_to_tree">git_diff_tree_to_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="n">t2</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="s">"diff trees"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">cache</span> <span class="o">!=</span> <span class="n">CACHE_NORMAL</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">t1</span><span class="p">)</span>
|
||||
@@ -208,20 +208,20 @@ are not supported in this example</p>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">cache</span> <span class="o">==</span> <span class="n">CACHE_NONE</span><span class="p">)</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_tree_to_workdir-7" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_tree_to_workdir">git_diff_tree_to_workdir</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_tree_to_workdir-7" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_tree_to_workdir">git_diff_tree_to_workdir</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="s">"diff tree to working directory"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_tree_to_index-5" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_tree_to_index">git_diff_tree_to_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_tree_to_index-5" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_tree_to_index">git_diff_tree_to_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="s">"diff tree to index"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">t1</span><span class="p">)</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_tree_to_workdir_with_index-8" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_tree_to_workdir_with_index">git_diff_tree_to_workdir_with_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_tree_to_workdir_with_index-8" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_tree_to_workdir_with_index">git_diff_tree_to_workdir_with_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">t1</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="s">"diff tree to working directory"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_index_to_workdir-6" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_index_to_workdir">git_diff_index_to_workdir</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_index_to_workdir-6" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_index_to_workdir">git_diff_index_to_workdir</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="s">"diff index to working directory"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -235,7 +235,7 @@ are not supported in this example</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">((</span><span class="n">o</span><span class="p">.</span><span class="n">findopts</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_DIFF_FIND_ALL</span><span class="p">)</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_find_similar-9" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_find_similar">git_diff_find_similar</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">findopts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_find_similar-9" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_find_similar">git_diff_find_similar</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">findopts</span><span class="p">),</span>
|
||||
<span class="s">"finding renames and copies"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -259,7 +259,7 @@ are not supported in this example</p>
|
||||
<span class="n">fputs</span><span class="p">(</span><span class="n">colors</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">stdout</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_print-10" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_print">git_diff_print</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">format</span><span class="p">,</span> <span class="n">color_printer</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">color</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_print-10" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_print">git_diff_print</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">format</span><span class="p">,</span> <span class="n">color_printer</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">color</span><span class="p">),</span>
|
||||
<span class="s">"displaying 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="p">.</span><span class="n">color</span> <span class="o">>=</span> <span class="mi">0</span><span class="p">)</span>
|
||||
@@ -275,9 +275,9 @@ are not supported in this example</p>
|
||||
<p>Cleanup before exiting.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_diff_free-3" class="fnlink" href="../../#v1.6.0/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="../../#v1.6.0/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="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">t2</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_diff_free-3" class="fnlink" href="../../#v1.6.1/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="../../#v1.6.1/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="../../#v1.6.1/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,16 +300,16 @@ 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="../../#v1.6.0/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-15" class="fnlink" href="../../#v1.6.1/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="../../#v1.6.0/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-17" class="fnlink" href="../../#v1.6.1/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="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_diff_from_buffer-11" class="fnlink" href="../../#v1.6.0/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-11" class="fnlink" href="../../#v1.6.1/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="../../#v1.6.0/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="../../#v1.6.0/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"><a name="git_patch_free-16" class="fnlink" href="../../#v1.6.1/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="../../#v1.6.1/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>
|
||||
<span class="p">}</span>
|
||||
@@ -490,7 +490,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="../../#v1.6.0/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-12" class="fnlink" href="../../#v1.6.1/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 +502,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="../../#v1.6.0/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-13" class="fnlink" href="../../#v1.6.1/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="../../#v1.6.0/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="../../#v1.6.0/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_buf_dispose-2" class="fnlink" href="../../#v1.6.1/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="../../#v1.6.1/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>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -91,13 +91,13 @@ an update.</p>
|
||||
<span class="kt">char</span> <span class="n">a_str</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span><span class="o">+</span><span class="mi">1</span><span class="p">],</span> <span class="n">b_str</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span><span class="o">+</span><span class="mi">1</span><span class="p">];</span>
|
||||
<span class="p">(</span><span class="kt">void</span><span class="p">)</span><span class="n">data</span><span class="p">;</span>
|
||||
|
||||
<span class="n"><a name="git_oid_fmt-1" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">b_str</span><span class="p">,</span> <span class="n">b</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_fmt-1" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">b_str</span><span class="p">,</span> <span class="n">b</span><span class="p">);</span>
|
||||
<span class="n">b_str</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span><span class="p">]</span> <span class="o">=</span> <span class="sc">'\0'</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_oid_is_zero-3" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_is_zero">git_oid_is_zero</a></span><span class="p">(</span><span class="n">a</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_oid_is_zero-3" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_is_zero">git_oid_is_zero</a></span><span class="p">(</span><span class="n">a</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"[new] %.20s %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">b_str</span><span class="p">,</span> <span class="n">refname</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_fmt-2" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">a_str</span><span class="p">,</span> <span class="n">a</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_fmt-2" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">a_str</span><span class="p">,</span> <span class="n">a</span><span class="p">);</span>
|
||||
<span class="n">a_str</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span><span class="p">]</span> <span class="o">=</span> <span class="sc">'\0'</span><span class="p">;</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"[updated] %.10s..%.10s %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">a_str</span><span class="p">,</span> <span class="n">b_str</span><span class="p">,</span> <span class="n">refname</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
@@ -154,8 +154,8 @@ the download rate.</p>
|
||||
|
||||
<span class="cm">/* Figure out whether it's a named remote or a URL */</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Fetching %s for repo %p</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_lookup-5" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_create_anonymous-4" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_create_anonymous">git_remote_create_anonymous</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_lookup-5" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_create_anonymous-4" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_create_anonymous">git_remote_create_anonymous</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">on_error</span><span class="p">;</span>
|
||||
|
||||
<span class="cm">/* Set up the callbacks (only update_tips for now) */</span>
|
||||
@@ -175,7 +175,7 @@ config. Update the reflog for the updated references with
|
||||
"fetch".</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_fetch-8" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_fetch">git_remote_fetch</a></span><span class="p">(</span><span class="n">remote</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">fetch_opts</span><span class="p">,</span> <span class="s">"fetch"</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_fetch-8" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_fetch">git_remote_fetch</a></span><span class="p">(</span><span class="n">remote</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&</span><span class="n">fetch_opts</span><span class="p">,</span> <span class="s">"fetch"</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">on_error</span><span class="p">;</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -190,7 +190,7 @@ network.</p>
|
||||
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">stats</span> <span class="o">=</span> <span class="n"><a name="git_remote_stats-9" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_stats">git_remote_stats</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">stats</span> <span class="o">=</span> <span class="n"><a name="git_remote_stats-9" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_stats">git_remote_stats</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">stats</span><span class="o">-></span><span class="n">local_objects</span> <span class="o">></span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\r</span><span class="s">Received %u/%u objects in %"</span> <span class="n">PRIuZ</span> <span class="s">" bytes (used %u local objects)</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="n">stats</span><span class="o">-></span><span class="n">indexed_objects</span><span class="p">,</span> <span class="n">stats</span><span class="o">-></span><span class="n">total_objects</span><span class="p">,</span> <span class="n">stats</span><span class="o">-></span><span class="n">received_bytes</span><span class="p">,</span> <span class="n">stats</span><span class="o">-></span><span class="n">local_objects</span><span class="p">);</span>
|
||||
@@ -199,12 +199,12 @@ network.</p>
|
||||
<span class="n">stats</span><span class="o">-></span><span class="n">indexed_objects</span><span class="p">,</span> <span class="n">stats</span><span class="o">-></span><span class="n">total_objects</span><span class="p">,</span> <span class="n">stats</span><span class="o">-></span><span class="n">received_bytes</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_remote_free-6" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_remote_free-6" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
|
||||
<span class="nl">on_error</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_remote_free-7" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_remote_free-7" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -146,7 +146,7 @@ as an example.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre><span class="k">static</span> <span class="kt">void</span> <span class="nf">check_error</span><span class="p">(</span><span class="kt">int</span> <span class="n">error_code</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">action</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="k">const</span> <span class="n">git_error</span> <span class="o">*</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_error_last-33" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">();</span>
|
||||
<span class="k">const</span> <span class="n">git_error</span> <span class="o">*</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_error_last-33" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">();</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">error_code</span><span class="p">)</span>
|
||||
<span class="k">return</span><span class="p">;</span>
|
||||
|
||||
@@ -172,7 +172,7 @@ as an example.</p>
|
||||
including threading and crypto</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_libgit2_init-34" class="fnlink" href="../../#v1.6.0/group/libgit2/git_libgit2_init">git_libgit2_init</a></span><span class="p">();</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_libgit2_init-34" class="fnlink" href="../../#v1.6.1/group/libgit2/git_libgit2_init">git_libgit2_init</a></span><span class="p">();</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-Opening_the_Repository'>
|
||||
@@ -191,7 +191,7 @@ and work tree locations, here we assume they are in the normal places.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">repo_path</span> <span class="o">=</span> <span class="p">(</span><span class="n">argc</span> <span class="o">></span> <span class="mi">1</span><span class="p">)</span> <span class="o">?</span> <span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">:</span> <span class="s">"/opt/libgit2-test/.git"</span><span class="p">;</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_open-59" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_open">git_repository_open</a></span><span class="p">(</span><span class="o">&</span><span class="n">repo</span><span class="p">,</span> <span class="n">repo_path</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_open-59" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_open">git_repository_open</a></span><span class="p">(</span><span class="o">&</span><span class="n">repo</span><span class="p">,</span> <span class="n">repo_path</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error</span><span class="p">,</span> <span class="s">"opening repository"</span><span class="p">);</span>
|
||||
|
||||
<span class="n">oid_parsing</span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
@@ -215,7 +215,7 @@ and work tree locations, here we assume they are in the normal places.</p>
|
||||
<p>Finally, when you're done with the repository, you can free it as well.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_repository_free-60" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_free">git_repository_free</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_repository_free-60" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_free">git_repository_free</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -275,7 +275,7 @@ key we're working with.</p>
|
||||
<p>If you have a oid, you can easily get the hex value of the SHA as well.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_oid_fmt-48" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">out</span><span class="p">,</span> <span class="n">oid</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_oid_fmt-48" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">out</span><span class="p">,</span> <span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"SHA hex string: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">out</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -303,7 +303,7 @@ repository.</p>
|
||||
<span class="n">git_odb</span> <span class="o">*</span><span class="n">odb</span><span class="p">;</span>
|
||||
<span class="n">git_object_t</span> <span class="n">otype</span><span class="p">;</span>
|
||||
|
||||
<span class="n"><a name="git_repository_odb-63" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_odb">git_repository_odb</a></span><span class="p">(</span><span class="o">&</span><span class="n">odb</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span></pre></div>
|
||||
<span class="n"><a name="git_repository_odb-63" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_odb">git_repository_odb</a></span><span class="p">(</span><span class="o">&</span><span class="n">odb</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-Raw_Object_Reading'>
|
||||
@@ -327,7 +327,7 @@ the oid (SHA) of the object. This allows us to access objects without
|
||||
knowing their type and inspect the raw bytes unparsed.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_odb_read-42" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_read">git_odb_read</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">odb</span><span class="p">,</span> <span class="n">oid</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_odb_read-42" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_read">git_odb_read</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">odb</span><span class="p">,</span> <span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error</span><span class="p">,</span> <span class="s">"finding object in repository"</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -344,8 +344,8 @@ binary data. For a tree it is a special binary format, so it's unlikely
|
||||
to be hugely helpful as a raw object.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">data</span> <span class="o">=</span> <span class="p">(</span><span class="k">const</span> <span class="kt">unsigned</span> <span class="kt">char</span> <span class="o">*</span><span class="p">)</span><span class="n"><a name="git_odb_object_data-45" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_object_data">git_odb_object_data</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n">otype</span> <span class="o">=</span> <span class="n"><a name="git_odb_object_type-47" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_object_type">git_odb_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n">data</span> <span class="o">=</span> <span class="p">(</span><span class="k">const</span> <span class="kt">unsigned</span> <span class="kt">char</span> <span class="o">*</span><span class="p">)</span><span class="n"><a name="git_odb_object_data-45" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_object_data">git_odb_object_data</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n">otype</span> <span class="o">=</span> <span class="n"><a name="git_odb_object_type-47" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_object_type">git_odb_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-15'>
|
||||
@@ -357,9 +357,9 @@ to be hugely helpful as a raw object.</p>
|
||||
a string representation of that value (and vice-versa).</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">str_type</span> <span class="o">=</span> <span class="n"><a name="git_object_type2string-39" class="fnlink" href="../../#v1.6.0/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n">otype</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">str_type</span> <span class="o">=</span> <span class="n"><a name="git_object_type2string-39" class="fnlink" href="../../#v1.6.1/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n">otype</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"object length and type: %d, %s</span><span class="se">\n</span><span class="s">object data: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_odb_object_size-46" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_object_size">git_odb_object_size</a></span><span class="p">(</span><span class="n">obj</span><span class="p">),</span>
|
||||
<span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_odb_object_size-46" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_object_size">git_odb_object_size</a></span><span class="p">(</span><span class="n">obj</span><span class="p">),</span>
|
||||
<span class="n">str_type</span><span class="p">,</span> <span class="n">data</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -372,7 +372,7 @@ a string representation of that value (and vice-versa).</p>
|
||||
it or it will leak memory.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_odb_object_free-44" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_object_free">git_odb_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_odb_object_free-44" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_object_free">git_odb_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-Raw_Object_Writing'>
|
||||
@@ -397,7 +397,7 @@ we'll write a new blob object that just contains a simple string.
|
||||
Notice that we have to specify the object type as the <code>git_otype</code> enum.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_odb_write-43" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_write">git_odb_write</a></span><span class="p">(</span><span class="n">oid</span><span class="p">,</span> <span class="n">odb</span><span class="p">,</span> <span class="s">"test data"</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="s">"test data"</span><span class="p">)</span> <span class="o">-</span> <span class="mi">1</span><span class="p">,</span> <span class="n">GIT_OBJECT_BLOB</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_odb_write-43" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_write">git_odb_write</a></span><span class="p">(</span><span class="n">oid</span><span class="p">,</span> <span class="n">odb</span><span class="p">,</span> <span class="s">"test data"</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="s">"test data"</span><span class="p">)</span> <span class="o">-</span> <span class="mi">1</span><span class="p">,</span> <span class="n">GIT_OBJECT_BLOB</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-19'>
|
||||
@@ -409,7 +409,7 @@ Notice that we have to specify the object type as the <code>git_otype</code> enu
|
||||
generated when the object was written to our database.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_oid_fmt-49" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="n">oid</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_oid_fmt-49" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Written Object: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oid_hex</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -421,7 +421,7 @@ generated when the object was written to our database.</p>
|
||||
<p>Free the object database after usage.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_odb_free-41" class="fnlink" href="../../#v1.6.0/group/odb/git_odb_free">git_odb_free</a></span><span class="p">(</span><span class="n">odb</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_odb_free-41" class="fnlink" href="../../#v1.6.1/group/odb/git_odb_free">git_odb_free</a></span><span class="p">(</span><span class="n">odb</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -461,9 +461,9 @@ values for the name and email should be found in the <code>user.name</code> and
|
||||
example file to see how to access config values.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_signature_new-70" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_new">git_signature_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">author</span><span class="p">,</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_signature_new-70" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_new">git_signature_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">author</span><span class="p">,</span>
|
||||
<span class="s">"Scott Chacon"</span><span class="p">,</span> <span class="s">"schacon@gmail.com"</span><span class="p">,</span> <span class="mi">123456789</span><span class="p">,</span> <span class="mi">60</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_new-71" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_new">git_signature_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">committer</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_signature_new-71" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_new">git_signature_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">committer</span><span class="p">,</span>
|
||||
<span class="s">"Scott A Chacon"</span><span class="p">,</span> <span class="s">"scott@github.com"</span><span class="p">,</span> <span class="mi">987654321</span><span class="p">,</span> <span class="mi">90</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -484,8 +484,8 @@ but you can also use</p>
|
||||
<span class="n">git_oid_fromstr</span><span class="p">(</span><span class="o">&</span><span class="n">tree_id</span><span class="p">,</span> <span class="s">"f60079018b664e4e79329a7ef9559c8d9e0378d1"</span><span class="p">);</span>
|
||||
<span class="n">git_oid_fromstr</span><span class="p">(</span><span class="o">&</span><span class="n">parent_id</span><span class="p">,</span> <span class="s">"5b5b025afb0b4c913b4c338a42934a3863bf3644"</span><span class="p">);</span>
|
||||
<span class="cp">#endif</span>
|
||||
<span class="n"><a name="git_tree_lookup-81" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_id</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_lookup-6" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">parent_id</span><span class="p">);</span></pre></div>
|
||||
<span class="n"><a name="git_tree_lookup-81" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_id</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_lookup-6" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">parent_id</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-24'>
|
||||
@@ -498,7 +498,7 @@ the values we need to create the commit. The SHA key is written to the
|
||||
<code>commit_id</code> variable here.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_commit_create_v-25" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_create_v">git_commit_create_v</a></span><span class="p">(</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_commit_create_v-25" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_create_v">git_commit_create_v</a></span><span class="p">(</span>
|
||||
<span class="o">&</span><span class="n">commit_id</span><span class="p">,</span> <span class="cm">/* out id */</span>
|
||||
<span class="n">repo</span><span class="p">,</span>
|
||||
<span class="nb">NULL</span><span class="p">,</span> <span class="cm">/* do not update the HEAD */</span>
|
||||
@@ -518,7 +518,7 @@ the values we need to create the commit. The SHA key is written to the
|
||||
<p>Now we can take a look at the commit SHA we've generated.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_oid_fmt-50" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="o">&</span><span class="n">commit_id</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_oid_fmt-50" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="o">&</span><span class="n">commit_id</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"New Commit: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oid_hex</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -530,10 +530,10 @@ the values we need to create the commit. The SHA key is written to the
|
||||
<p>Free all objects used in the meanwhile.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tree_free-83" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-9" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-72" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">author</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-73" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">committer</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tree_free-83" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-9" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-72" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">author</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-73" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">committer</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -583,7 +583,7 @@ data in the commit - the author (name, email, datetime), committer
|
||||
<span class="n">git_oid_fromstr</span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="s">"8496071c1b46c854b31185ea97743be6a8774479"</span><span class="p">);</span>
|
||||
<span class="cp">#endif</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_commit_lookup-7" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_commit_lookup-7" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error</span><span class="p">,</span> <span class="s">"looking up commit"</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -593,15 +593,15 @@ data in the commit - the author (name, email, datetime), committer
|
||||
<a class="pilcrow" href="#section-29">¶</a>
|
||||
</div>
|
||||
<p>Each of the properties of the commit object are accessible via methods,
|
||||
including commonly needed variations, such as <code><a name="git_commit_time-18" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_time">git_commit_time</a></code> which
|
||||
returns the author time and <code><a name="git_commit_message-15" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></code> which gives you the
|
||||
including commonly needed variations, such as <code><a name="git_commit_time-18" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_time">git_commit_time</a></code> which
|
||||
returns the author time and <code><a name="git_commit_message-15" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></code> which gives you the
|
||||
commit message (as a NUL-terminated string).</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">message</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-16" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">author</span> <span class="o">=</span> <span class="n"><a name="git_commit_author-21" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">cmtter</span> <span class="o">=</span> <span class="n"><a name="git_commit_committer-20" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_committer">git_commit_committer</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">time</span> <span class="o">=</span> <span class="n"><a name="git_commit_time-19" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_time">git_commit_time</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n">message</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-16" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">author</span> <span class="o">=</span> <span class="n"><a name="git_commit_author-21" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">cmtter</span> <span class="o">=</span> <span class="n"><a name="git_commit_committer-20" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_committer">git_commit_committer</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">time</span> <span class="o">=</span> <span class="n"><a name="git_commit_time-19" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_time">git_commit_time</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-30'>
|
||||
@@ -631,17 +631,17 @@ based on) and merge commits will have two or more. Commits can
|
||||
technically have any number, though it's rare to have more than two.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">parents</span> <span class="o">=</span> <span class="n"><a name="git_commit_parentcount-23" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">parents</span> <span class="o">=</span> <span class="n"><a name="git_commit_parentcount-23" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">p</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span><span class="n">p</span> <span class="o"><</span> <span class="n">parents</span><span class="p">;</span><span class="n">p</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">memset</span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">oid_hex</span><span class="p">));</span>
|
||||
|
||||
<span class="n"><a name="git_commit_parent-24" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parent">git_commit_parent</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="n">p</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_fmt-51" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="n"><a name="git_commit_id-14" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_id">git_commit_id</a></span><span class="p">(</span><span class="n">parent</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_commit_parent-24" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parent">git_commit_parent</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="n">p</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_fmt-51" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="n"><a name="git_commit_id-14" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_id">git_commit_id</a></span><span class="p">(</span><span class="n">parent</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Parent: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oid_hex</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-10" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-10" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_commit_free-11" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-11" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -684,7 +684,7 @@ the same way that we would a commit (or any other object).</p>
|
||||
<span class="n">git_oid_fromstr</span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="s">"b25fa35b38051e4ae45d4222e795f9df2e43f1d1"</span><span class="p">);</span>
|
||||
<span class="cp">#endif</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_tag_lookup-75" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_lookup">git_tag_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tag</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_tag_lookup-75" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_lookup">git_tag_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tag</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error</span><span class="p">,</span> <span class="s">"looking up tag"</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -699,12 +699,12 @@ the target object (usually 'commit'), the name ('v1.0'), the tag
|
||||
git_signature - name, email, timestamp), and the tag message.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tag_target-77" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_target">git_tag_target</a></span><span class="p">((</span><span class="n">git_object</span> <span class="o">**</span><span class="p">)</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">tag</span><span class="p">);</span>
|
||||
<span class="n">name</span> <span class="o">=</span> <span class="n"><a name="git_tag_name-79" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_name">git_tag_name</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span> <span class="cm">/* "test" */</span>
|
||||
<span class="n">type</span> <span class="o">=</span> <span class="n"><a name="git_tag_target_type-78" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_target_type">git_tag_target_type</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span> <span class="cm">/* GIT_OBJECT_COMMIT (object_t enum) */</span>
|
||||
<span class="n">message</span> <span class="o">=</span> <span class="n"><a name="git_tag_message-80" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span> <span class="cm">/* "tag message\n" */</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tag_target-77" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_target">git_tag_target</a></span><span class="p">((</span><span class="n">git_object</span> <span class="o">**</span><span class="p">)</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">tag</span><span class="p">);</span>
|
||||
<span class="n">name</span> <span class="o">=</span> <span class="n"><a name="git_tag_name-79" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_name">git_tag_name</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span> <span class="cm">/* "test" */</span>
|
||||
<span class="n">type</span> <span class="o">=</span> <span class="n"><a name="git_tag_target_type-78" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_target_type">git_tag_target_type</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span> <span class="cm">/* GIT_OBJECT_COMMIT (object_t enum) */</span>
|
||||
<span class="n">message</span> <span class="o">=</span> <span class="n"><a name="git_tag_message-80" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span> <span class="cm">/* "tag message\n" */</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Tag Name: %s</span><span class="se">\n</span><span class="s">Tag Type: %s</span><span class="se">\n</span><span class="s">Tag Message: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="n">name</span><span class="p">,</span> <span class="n"><a name="git_object_type2string-40" class="fnlink" href="../../#v1.6.0/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n">type</span><span class="p">),</span> <span class="n">message</span><span class="p">);</span></pre></div>
|
||||
<span class="n">name</span><span class="p">,</span> <span class="n"><a name="git_object_type2string-40" class="fnlink" href="../../#v1.6.1/group/object/git_object_type2string">git_object_type2string</a></span><span class="p">(</span><span class="n">type</span><span class="p">),</span> <span class="n">message</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-35'>
|
||||
@@ -715,8 +715,8 @@ git_signature - name, email, timestamp), and the tag message.</p>
|
||||
<p>Free both the commit and tag after usage.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_commit_free-12" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tag_free-76" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_free">git_tag_free</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_commit_free-12" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tag_free-76" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_free">git_tag_free</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -757,7 +757,7 @@ tree entries.</p>
|
||||
<span class="cp">#else</span>
|
||||
<span class="n">git_oid_fromstr</span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="s">"f60079018b664e4e79329a7ef9559c8d9e0378d1"</span><span class="p">);</span>
|
||||
<span class="cp">#endif</span>
|
||||
<span class="n"><a name="git_tree_lookup-82" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span></pre></div>
|
||||
<span class="n"><a name="git_tree_lookup-82" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-38'>
|
||||
@@ -769,11 +769,11 @@ tree entries.</p>
|
||||
if you want to.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">cnt</span> <span class="o">=</span> <span class="n"><a name="git_tree_entrycount-85" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entrycount">git_tree_entrycount</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span> <span class="cm">/* 2 */</span>
|
||||
<div class='highlight'><pre> <span class="n">cnt</span> <span class="o">=</span> <span class="n"><a name="git_tree_entrycount-85" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entrycount">git_tree_entrycount</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span> <span class="cm">/* 2 */</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"tree entries: %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span> <span class="n">cnt</span><span class="p">);</span>
|
||||
|
||||
<span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_tree_entry_byindex-87" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_byindex">git_tree_entry_byindex</a></span><span class="p">(</span><span class="n">tree</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Entry name: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_tree_entry_name-88" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_name">git_tree_entry_name</a></span><span class="p">(</span><span class="n">entry</span><span class="p">));</span> <span class="cm">/* "README" */</span></pre></div>
|
||||
<span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_tree_entry_byindex-87" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_byindex">git_tree_entry_byindex</a></span><span class="p">(</span><span class="n">tree</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Entry name: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_tree_entry_name-88" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_name">git_tree_entry_name</a></span><span class="p">(</span><span class="n">entry</span><span class="p">));</span> <span class="cm">/* "README" */</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-39'>
|
||||
@@ -785,8 +785,8 @@ if you want to.</p>
|
||||
entry you're looking for.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_tree_entry_byname-86" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_byname">git_tree_entry_byname</a></span><span class="p">(</span><span class="n">tree</span><span class="p">,</span> <span class="s">"README"</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_entry_name-89" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_name">git_tree_entry_name</a></span><span class="p">(</span><span class="n">entry</span><span class="p">);</span> <span class="cm">/* "README" */</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_tree_entry_byname-86" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_byname">git_tree_entry_byname</a></span><span class="p">(</span><span class="n">tree</span><span class="p">,</span> <span class="s">"README"</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_entry_name-89" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_name">git_tree_entry_name</a></span><span class="p">(</span><span class="n">entry</span><span class="p">);</span> <span class="cm">/* "README" */</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-40'>
|
||||
@@ -799,7 +799,7 @@ entry you're looking for.</p>
|
||||
get the mode if you want.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tree_entry_to_object-90" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_entry_to_object">git_tree_entry_to_object</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">entry</span><span class="p">);</span> <span class="cm">/* blob */</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tree_entry_to_object-90" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_entry_to_object">git_tree_entry_to_object</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">entry</span><span class="p">);</span> <span class="cm">/* blob */</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-41'>
|
||||
@@ -810,8 +810,8 @@ get the mode if you want.</p>
|
||||
<p>Remember to close the looked-up object and tree once you are done using it</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_object_free-38" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-84" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_object_free-38" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-84" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -843,7 +843,7 @@ don't have to do all those steps yourself.</p>
|
||||
<span class="cp">#else</span>
|
||||
<span class="n">git_oid_fromstr</span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="s">"1385f264afb75a56a5bec74243be9b367ba4ca08"</span><span class="p">);</span>
|
||||
<span class="cp">#endif</span>
|
||||
<span class="n"><a name="git_blob_lookup-1" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_lookup">git_blob_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">blob</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span></pre></div>
|
||||
<span class="n"><a name="git_blob_lookup-1" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_lookup">git_blob_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">blob</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-43'>
|
||||
@@ -854,12 +854,12 @@ don't have to do all those steps yourself.</p>
|
||||
<p>You can access a buffer with the raw contents of the blob directly.
|
||||
Note that this buffer may not be contain ASCII data for certain blobs
|
||||
(e.g. binary files): do not consider the buffer a NULL-terminated
|
||||
string, and use the <code><a name="git_blob_rawsize-4" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawsize">git_blob_rawsize</a></code> attribute to find out its exact
|
||||
string, and use the <code><a name="git_blob_rawsize-4" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawsize">git_blob_rawsize</a></code> attribute to find out its exact
|
||||
size in bytes</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">printf</span><span class="p">(</span><span class="s">"Blob Size: %ld</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">long</span><span class="p">)</span><span class="n"><a name="git_blob_rawsize-5" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawsize">git_blob_rawsize</a></span><span class="p">(</span><span class="n">blob</span><span class="p">));</span> <span class="cm">/* 8 */</span>
|
||||
<span class="n"><a name="git_blob_rawcontent-3" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_rawcontent">git_blob_rawcontent</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span> <span class="cm">/* "content" */</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n">printf</span><span class="p">(</span><span class="s">"Blob Size: %ld</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">long</span><span class="p">)</span><span class="n"><a name="git_blob_rawsize-5" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawsize">git_blob_rawsize</a></span><span class="p">(</span><span class="n">blob</span><span class="p">));</span> <span class="cm">/* 8 */</span>
|
||||
<span class="n"><a name="git_blob_rawcontent-3" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_rawcontent">git_blob_rawcontent</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span> <span class="cm">/* "content" */</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-44'>
|
||||
@@ -870,7 +870,7 @@ size in bytes</p>
|
||||
<p>Free the blob after usage.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_blob_free-2" class="fnlink" href="../../#v1.6.0/group/blob/git_blob_free">git_blob_free</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_blob_free-2" class="fnlink" href="../../#v1.6.1/group/blob/git_blob_free">git_blob_free</a></span><span class="p">(</span><span class="n">blob</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -922,9 +922,9 @@ branch1..branch2</code>, you would push the oid of <code>branch2</code> and hide
|
||||
of <code>branch1</code>.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_revwalk_new-65" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_new">git_revwalk_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">walk</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_sorting-68" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_sorting">git_revwalk_sorting</a></span><span class="p">(</span><span class="n">walk</span><span class="p">,</span> <span class="n">GIT_SORT_TOPOLOGICAL</span> <span class="o">|</span> <span class="n">GIT_SORT_REVERSE</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_push-66" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_push">git_revwalk_push</a></span><span class="p">(</span><span class="n">walk</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_revwalk_new-65" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_new">git_revwalk_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">walk</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_sorting-68" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_sorting">git_revwalk_sorting</a></span><span class="p">(</span><span class="n">walk</span><span class="p">,</span> <span class="n">GIT_SORT_TOPOLOGICAL</span> <span class="o">|</span> <span class="n">GIT_SORT_REVERSE</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_push-66" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_push">git_revwalk_push</a></span><span class="p">(</span><span class="n">walk</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-47'>
|
||||
@@ -939,15 +939,15 @@ at by the returned OID; note that this operation is specially fast
|
||||
since the raw contents of the commit object will be cached in memory</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">while</span> <span class="p">((</span><span class="n"><a name="git_revwalk_next-67" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_next">git_revwalk_next</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">walk</span><span class="p">))</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_commit_lookup-8" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">wcommit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="k">while</span> <span class="p">((</span><span class="n"><a name="git_revwalk_next-67" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_next">git_revwalk_next</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">walk</span><span class="p">))</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_commit_lookup-8" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">wcommit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error</span><span class="p">,</span> <span class="s">"looking up commit during revwalk"</span><span class="p">);</span>
|
||||
|
||||
<span class="n">cmsg</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-17" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">wcommit</span><span class="p">);</span>
|
||||
<span class="n">cauth</span> <span class="o">=</span> <span class="n"><a name="git_commit_author-22" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">wcommit</span><span class="p">);</span>
|
||||
<span class="n">cmsg</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-17" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">wcommit</span><span class="p">);</span>
|
||||
<span class="n">cauth</span> <span class="o">=</span> <span class="n"><a name="git_commit_author-22" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">wcommit</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s (%s)</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">cmsg</span><span class="p">,</span> <span class="n">cauth</span><span class="o">-></span><span class="n">email</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_commit_free-13" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">wcommit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-13" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">wcommit</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -962,7 +962,7 @@ walked it not deallocated while the walk is in progress, or it will
|
||||
result in undefined behavior</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_revwalk_free-69" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_free">git_revwalk_free</a></span><span class="p">(</span><span class="n">walk</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_revwalk_free-69" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_free">git_revwalk_free</a></span><span class="p">(</span><span class="n">walk</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -996,7 +996,7 @@ index file with <code>git_index_open_bare()</code>. The index for the repository
|
||||
will be located and loaded from disk.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_repository_index-64" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span></pre></div>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_repository_index-64" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-51'>
|
||||
@@ -1012,16 +1012,16 @@ gid, file<em>size and flags) All these properties are exported publicly in
|
||||
the `git</em>index_entry` struct</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">ecount</span> <span class="o">=</span> <span class="n"><a name="git_index_entrycount-36" class="fnlink" href="../../#v1.6.0/group/index/git_index_entrycount">git_index_entrycount</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n">ecount</span> <span class="o">=</span> <span class="n"><a name="git_index_entrycount-36" class="fnlink" href="../../#v1.6.1/group/index/git_index_entrycount">git_index_entrycount</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">ecount</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="n">git_index_entry</span> <span class="o">*</span><span class="n">e</span> <span class="o">=</span> <span class="n"><a name="git_index_get_byindex-37" class="fnlink" href="../../#v1.6.0/group/index/git_index_get_byindex">git_index_get_byindex</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="k">const</span> <span class="n">git_index_entry</span> <span class="o">*</span><span class="n">e</span> <span class="o">=</span> <span class="n"><a name="git_index_get_byindex-37" class="fnlink" href="../../#v1.6.1/group/index/git_index_get_byindex">git_index_get_byindex</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"path: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">e</span><span class="o">-></span><span class="n">path</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"mtime: %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n">e</span><span class="o">-></span><span class="n">mtime</span><span class="p">.</span><span class="n">seconds</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"fs: %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n">e</span><span class="o">-></span><span class="n">file_size</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_index_free-35" class="fnlink" href="../../#v1.6.0/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_free-35" class="fnlink" href="../../#v1.6.1/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -1057,7 +1057,7 @@ out all available references and the object SHA they resolve to.</p>
|
||||
one at a time and resolve them to the SHA, then print both values out.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_reference_list-57" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_list">git_reference_list</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref_list</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_reference_list-57" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_list">git_reference_list</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref_list</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">ref_list</span><span class="p">.</span><span class="n">count</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">git_reference</span> <span class="o">*</span><span class="n">ref</span><span class="p">;</span>
|
||||
@@ -1065,26 +1065,26 @@ one at a time and resolve them to the SHA, then print both values out.</p>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">refname</span><span class="p">;</span>
|
||||
|
||||
<span class="n">refname</span> <span class="o">=</span> <span class="n">ref_list</span><span class="p">.</span><span class="n">strings</span><span class="p">[</span><span class="n">i</span><span class="p">];</span>
|
||||
<span class="n"><a name="git_reference_lookup-53" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">refname</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_lookup-53" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">refname</span><span class="p">);</span>
|
||||
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n"><a name="git_reference_type-56" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_type">git_reference_type</a></span><span class="p">(</span><span class="n">ref</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n"><a name="git_reference_type-56" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_type">git_reference_type</a></span><span class="p">(</span><span class="n">ref</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">case</span> <span class="nl">GIT_REFERENCE_DIRECT</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_oid_fmt-52" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="n"><a name="git_reference_target-54" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_target">git_reference_target</a></span><span class="p">(</span><span class="n">ref</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_fmt-52" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid_hex</span><span class="p">,</span> <span class="n"><a name="git_reference_target-54" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_target">git_reference_target</a></span><span class="p">(</span><span class="n">ref</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s [%s]</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">refname</span><span class="p">,</span> <span class="n">oid_hex</span><span class="p">);</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
|
||||
<span class="k">case</span> <span class="nl">GIT_REFERENCE_SYMBOLIC</span><span class="p">:</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s => %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">refname</span><span class="p">,</span> <span class="n"><a name="git_reference_symbolic_target-55" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_symbolic_target">git_reference_symbolic_target</a></span><span class="p">(</span><span class="n">ref</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s => %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">refname</span><span class="p">,</span> <span class="n"><a name="git_reference_symbolic_target-55" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_symbolic_target">git_reference_symbolic_target</a></span><span class="p">(</span><span class="n">ref</span><span class="p">));</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
<span class="k">default</span><span class="o">:</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"Unexpected reference type</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_reference_free-58" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-58" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">ref</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_strarray_dispose-74" class="fnlink" href="../../#v1.6.0/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref_list</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_strarray_dispose-74" class="fnlink" href="../../#v1.6.1/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">ref_list</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -1121,16 +1121,16 @@ in any of the accessible config file locations (system, global, local).</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">sprintf</span><span class="p">(</span><span class="n">config_path</span><span class="p">,</span> <span class="s">"%s/config"</span><span class="p">,</span> <span class="n">repo_path</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n"><a name="git_config_open_ondisk-26" class="fnlink" href="../../#v1.6.0/group/config/git_config_open_ondisk">git_config_open_ondisk</a></span><span class="p">(</span><span class="o">&</span><span class="n">cfg</span><span class="p">,</span> <span class="n">config_path</span><span class="p">),</span> <span class="s">"opening config"</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n"><a name="git_config_open_ondisk-26" class="fnlink" href="../../#v1.6.1/group/config/git_config_open_ondisk">git_config_open_ondisk</a></span><span class="p">(</span><span class="o">&</span><span class="n">cfg</span><span class="p">,</span> <span class="n">config_path</span><span class="p">),</span> <span class="s">"opening config"</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_config_get_int32-29" class="fnlink" href="../../#v1.6.0/group/config/git_config_get_int32">git_config_get_int32</a></span><span class="p">(</span><span class="o">&</span><span class="n">autocorrect</span><span class="p">,</span> <span class="n">cfg</span><span class="p">,</span> <span class="s">"help.autocorrect"</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_config_get_int32-29" class="fnlink" href="../../#v1.6.1/group/config/git_config_get_int32">git_config_get_int32</a></span><span class="p">(</span><span class="o">&</span><span class="n">autocorrect</span><span class="p">,</span> <span class="n">cfg</span><span class="p">,</span> <span class="s">"help.autocorrect"</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Autocorrect: %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">autocorrect</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n"><a name="git_repository_config_snapshot-61" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_config_snapshot">git_repository_config_snapshot</a></span><span class="p">(</span><span class="o">&</span><span class="n">snap_cfg</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"config snapshot"</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_config_get_string-31" class="fnlink" href="../../#v1.6.0/group/config/git_config_get_string">git_config_get_string</a></span><span class="p">(</span><span class="o">&</span><span class="n">email</span><span class="p">,</span> <span class="n">snap_cfg</span><span class="p">,</span> <span class="s">"user.email"</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n"><a name="git_repository_config_snapshot-61" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_config_snapshot">git_repository_config_snapshot</a></span><span class="p">(</span><span class="o">&</span><span class="n">snap_cfg</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"config snapshot"</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_config_get_string-31" class="fnlink" href="../../#v1.6.1/group/config/git_config_get_string">git_config_get_string</a></span><span class="p">(</span><span class="o">&</span><span class="n">email</span><span class="p">,</span> <span class="n">snap_cfg</span><span class="p">,</span> <span class="s">"user.email"</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Email: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">email</span><span class="p">);</span>
|
||||
|
||||
<span class="n">error_code</span> <span class="o">=</span> <span class="n"><a name="git_config_get_int32-30" class="fnlink" href="../../#v1.6.0/group/config/git_config_get_int32">git_config_get_int32</a></span><span class="p">(</span><span class="o">&</span><span class="n">autocorrect</span><span class="p">,</span> <span class="n">cfg</span><span class="p">,</span> <span class="s">"help.autocorrect"</span><span class="p">);</span>
|
||||
<span class="n">error_code</span> <span class="o">=</span> <span class="n"><a name="git_config_get_int32-30" class="fnlink" href="../../#v1.6.1/group/config/git_config_get_int32">git_config_get_int32</a></span><span class="p">(</span><span class="o">&</span><span class="n">autocorrect</span><span class="p">,</span> <span class="n">cfg</span><span class="p">,</span> <span class="s">"help.autocorrect"</span><span class="p">);</span>
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n">error_code</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="k">case</span> <span class="mi">0</span><span class="o">:</span>
|
||||
@@ -1142,10 +1142,10 @@ in any of the accessible config file locations (system, global, local).</p>
|
||||
<span class="k">default</span><span class="o">:</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error_code</span><span class="p">,</span> <span class="s">"get_int32 failed"</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="n"><a name="git_config_free-27" class="fnlink" href="../../#v1.6.0/group/config/git_config_free">git_config_free</a></span><span class="p">(</span><span class="n">cfg</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_config_free-27" class="fnlink" href="../../#v1.6.1/group/config/git_config_free">git_config_free</a></span><span class="p">(</span><span class="n">cfg</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n"><a name="git_repository_config_snapshot-62" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_config_snapshot">git_repository_config_snapshot</a></span><span class="p">(</span><span class="o">&</span><span class="n">snap_cfg</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"config snapshot"</span><span class="p">);</span>
|
||||
<span class="n">error_code</span> <span class="o">=</span> <span class="n"><a name="git_config_get_string-32" class="fnlink" href="../../#v1.6.0/group/config/git_config_get_string">git_config_get_string</a></span><span class="p">(</span><span class="o">&</span><span class="n">email</span><span class="p">,</span> <span class="n">snap_cfg</span><span class="p">,</span> <span class="s">"user.email"</span><span class="p">);</span>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n"><a name="git_repository_config_snapshot-62" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_config_snapshot">git_repository_config_snapshot</a></span><span class="p">(</span><span class="o">&</span><span class="n">snap_cfg</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"config snapshot"</span><span class="p">);</span>
|
||||
<span class="n">error_code</span> <span class="o">=</span> <span class="n"><a name="git_config_get_string-32" class="fnlink" href="../../#v1.6.1/group/config/git_config_get_string">git_config_get_string</a></span><span class="p">(</span><span class="o">&</span><span class="n">email</span><span class="p">,</span> <span class="n">snap_cfg</span><span class="p">,</span> <span class="s">"user.email"</span><span class="p">);</span>
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n">error_code</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="k">case</span> <span class="mi">0</span><span class="o">:</span>
|
||||
@@ -1158,7 +1158,7 @@ in any of the accessible config file locations (system, global, local).</p>
|
||||
<span class="n">check_error</span><span class="p">(</span><span class="n">error_code</span><span class="p">,</span> <span class="s">"get_string failed"</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_config_free-28" class="fnlink" href="../../#v1.6.0/group/config/git_config_free">git_config_free</a></span><span class="p">(</span><span class="n">snap_cfg</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_config_free-28" class="fnlink" href="../../#v1.6.1/group/config/git_config_free">git_config_free</a></span><span class="p">(</span><span class="n">snap_cfg</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -142,7 +142,7 @@ That is demonstrated in the "create<em>initial</em>commit" helper func
|
||||
simple case of git<em>repository</em>init() API usage...</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_init-5" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_init">git_repository_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">dir</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span>
|
||||
<div class='highlight'><pre> <span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_init-5" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_init">git_repository_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">dir</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span>
|
||||
<span class="s">"Could not initialize repository"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">else</span> <span class="p">{</span></pre></div>
|
||||
@@ -188,7 +188,7 @@ working directory of the repository (with a git-link file)</p>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">shared</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">initopts</span><span class="p">.</span><span class="n">mode</span> <span class="o">=</span> <span class="n">o</span><span class="p">.</span><span class="n">shared</span><span class="p">;</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_init_ext-6" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_init_ext">git_repository_init_ext</a></span><span class="p">(</span><span class="o">&</span><span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">dir</span><span class="p">,</span> <span class="o">&</span><span class="n">initopts</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_init_ext-6" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_init_ext">git_repository_init_ext</a></span><span class="p">(</span><span class="o">&</span><span class="n">repo</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">dir</span><span class="p">,</span> <span class="o">&</span><span class="n">initopts</span><span class="p">),</span>
|
||||
<span class="s">"Could not initialize repository"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -203,9 +203,9 @@ working directory of the repository (with a git-link file)</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">o</span><span class="p">.</span><span class="n">quiet</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">bare</span> <span class="o">||</span> <span class="n">o</span><span class="p">.</span><span class="n">gitdir</span><span class="p">)</span>
|
||||
<span class="n">o</span><span class="p">.</span><span class="n">dir</span> <span class="o">=</span> <span class="n"><a name="git_repository_path-7" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_path">git_repository_path</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n">o</span><span class="p">.</span><span class="n">dir</span> <span class="o">=</span> <span class="n"><a name="git_repository_path-7" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_path">git_repository_path</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n">o</span><span class="p">.</span><span class="n">dir</span> <span class="o">=</span> <span class="n"><a name="git_repository_workdir-8" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_workdir">git_repository_workdir</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n">o</span><span class="p">.</span><span class="n">dir</span> <span class="o">=</span> <span class="n"><a name="git_repository_workdir-8" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_workdir">git_repository_workdir</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Initialized empty Git repository in %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">dir</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -227,7 +227,7 @@ people like to have that empty base commit in their repo.</p>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Created empty initial commit</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_repository_free-4" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_free">git_repository_free</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_repository_free-4" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_free">git_repository_free</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -259,13 +259,13 @@ that.</p>
|
||||
<p>First use the config to initialize a commit signature for the user.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_signature_default-10" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_default">git_signature_default</a></span><span class="p">(</span><span class="o">&</span><span class="n">sig</span><span class="p">,</span> <span class="n">repo</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_signature_default-10" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_default">git_signature_default</a></span><span class="p">(</span><span class="o">&</span><span class="n">sig</span><span class="p">,</span> <span class="n">repo</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Unable to create a commit signature."</span><span class="p">,</span>
|
||||
<span class="s">"Perhaps 'user.name' and 'user.email' are not set"</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Now let's create an empty tree for this commit */</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_repository_index-9" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_repository_index-9" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Could not open repository index"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -279,12 +279,12 @@ here to put actual files into the index. For our purposes, we'll
|
||||
leave it empty for now.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_index_write_tree-3" class="fnlink" href="../../#v1.6.0/group/index/git_index_write_tree">git_index_write_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree_id</span><span class="p">,</span> <span class="n">index</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_index_write_tree-3" class="fnlink" href="../../#v1.6.1/group/index/git_index_write_tree">git_index_write_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree_id</span><span class="p">,</span> <span class="n">index</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Unable to write initial tree from index"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_index_free-2" class="fnlink" href="../../#v1.6.0/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_free-2" class="fnlink" href="../../#v1.6.1/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_tree_lookup-12" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_id</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_tree_lookup-12" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_id</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Could not look up initial tree"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -300,7 +300,7 @@ HEAD commit and making that be the parent of the initial commit,
|
||||
but here this is the first commit so there will be no parent.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_commit_create_v-1" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_create_v">git_commit_create_v</a></span><span class="p">(</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_commit_create_v-1" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_create_v">git_commit_create_v</a></span><span class="p">(</span>
|
||||
<span class="o">&</span><span class="n">commit_id</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"HEAD"</span><span class="p">,</span> <span class="n">sig</span><span class="p">,</span> <span class="n">sig</span><span class="p">,</span>
|
||||
<span class="nb">NULL</span><span class="p">,</span> <span class="s">"Initial commit"</span><span class="p">,</span> <span class="n">tree</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Could not create the initial commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span></pre></div>
|
||||
@@ -314,8 +314,8 @@ but here this is the first commit so there will be no parent.</p>
|
||||
<p>Clean up so we don't leak memory.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tree_free-13" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-11" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">sig</span><span class="p">);</span>
|
||||
<div class='highlight'><pre> <span class="n"><a name="git_tree_free-13" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-11" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">sig</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">void</span> <span class="nf">usage</span><span class="p">(</span><span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">error</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">arg</span><span class="p">)</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -214,7 +214,7 @@ revwalker configuration calls</li>
|
||||
<span class="n">diffopts</span><span class="p">.</span><span class="n">pathspec</span><span class="p">.</span><span class="n">strings</span> <span class="o">=</span> <span class="o">&</span><span class="n">argv</span><span class="p">[</span><span class="n">last_arg</span><span class="p">];</span>
|
||||
<span class="n">diffopts</span><span class="p">.</span><span class="n">pathspec</span><span class="p">.</span><span class="n">count</span> <span class="o">=</span> <span class="n">argc</span> <span class="o">-</span> <span class="n">last_arg</span><span class="p">;</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">diffopts</span><span class="p">.</span><span class="n">pathspec</span><span class="p">.</span><span class="n">count</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_pathspec_new-40" class="fnlink" href="../../#v1.6.0/group/pathspec/git_pathspec_new">git_pathspec_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">ps</span><span class="p">,</span> <span class="o">&</span><span class="n">diffopts</span><span class="p">.</span><span class="n">pathspec</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_pathspec_new-40" class="fnlink" href="../../#v1.6.1/group/pathspec/git_pathspec_new">git_pathspec_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">ps</span><span class="p">,</span> <span class="o">&</span><span class="n">diffopts</span><span class="p">.</span><span class="n">pathspec</span><span class="p">),</span>
|
||||
<span class="s">"Building pathspec"</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="o">!</span><span class="n">s</span><span class="p">.</span><span class="n">revisions</span><span class="p">)</span>
|
||||
@@ -231,11 +231,11 @@ revwalker configuration calls</li>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">printed</span> <span class="o">=</span> <span class="n">count</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(;</span> <span class="o">!</span><span class="n"><a name="git_revwalk_next-51" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_next">git_revwalk_next</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">s</span><span class="p">.</span><span class="n">walker</span><span class="p">);</span> <span class="n"><a name="git_commit_free-2" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</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_commit_lookup-1" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">s</span><span class="p">.</span><span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">),</span>
|
||||
<span class="k">for</span> <span class="p">(;</span> <span class="o">!</span><span class="n"><a name="git_revwalk_next-51" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_next">git_revwalk_next</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">s</span><span class="p">.</span><span class="n">walker</span><span class="p">);</span> <span class="n"><a name="git_commit_free-2" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</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_commit_lookup-1" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit</span><span class="p">,</span> <span class="n">s</span><span class="p">.</span><span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">oid</span><span class="p">),</span>
|
||||
<span class="s">"Failed to look up commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n">parents</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_commit_parentcount-20" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">parents</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_commit_parentcount-20" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">parents</span> <span class="o"><</span> <span class="n">opt</span><span class="p">.</span><span class="n">min_parents</span><span class="p">)</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">opt</span><span class="p">.</span><span class="n">max_parents</span> <span class="o">></span> <span class="mi">0</span> <span class="o">&&</span> <span class="n">parents</span> <span class="o">></span> <span class="n">opt</span><span class="p">.</span><span class="n">max_parents</span><span class="p">)</span>
|
||||
@@ -246,11 +246,11 @@ revwalker configuration calls</li>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">parents</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">git_tree</span> <span class="o">*</span><span class="n">tree</span><span class="p">;</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_commit_tree-15" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">commit</span><span class="p">),</span> <span class="s">"Get tree"</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"><a name="git_pathspec_match_tree-42" class="fnlink" href="../../#v1.6.0/group/pathspec/git_pathspec_match_tree">git_pathspec_match_tree</a></span><span class="p">(</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_commit_tree-15" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">commit</span><span class="p">),</span> <span class="s">"Get tree"</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"><a name="git_pathspec_match_tree-42" class="fnlink" href="../../#v1.6.1/group/pathspec/git_pathspec_match_tree">git_pathspec_match_tree</a></span><span class="p">(</span>
|
||||
<span class="nb">NULL</span><span class="p">,</span> <span class="n">tree</span><span class="p">,</span> <span class="n">GIT_PATHSPEC_NO_MATCH_ERROR</span><span class="p">,</span> <span class="n">ps</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="n">unmatched</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span>
|
||||
<span class="n"><a name="git_tree_free-55" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-55" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">tree</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">parents</span> <span class="o">==</span> <span class="mi">1</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">unmatched</span> <span class="o">=</span> <span class="n">match_with_parent</span><span class="p">(</span><span class="n">commit</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="o">&</span><span class="n">diffopts</span><span class="p">)</span> <span class="o">?</span> <span class="mi">0</span> <span class="o">:</span> <span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
@@ -264,10 +264,10 @@ revwalker configuration calls</li>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">signature_matches</span><span class="p">(</span><span class="n"><a name="git_commit_author-13" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">opt</span><span class="p">.</span><span class="n">author</span><span class="p">))</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">signature_matches</span><span class="p">(</span><span class="n"><a name="git_commit_author-13" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">opt</span><span class="p">.</span><span class="n">author</span><span class="p">))</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">signature_matches</span><span class="p">(</span><span class="n"><a name="git_commit_committer-12" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_committer">git_commit_committer</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">opt</span><span class="p">.</span><span class="n">committer</span><span class="p">))</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">signature_matches</span><span class="p">(</span><span class="n"><a name="git_commit_committer-12" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_committer">git_commit_committer</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">opt</span><span class="p">.</span><span class="n">committer</span><span class="p">))</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">log_message_matches</span><span class="p">(</span><span class="n">commit</span><span class="p">,</span> <span class="n">opt</span><span class="p">.</span><span class="n">grep</span><span class="p">))</span>
|
||||
@@ -276,7 +276,7 @@ revwalker configuration calls</li>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">count</span><span class="o">++</span> <span class="o"><</span> <span class="n">opt</span><span class="p">.</span><span class="n">skip</span><span class="p">)</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">opt</span><span class="p">.</span><span class="n">limit</span> <span class="o">!=</span> <span class="o">-</span><span class="mi">1</span> <span class="o">&&</span> <span class="n">printed</span><span class="o">++</span> <span class="o">>=</span> <span class="n">opt</span><span class="p">.</span><span class="n">limit</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_commit_free-3" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-3" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
@@ -288,29 +288,29 @@ revwalker configuration calls</li>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">parents</span> <span class="o">></span> <span class="mi">1</span><span class="p">)</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_commit_tree-16" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">,</span> <span class="n">commit</span><span class="p">),</span> <span class="s">"Get tree"</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_commit_tree-16" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">,</span> <span class="n">commit</span><span class="p">),</span> <span class="s">"Get tree"</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">parents</span> <span class="o">==</span> <span class="mi">1</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">git_commit</span> <span class="o">*</span><span class="n">parent</span><span class="p">;</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_commit_parent-22" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parent">git_commit_parent</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span> <span class="s">"Get parent"</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_commit_tree-17" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">a</span><span class="p">,</span> <span class="n">parent</span><span class="p">),</span> <span class="s">"Tree for parent"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-4" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_commit_parent-22" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parent">git_commit_parent</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="mi">0</span><span class="p">),</span> <span class="s">"Get parent"</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_commit_tree-17" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">a</span><span class="p">,</span> <span class="n">parent</span><span class="p">),</span> <span class="s">"Tree for parent"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-4" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</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_diff_tree_to_tree-27" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_tree_to_tree">git_diff_tree_to_tree</a></span><span class="p">(</span>
|
||||
<span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n"><a name="git_commit_owner-7" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_owner">git_commit_owner</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">a</span><span class="p">,</span> <span class="n">b</span><span class="p">,</span> <span class="o">&</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_diff_tree_to_tree-27" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_tree_to_tree">git_diff_tree_to_tree</a></span><span class="p">(</span>
|
||||
<span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n"><a name="git_commit_owner-7" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_owner">git_commit_owner</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">a</span><span class="p">,</span> <span class="n">b</span><span class="p">,</span> <span class="o">&</span><span class="n">diffopts</span><span class="p">),</span>
|
||||
<span class="s">"Diff commit with parent"</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_diff_print-30" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_print">git_diff_print</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">GIT_DIFF_FORMAT_PATCH</span><span class="p">,</span> <span class="n">diff_output</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_print-30" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_print">git_diff_print</a></span><span class="p">(</span><span class="n">diff</span><span class="p">,</span> <span class="n">GIT_DIFF_FORMAT_PATCH</span><span class="p">,</span> <span class="n">diff_output</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">),</span>
|
||||
<span class="s">"Displaying diff"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_diff_free-25" class="fnlink" href="../../#v1.6.0/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-56" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">a</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-57" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">b</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_diff_free-25" class="fnlink" href="../../#v1.6.1/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-56" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">a</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-57" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">b</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_pathspec_free-41" class="fnlink" href="../../#v1.6.0/group/pathspec/git_pathspec_free">git_pathspec_free</a></span><span class="p">(</span><span class="n">ps</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_free-54" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_free">git_revwalk_free</a></span><span class="p">(</span><span class="n">s</span><span class="p">.</span><span class="n">walker</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_pathspec_free-41" class="fnlink" href="../../#v1.6.1/group/pathspec/git_pathspec_free">git_pathspec_free</a></span><span class="p">(</span><span class="n">ps</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_free-54" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_free">git_revwalk_free</a></span><span class="p">(</span><span class="n">s</span><span class="p">.</span><span class="n">walker</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -342,7 +342,7 @@ revwalker configuration calls</li>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">filter</span> <span class="o">==</span> <span class="nb">NULL</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">message</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-9" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">NULL</span> <span class="o">&&</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">message</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-9" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">NULL</span> <span class="o">&&</span>
|
||||
<span class="n">strstr</span><span class="p">(</span><span class="n">message</span><span class="p">,</span> <span class="n">filter</span><span class="p">)</span> <span class="o">!=</span> <span class="nb">NULL</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
|
||||
|
||||
@@ -372,22 +372,22 @@ revwalker configuration calls</li>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">s</span><span class="o">-></span><span class="n">walker</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_revwalk_new-46" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_new">git_revwalk_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_new-46" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_new">git_revwalk_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">),</span>
|
||||
<span class="s">"Could not create revision walker"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_sorting-52" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_sorting">git_revwalk_sorting</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">sorting</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_sorting-52" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_sorting">git_revwalk_sorting</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">sorting</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">obj</span><span class="p">)</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_push_head-49" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_push_head">git_revwalk_push_head</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_push_head-49" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_push_head">git_revwalk_push_head</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">),</span>
|
||||
<span class="s">"Could not find repository HEAD"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">hide</span><span class="p">)</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_hide-50" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_hide">git_revwalk_hide</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n"><a name="git_object_id-33" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_hide-50" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_hide">git_revwalk_hide</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n"><a name="git_object_id-33" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span>
|
||||
<span class="s">"Reference does not refer to a commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_push-48" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_push">git_revwalk_push</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n"><a name="git_object_id-34" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_push-48" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_push">git_revwalk_push</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n"><a name="git_object_id-34" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">obj</span><span class="p">)),</span>
|
||||
<span class="s">"Reference does not refer to a commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_object_free-37" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-37" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -413,9 +413,9 @@ revwalker configuration calls</li>
|
||||
<span class="n">revs</span><span class="p">.</span><span class="n">flags</span> <span class="o">=</span> <span class="n">GIT_REVSPEC_SINGLE</span><span class="p">;</span>
|
||||
<span class="n">hide</span> <span class="o">=</span> <span class="o">!</span><span class="n">hide</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_revparse_single-44" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">revs</span><span class="p">.</span><span class="n">from</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">revstr</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_revparse_single-44" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">revs</span><span class="p">.</span><span class="n">from</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">revstr</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_revparse-45" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse">git_revparse</a></span><span class="p">(</span><span class="o">&</span><span class="n">revs</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">revstr</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_revparse-45" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse">git_revparse</a></span><span class="p">(</span><span class="o">&</span><span class="n">revs</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">revstr</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">revs</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_REVSPEC_SINGLE</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span>
|
||||
@@ -425,11 +425,11 @@ revwalker configuration calls</li>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">revs</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_REVSPEC_MERGE_BASE</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">git_oid</span> <span class="n">base</span><span class="p">;</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_merge_base-31" class="fnlink" href="../../#v1.6.0/group/merge/git_merge_base">git_merge_base</a></span><span class="p">(</span><span class="o">&</span><span class="n">base</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_object_id-35" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revs</span><span class="p">.</span><span class="n">from</span><span class="p">),</span> <span class="n"><a name="git_object_id-36" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revs</span><span class="p">.</span><span class="n">to</span><span class="p">)),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_merge_base-31" class="fnlink" href="../../#v1.6.1/group/merge/git_merge_base">git_merge_base</a></span><span class="p">(</span><span class="o">&</span><span class="n">base</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_object_id-35" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revs</span><span class="p">.</span><span class="n">from</span><span class="p">),</span> <span class="n"><a name="git_object_id-36" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">revs</span><span class="p">.</span><span class="n">to</span><span class="p">)),</span>
|
||||
<span class="s">"Could not find merge base"</span><span class="p">,</span> <span class="n">revstr</span><span class="p">);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_object_lookup-32" class="fnlink" href="../../#v1.6.0/group/object/git_object_lookup">git_object_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">revs</span><span class="p">.</span><span class="n">to</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">base</span><span class="p">,</span> <span class="n">GIT_OBJECT_COMMIT</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_object_lookup-32" class="fnlink" href="../../#v1.6.1/group/object/git_object_lookup">git_object_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">revs</span><span class="p">.</span><span class="n">to</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">base</span><span class="p">,</span> <span class="n">GIT_OBJECT_COMMIT</span><span class="p">),</span>
|
||||
<span class="s">"Could not find merge base commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n">push_rev</span><span class="p">(</span><span class="n">s</span><span class="p">,</span> <span class="n">revs</span><span class="p">.</span><span class="n">to</span><span class="p">,</span> <span class="n">hide</span><span class="p">);</span>
|
||||
@@ -464,7 +464,7 @@ revwalker configuration calls</li>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">s</span><span class="o">-></span><span class="n">repodir</span><span class="p">)</span> <span class="n">s</span><span class="o">-></span><span class="n">repodir</span> <span class="o">=</span> <span class="s">"."</span><span class="p">;</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_open_ext-43" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_open_ext">git_repository_open_ext</a></span><span class="p">(</span><span class="o">&</span><span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repodir</span><span class="p">,</span> <span class="mi">0</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_repository_open_ext-43" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_open_ext">git_repository_open_ext</a></span><span class="p">(</span><span class="o">&</span><span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repodir</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">),</span>
|
||||
<span class="s">"Could not open repository"</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repodir</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -478,7 +478,7 @@ revwalker configuration calls</li>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">)</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_new-47" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_new">git_revwalk_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revwalk_new-47" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_new">git_revwalk_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">repo</span><span class="p">),</span>
|
||||
<span class="s">"Could not create revision walker"</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">sort_mode</span> <span class="o">==</span> <span class="n">GIT_SORT_REVERSE</span><span class="p">)</span>
|
||||
@@ -486,7 +486,7 @@ revwalker configuration calls</li>
|
||||
<span class="k">else</span>
|
||||
<span class="n">s</span><span class="o">-></span><span class="n">sorting</span> <span class="o">=</span> <span class="n">sort_mode</span> <span class="o">|</span> <span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">sorting</span> <span class="o">&</span> <span class="n">GIT_SORT_REVERSE</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_revwalk_sorting-53" class="fnlink" href="../../#v1.6.0/group/revwalk/git_revwalk_sorting">git_revwalk_sorting</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">sorting</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_revwalk_sorting-53" class="fnlink" href="../../#v1.6.1/group/revwalk/git_revwalk_sorting">git_revwalk_sorting</a></span><span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">walker</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">sorting</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -540,29 +540,29 @@ revwalker configuration calls</li>
|
||||
<span class="k">const</span> <span class="n">git_signature</span> <span class="o">*</span><span class="n">sig</span><span class="p">;</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">scan</span><span class="p">,</span> <span class="o">*</span><span class="n">eol</span><span class="p">;</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-38" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">buf</span><span class="p">),</span> <span class="n"><a name="git_commit_id-6" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_id">git_commit_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-38" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">buf</span><span class="p">),</span> <span class="n"><a name="git_commit_id-6" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_id">git_commit_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"commit %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">buf</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">opts</span><span class="o">-></span><span class="n">show_log_size</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"log size %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n">strlen</span><span class="p">(</span><span class="n"><a name="git_commit_message-10" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">)));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"log size %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n">strlen</span><span class="p">(</span><span class="n"><a name="git_commit_message-10" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">)));</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">count</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_commit_parentcount-21" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span> <span class="o">></span> <span class="mi">1</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">count</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_commit_parentcount-21" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parentcount">git_commit_parentcount</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span> <span class="o">></span> <span class="mi">1</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Merge:"</span><span class="p">);</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">count</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_tostr-39" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="mi">8</span><span class="p">,</span> <span class="n"><a name="git_commit_parent_id-24" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parent_id">git_commit_parent_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">,</span> <span class="n">i</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-39" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="mi">8</span><span class="p">,</span> <span class="n"><a name="git_commit_parent_id-24" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parent_id">git_commit_parent_id</a></span><span class="p">(</span><span class="n">commit</span><span class="p">,</span> <span class="n">i</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">" %s"</span><span class="p">,</span> <span class="n">buf</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">sig</span> <span class="o">=</span> <span class="n"><a name="git_commit_author-14" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">NULL</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">sig</span> <span class="o">=</span> <span class="n"><a name="git_commit_author-14" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_author">git_commit_author</a></span><span class="p">(</span><span class="n">commit</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">NULL</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Author: %s <%s></span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">sig</span><span class="o">-></span><span class="n">name</span><span class="p">,</span> <span class="n">sig</span><span class="o">-></span><span class="n">email</span><span class="p">);</span>
|
||||
<span class="n">print_time</span><span class="p">(</span><span class="o">&</span><span class="n">sig</span><span class="o">-></span><span class="n">when</span><span class="p">,</span> <span class="s">"Date: "</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">scan</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-11" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span> <span class="n">scan</span> <span class="o">&&</span> <span class="o">*</span><span class="n">scan</span><span class="p">;</span> <span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">scan</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-11" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span> <span class="n">scan</span> <span class="o">&&</span> <span class="o">*</span><span class="n">scan</span><span class="p">;</span> <span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">eol</span> <span class="o">=</span> <span class="n">scan</span><span class="p">;</span> <span class="o">*</span><span class="n">eol</span> <span class="o">&&</span> <span class="o">*</span><span class="n">eol</span> <span class="o">!=</span> <span class="sc">'\n'</span><span class="p">;</span> <span class="o">++</span><span class="n">eol</span><span class="p">)</span> <span class="cm">/* find eol */</span><span class="p">;</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">" %.*s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="p">(</span><span class="kt">int</span><span class="p">)(</span><span class="n">eol</span> <span class="o">-</span> <span class="n">scan</span><span class="p">),</span> <span class="n">scan</span><span class="p">);</span>
|
||||
@@ -588,19 +588,19 @@ revwalker configuration calls</li>
|
||||
<span class="kt">int</span> <span class="n">ndeltas</span><span class="p">;</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span>
|
||||
<span class="n"><a name="git_commit_parent-23" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_parent">git_commit_parent</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="p">(</span><span class="kt">size_t</span><span class="p">)</span><span class="n">i</span><span class="p">),</span> <span class="s">"Get parent"</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_commit_tree-18" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">a</span><span class="p">,</span> <span class="n">parent</span><span class="p">),</span> <span class="s">"Tree for parent"</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_commit_tree-19" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">,</span> <span class="n">commit</span><span class="p">),</span> <span class="s">"Tree for commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_parent-23" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_parent">git_commit_parent</a></span><span class="p">(</span><span class="o">&</span><span class="n">parent</span><span class="p">,</span> <span class="n">commit</span><span class="p">,</span> <span class="p">(</span><span class="kt">size_t</span><span class="p">)</span><span class="n">i</span><span class="p">),</span> <span class="s">"Get parent"</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_commit_tree-18" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">a</span><span class="p">,</span> <span class="n">parent</span><span class="p">),</span> <span class="s">"Tree for parent"</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_commit_tree-19" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_tree">git_commit_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">b</span><span class="p">,</span> <span class="n">commit</span><span class="p">),</span> <span class="s">"Tree for commit"</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_diff_tree_to_tree-28" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_tree_to_tree">git_diff_tree_to_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n"><a name="git_commit_owner-8" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_owner">git_commit_owner</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">a</span><span class="p">,</span> <span class="n">b</span><span class="p">,</span> <span class="n">opts</span><span class="p">),</span>
|
||||
<span class="n"><a name="git_diff_tree_to_tree-28" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_tree_to_tree">git_diff_tree_to_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">diff</span><span class="p">,</span> <span class="n"><a name="git_commit_owner-8" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_owner">git_commit_owner</a></span><span class="p">(</span><span class="n">commit</span><span class="p">),</span> <span class="n">a</span><span class="p">,</span> <span class="n">b</span><span class="p">,</span> <span class="n">opts</span><span class="p">),</span>
|
||||
<span class="s">"Checking diff between parent and commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n">ndeltas</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_diff_num_deltas-29" class="fnlink" href="../../#v1.6.0/group/diff/git_diff_num_deltas">git_diff_num_deltas</a></span><span class="p">(</span><span class="n">diff</span><span class="p">);</span>
|
||||
<span class="n">ndeltas</span> <span class="o">=</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span><span class="n"><a name="git_diff_num_deltas-29" class="fnlink" href="../../#v1.6.1/group/diff/git_diff_num_deltas">git_diff_num_deltas</a></span><span class="p">(</span><span class="n">diff</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_diff_free-26" class="fnlink" href="../../#v1.6.0/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-58" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">a</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-59" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">b</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-5" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_diff_free-26" class="fnlink" href="../../#v1.6.1/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-58" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">a</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_tree_free-59" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_free">git_tree_free</a></span><span class="p">(</span><span class="n">b</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_commit_free-5" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_free">git_commit_free</a></span><span class="p">(</span><span class="n">parent</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">ndeltas</span> <span class="o">></span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -158,10 +158,10 @@ This includes staged and committed files, but unstaged files will not display.</
|
||||
|
||||
<span class="cm">/* if there are no files explicitly listed by the user print all entries in the index */</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">opts</span><span class="o">-></span><span class="n">file_count</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="kt">size_t</span> <span class="n">entry_count</span> <span class="o">=</span> <span class="n"><a name="git_index_entrycount-2" class="fnlink" href="../../#v1.6.0/group/index/git_index_entrycount">git_index_entrycount</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="kt">size_t</span> <span class="n">entry_count</span> <span class="o">=</span> <span class="n"><a name="git_index_entrycount-2" class="fnlink" href="../../#v1.6.1/group/index/git_index_entrycount">git_index_entrycount</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">entry_count</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_index_get_byindex-3" class="fnlink" href="../../#v1.6.0/group/index/git_index_get_byindex">git_index_get_byindex</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_index_get_byindex-3" class="fnlink" href="../../#v1.6.1/group/index/git_index_get_byindex">git_index_get_byindex</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">puts</span><span class="p">(</span><span class="n">entry</span><span class="o">-></span><span class="n">path</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -171,7 +171,7 @@ This includes staged and committed files, but unstaged files will not display.</
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">opts</span><span class="o">-></span><span class="n">file_count</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">path</span> <span class="o">=</span> <span class="n">opts</span><span class="o">-></span><span class="n">files</span><span class="p">[</span><span class="n">i</span><span class="p">];</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_index_get_bypath-4" class="fnlink" href="../../#v1.6.0/group/index/git_index_get_bypath">git_index_get_bypath</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="n">path</span><span class="p">,</span> <span class="n">GIT_INDEX_STAGE_NORMAL</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">NULL</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">entry</span> <span class="o">=</span> <span class="n"><a name="git_index_get_bypath-4" class="fnlink" href="../../#v1.6.1/group/index/git_index_get_bypath">git_index_get_bypath</a></span><span class="p">(</span><span class="n">index</span><span class="p">,</span> <span class="n">path</span><span class="p">,</span> <span class="n">GIT_INDEX_STAGE_NORMAL</span><span class="p">))</span> <span class="o">!=</span> <span class="nb">NULL</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">puts</span><span class="p">(</span><span class="n">path</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="n">opts</span><span class="o">-></span><span class="n">error_unmatch</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"error: pathspec '%s' did not match any file(s) known to git.</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">path</span><span class="p">);</span>
|
||||
@@ -192,13 +192,13 @@ This includes staged and committed files, but unstaged files will not display.</
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n">parse_options</span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="p">,</span> <span class="n">argc</span><span class="p">,</span> <span class="n">argv</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="n">error</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_index-5" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_index-5" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">))</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n">print_paths</span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="p">,</span> <span class="n">index</span><span class="p">);</span>
|
||||
|
||||
<span class="nl">cleanup</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_index_free-1" class="fnlink" href="../../#v1.6.0/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_free-1" class="fnlink" href="../../#v1.6.1/group/index/git_index_free">git_index_free</a></span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -76,9 +76,9 @@
|
||||
<span class="n">git_remote_callbacks</span> <span class="n">callbacks</span> <span class="o">=</span> <span class="n">GIT_REMOTE_CALLBACKS_INIT</span><span class="p">;</span>
|
||||
|
||||
<span class="cm">/* Find the remote by name */</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_lookup-3" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_lookup-3" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">error</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_create_anonymous-2" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_create_anonymous">git_remote_create_anonymous</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_create_anonymous-2" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_create_anonymous">git_remote_create_anonymous</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">error</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -95,7 +95,7 @@ each of the remote references.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">callbacks</span><span class="p">.</span><span class="n">credentials</span> <span class="o">=</span> <span class="n">cred_acquire_cb</span><span class="p">;</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_connect-6" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_connect">git_remote_connect</a></span><span class="p">(</span><span class="n">remote</span><span class="p">,</span> <span class="n">GIT_DIRECTION_FETCH</span><span class="p">,</span> <span class="o">&</span><span class="n">callbacks</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_remote_connect-6" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_connect">git_remote_connect</a></span><span class="p">(</span><span class="n">remote</span><span class="p">,</span> <span class="n">GIT_DIRECTION_FETCH</span><span class="p">,</span> <span class="o">&</span><span class="n">callbacks</span><span class="p">,</span> <span class="nb">NULL</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">error</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span></pre></div>
|
||||
</td>
|
||||
@@ -109,17 +109,17 @@ each of the remote references.</p>
|
||||
their name next to what they point to.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_ls-4" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_ls">git_remote_ls</a></span><span class="p">(</span><span class="o">&</span><span class="n">refs</span><span class="p">,</span> <span class="o">&</span><span class="n">refs_len</span><span class="p">,</span> <span class="n">remote</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<div class='highlight'><pre> <span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_remote_ls-4" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_ls">git_remote_ls</a></span><span class="p">(</span><span class="o">&</span><span class="n">refs</span><span class="p">,</span> <span class="o">&</span><span class="n">refs_len</span><span class="p">,</span> <span class="n">remote</span><span class="p">)</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">refs_len</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="kt">char</span> <span class="n">oid</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span> <span class="o">+</span> <span class="mi">1</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="mi">0</span><span class="p">};</span>
|
||||
<span class="n"><a name="git_oid_fmt-1" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid</span><span class="p">,</span> <span class="o">&</span><span class="n">refs</span><span class="p">[</span><span class="n">i</span><span class="p">]</span><span class="o">-></span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_fmt-1" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_fmt">git_oid_fmt</a></span><span class="p">(</span><span class="n">oid</span><span class="p">,</span> <span class="o">&</span><span class="n">refs</span><span class="p">[</span><span class="n">i</span><span class="p">]</span><span class="o">-></span><span class="n">oid</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\t</span><span class="s">%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">oid</span><span class="p">,</span> <span class="n">refs</span><span class="p">[</span><span class="n">i</span><span class="p">]</span><span class="o">-></span><span class="n">name</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="nl">cleanup</span><span class="p">:</span>
|
||||
<span class="n"><a name="git_remote_free-5" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_remote_free-5" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="n">error</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -164,7 +164,7 @@
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads_count</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n">resolve_refish</span><span class="p">(</span><span class="o">&</span><span class="n">annotated</span><span class="p">[</span><span class="n">annotated_count</span><span class="o">++</span><span class="p">],</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="n">i</span><span class="p">]);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to resolve refish %s: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="n">i</span><span class="p">],</span> <span class="n"><a name="git_error_last-8" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to resolve refish %s: %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="n">i</span><span class="p">],</span> <span class="n"><a name="git_error_last-8" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">annotated_count</span><span class="o">--</span><span class="p">;</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
@@ -194,26 +194,26 @@
|
||||
<span class="n">git_reference</span> <span class="o">*</span><span class="n">head_ref</span><span class="p">;</span>
|
||||
|
||||
<span class="cm">/* HEAD reference is unborn, lookup manually so we don't try to resolve it */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_lookup-21" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">head_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"HEAD"</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_lookup-21" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_lookup">git_reference_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">head_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"HEAD"</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to lookup HEAD ref</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Grab the reference HEAD should be pointing to */</span>
|
||||
<span class="n">symbolic_ref</span> <span class="o">=</span> <span class="n"><a name="git_reference_symbolic_target-24" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_symbolic_target">git_reference_symbolic_target</a></span><span class="p">(</span><span class="n">head_ref</span><span class="p">);</span>
|
||||
<span class="n">symbolic_ref</span> <span class="o">=</span> <span class="n"><a name="git_reference_symbolic_target-24" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_symbolic_target">git_reference_symbolic_target</a></span><span class="p">(</span><span class="n">head_ref</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Create our master reference on the target OID */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_create-23" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_create">git_reference_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">target_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">symbolic_ref</span><span class="p">,</span> <span class="n">target_oid</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_create-23" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_create">git_reference_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">target_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">symbolic_ref</span><span class="p">,</span> <span class="n">target_oid</span><span class="p">,</span> <span class="mi">0</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">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to create master reference</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_reference_free-27" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">head_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-27" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">head_ref</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="cm">/* HEAD exists, just lookup and resolve */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_repository_head-31" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_head">git_repository_head</a></span><span class="p">(</span><span class="o">&</span><span class="n">target_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_repository_head-31" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_head">git_repository_head</a></span><span class="p">(</span><span class="o">&</span><span class="n">target_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to get HEAD reference</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
@@ -221,30 +221,30 @@
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Lookup the target object */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_object_lookup-17" class="fnlink" href="../../#v1.6.0/group/object/git_object_lookup">git_object_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">target_oid</span><span class="p">,</span> <span class="n">GIT_OBJECT_COMMIT</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_object_lookup-17" class="fnlink" href="../../#v1.6.1/group/object/git_object_lookup">git_object_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">target_oid</span><span class="p">,</span> <span class="n">GIT_OBJECT_COMMIT</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to lookup OID %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_oid_tostr_s-19" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr_s">git_oid_tostr_s</a></span><span class="p">(</span><span class="n">target_oid</span><span class="p">));</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to lookup OID %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n"><a name="git_oid_tostr_s-19" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr_s">git_oid_tostr_s</a></span><span class="p">(</span><span class="n">target_oid</span><span class="p">));</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Checkout the result so the workdir is in the expected state */</span>
|
||||
<span class="n">ff_checkout_options</span><span class="p">.</span><span class="n">checkout_strategy</span> <span class="o">=</span> <span class="n">GIT_CHECKOUT_SAFE</span><span class="p">;</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_checkout_tree-5" class="fnlink" href="../../#v1.6.0/group/checkout/git_checkout_tree">git_checkout_tree</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target</span><span class="p">,</span> <span class="o">&</span><span class="n">ff_checkout_options</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_checkout_tree-5" class="fnlink" href="../../#v1.6.1/group/checkout/git_checkout_tree">git_checkout_tree</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target</span><span class="p">,</span> <span class="o">&</span><span class="n">ff_checkout_options</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to checkout HEAD reference</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Move the target reference to the target OID */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_set_target-26" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_set_target">git_reference_set_target</a></span><span class="p">(</span><span class="o">&</span><span class="n">new_target_ref</span><span class="p">,</span> <span class="n">target_ref</span><span class="p">,</span> <span class="n">target_oid</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_set_target-26" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_set_target">git_reference_set_target</a></span><span class="p">(</span><span class="o">&</span><span class="n">new_target_ref</span><span class="p">,</span> <span class="n">target_ref</span><span class="p">,</span> <span class="n">target_oid</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">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to move HEAD reference</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_reference_free-28" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">target_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-29" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">new_target_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-18" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-28" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">target_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-29" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">new_target_ref</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-18" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
@@ -257,9 +257,9 @@
|
||||
<span class="k">const</span> <span class="n">git_index_entry</span> <span class="o">*</span><span class="n">their</span><span class="p">;</span>
|
||||
<span class="kt">int</span> <span class="n">err</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_index_conflict_iterator_new-12" class="fnlink" href="../../#v1.6.0/group/index/git_index_conflict_iterator_new">git_index_conflict_iterator_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">conflicts</span><span class="p">,</span> <span class="n">index</span><span class="p">),</span> <span class="s">"failed to create conflict iterator"</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_index_conflict_iterator_new-12" class="fnlink" href="../../#v1.6.1/group/index/git_index_conflict_iterator_new">git_index_conflict_iterator_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">conflicts</span><span class="p">,</span> <span class="n">index</span><span class="p">),</span> <span class="s">"failed to create conflict iterator"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="k">while</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_index_conflict_next-13" class="fnlink" href="../../#v1.6.0/group/index/git_index_conflict_next">git_index_conflict_next</a></span><span class="p">(</span><span class="o">&</span><span class="n">ancestor</span><span class="p">,</span> <span class="o">&</span><span class="n">our</span><span class="p">,</span> <span class="o">&</span><span class="n">their</span><span class="p">,</span> <span class="n">conflicts</span><span class="p">))</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">while</span> <span class="p">((</span><span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_index_conflict_next-13" class="fnlink" href="../../#v1.6.1/group/index/git_index_conflict_next">git_index_conflict_next</a></span><span class="p">(</span><span class="o">&</span><span class="n">ancestor</span><span class="p">,</span> <span class="o">&</span><span class="n">our</span><span class="p">,</span> <span class="o">&</span><span class="n">their</span><span class="p">,</span> <span class="n">conflicts</span><span class="p">))</span> <span class="o">==</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"conflict: a:%s o:%s t:%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="n">ancestor</span> <span class="o">?</span> <span class="n">ancestor</span><span class="o">-></span><span class="nl">path</span> <span class="p">:</span> <span class="s">"NULL"</span><span class="p">,</span>
|
||||
<span class="n">our</span><span class="o">-></span><span class="n">path</span> <span class="o">?</span> <span class="n">our</span><span class="o">-></span><span class="nl">path</span> <span class="p">:</span> <span class="s">"NULL"</span><span class="p">,</span>
|
||||
@@ -270,7 +270,7 @@
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"error iterating conflicts</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_index_conflict_iterator_free-14" class="fnlink" href="../../#v1.6.0/group/index/git_index_conflict_iterator_free">git_index_conflict_iterator_free</a></span><span class="p">(</span><span class="n">conflicts</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_index_conflict_iterator_free-14" class="fnlink" href="../../#v1.6.1/group/index/git_index_conflict_iterator_free">git_index_conflict_iterator_free</a></span><span class="p">(</span><span class="n">conflicts</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">int</span> <span class="nf">create_merge_commit</span><span class="p">(</span><span class="n">git_repository</span> <span class="o">*</span><span class="n">repo</span><span class="p">,</span> <span class="n">git_index</span> <span class="o">*</span><span class="n">index</span><span class="p">,</span> <span class="k">struct</span> <span class="n">merge_options</span> <span class="o">*</span><span class="n">opts</span><span class="p">)</span>
|
||||
@@ -289,7 +289,7 @@
|
||||
<span class="kt">int</span> <span class="n">err</span><span class="p">;</span>
|
||||
|
||||
<span class="cm">/* Grab our needed references */</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_head-32" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_head">git_repository_head</a></span><span class="p">(</span><span class="o">&</span><span class="n">head_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"failed to get repo HEAD"</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_repository_head-32" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_head">git_repository_head</a></span><span class="p">(</span><span class="o">&</span><span class="n">head_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"failed to get repo HEAD"</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">resolve_refish</span><span class="p">(</span><span class="o">&</span><span class="n">merge_commit</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="mi">0</span><span class="p">]))</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"failed to resolve refish %s"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
|
||||
<span class="n">free</span><span class="p">(</span><span class="n">parents</span><span class="p">);</span>
|
||||
@@ -297,18 +297,18 @@
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Maybe that's a ref, so DWIM it */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_dwim-22" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_dwim">git_reference_dwim</a></span><span class="p">(</span><span class="o">&</span><span class="n">merge_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">err</span><span class="p">,</span> <span class="s">"failed to DWIM reference"</span><span class="p">,</span> <span class="n"><a name="git_error_last-9" class="fnlink" href="../../#v1.6.0/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_dwim-22" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_dwim">git_reference_dwim</a></span><span class="p">(</span><span class="o">&</span><span class="n">merge_ref</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">heads</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">err</span><span class="p">,</span> <span class="s">"failed to DWIM reference"</span><span class="p">,</span> <span class="n"><a name="git_error_last-9" class="fnlink" href="../../#v1.6.1/group/error/git_error_last">git_error_last</a></span><span class="p">()</span><span class="o">-></span><span class="n">message</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Grab a signature */</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_signature_now-36" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_now">git_signature_now</a></span><span class="p">(</span><span class="o">&</span><span class="n">sign</span><span class="p">,</span> <span class="s">"Me"</span><span class="p">,</span> <span class="s">"me@example.com"</span><span class="p">),</span> <span class="s">"failed to create signature"</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_signature_now-36" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_now">git_signature_now</a></span><span class="p">(</span><span class="o">&</span><span class="n">sign</span><span class="p">,</span> <span class="s">"Me"</span><span class="p">,</span> <span class="s">"me@example.com"</span><span class="p">),</span> <span class="s">"failed to create signature"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="cp">#define MERGE_COMMIT_MSG "Merge %s '%s'"</span>
|
||||
<span class="cm">/* Prepare a standard merge commit message */</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">merge_ref</span> <span class="o">!=</span> <span class="nb">NULL</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_branch_name-4" class="fnlink" href="../../#v1.6.0/group/branch/git_branch_name">git_branch_name</a></span><span class="p">(</span><span class="o">&</span><span class="n">msg_target</span><span class="p">,</span> <span class="n">merge_ref</span><span class="p">),</span> <span class="s">"failed to get branch name of merged ref"</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_branch_name-4" class="fnlink" href="../../#v1.6.1/group/branch/git_branch_name">git_branch_name</a></span><span class="p">(</span><span class="o">&</span><span class="n">msg_target</span><span class="p">,</span> <span class="n">merge_ref</span><span class="p">),</span> <span class="s">"failed to get branch name of merged ref"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n">msg_target</span> <span class="o">=</span> <span class="n"><a name="git_oid_tostr_s-20" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr_s">git_oid_tostr_s</a></span><span class="p">(</span><span class="n"><a name="git_annotated_commit_id-1" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">merge_commit</span><span class="p">));</span>
|
||||
<span class="n">msg_target</span> <span class="o">=</span> <span class="n"><a name="git_oid_tostr_s-20" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr_s">git_oid_tostr_s</a></span><span class="p">(</span><span class="n"><a name="git_annotated_commit_id-1" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">merge_commit</span><span class="p">));</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">msglen</span> <span class="o">=</span> <span class="n">snprintf</span><span class="p">(</span><span class="nb">NULL</span><span class="p">,</span> <span class="mi">0</span><span class="p">,</span> <span class="n">MERGE_COMMIT_MSG</span><span class="p">,</span> <span class="p">(</span><span class="n">merge_ref</span> <span class="o">?</span> <span class="s">"branch"</span> <span class="o">:</span> <span class="s">"commit"</span><span class="p">),</span> <span class="n">msg_target</span><span class="p">);</span>
|
||||
@@ -320,19 +320,19 @@
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o"><</span> <span class="mi">0</span><span class="p">)</span> <span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
|
||||
<span class="cm">/* Setup our parent commits */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_peel-30" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_peel">git_reference_peel</a></span><span class="p">((</span><span class="n">git_object</span> <span class="o">**</span><span class="p">)</span><span class="o">&</span><span class="n">parents</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">head_ref</span><span class="p">,</span> <span class="n">GIT_OBJECT_COMMIT</span><span class="p">);</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_reference_peel-30" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_peel">git_reference_peel</a></span><span class="p">((</span><span class="n">git_object</span> <span class="o">**</span><span class="p">)</span><span class="o">&</span><span class="n">parents</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">head_ref</span><span class="p">,</span> <span class="n">GIT_OBJECT_COMMIT</span><span class="p">);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">err</span><span class="p">,</span> <span class="s">"failed to peel head reference"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">opts</span><span class="o">-></span><span class="n">annotated_count</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_commit_lookup-6" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">parents</span><span class="p">[</span><span class="n">i</span> <span class="o">+</span> <span class="mi">1</span><span class="p">],</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_annotated_commit_id-2" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">opts</span><span class="o">-></span><span class="n">annotated</span><span class="p">[</span><span class="n">i</span><span class="p">]));</span>
|
||||
<span class="n"><a name="git_commit_lookup-6" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_lookup">git_commit_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">parents</span><span class="p">[</span><span class="n">i</span> <span class="o">+</span> <span class="mi">1</span><span class="p">],</span> <span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_annotated_commit_id-2" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">opts</span><span class="o">-></span><span class="n">annotated</span><span class="p">[</span><span class="n">i</span><span class="p">]));</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Prepare our commit tree */</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_index_write_tree-10" class="fnlink" href="../../#v1.6.0/group/index/git_index_write_tree">git_index_write_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree_oid</span><span class="p">,</span> <span class="n">index</span><span class="p">),</span> <span class="s">"failed to write merged tree"</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_tree_lookup-37" class="fnlink" href="../../#v1.6.0/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_oid</span><span class="p">),</span> <span class="s">"failed to lookup tree"</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_index_write_tree-10" class="fnlink" href="../../#v1.6.1/group/index/git_index_write_tree">git_index_write_tree</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree_oid</span><span class="p">,</span> <span class="n">index</span><span class="p">),</span> <span class="s">"failed to write merged tree"</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_tree_lookup-37" class="fnlink" href="../../#v1.6.1/group/tree/git_tree_lookup">git_tree_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">tree</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">tree_oid</span><span class="p">),</span> <span class="s">"failed to lookup tree"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* Commit time ! */</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_commit_create-7" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_create">git_commit_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit_oid</span><span class="p">,</span>
|
||||
<span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_reference_name-25" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_name">git_reference_name</a></span><span class="p">(</span><span class="n">head_ref</span><span class="p">),</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_commit_create-7" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_create">git_commit_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">commit_oid</span><span class="p">,</span>
|
||||
<span class="n">repo</span><span class="p">,</span> <span class="n"><a name="git_reference_name-25" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_name">git_reference_name</a></span><span class="p">(</span><span class="n">head_ref</span><span class="p">),</span>
|
||||
<span class="n">sign</span><span class="p">,</span> <span class="n">sign</span><span class="p">,</span>
|
||||
<span class="nb">NULL</span><span class="p">,</span> <span class="n">msg</span><span class="p">,</span>
|
||||
<span class="n">tree</span><span class="p">,</span>
|
||||
@@ -340,7 +340,7 @@
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">err</span><span class="p">,</span> <span class="s">"failed to create commit"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="cm">/* We're done merging, cleanup the repository state */</span>
|
||||
<span class="n"><a name="git_repository_state_cleanup-34" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_state_cleanup">git_repository_state_cleanup</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_repository_state_cleanup-34" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_state_cleanup">git_repository_state_cleanup</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
|
||||
<span class="nl">cleanup</span><span class="p">:</span>
|
||||
<span class="n">free</span><span class="p">(</span><span class="n">parents</span><span class="p">);</span>
|
||||
@@ -360,7 +360,7 @@
|
||||
<span class="n">merge_options_init</span><span class="p">(</span><span class="o">&</span><span class="n">opts</span><span class="p">);</span>
|
||||
<span class="n">parse_options</span><span class="p">(</span><span class="o">&</span><span class="n">path</span><span class="p">,</span> <span class="o">&</span><span class="n">opts</span><span class="p">,</span> <span class="n">argc</span><span class="p">,</span> <span class="n">argv</span><span class="p">);</span>
|
||||
|
||||
<span class="n">state</span> <span class="o">=</span> <span class="n"><a name="git_repository_state-35" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_state">git_repository_state</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n">state</span> <span class="o">=</span> <span class="n"><a name="git_repository_state-35" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_state">git_repository_state</a></span><span class="p">(</span><span class="n">repo</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">state</span> <span class="o">!=</span> <span class="n">GIT_REPOSITORY_STATE_NONE</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">fprintf</span><span class="p">(</span><span class="n">stderr</span><span class="p">,</span> <span class="s">"repository is in unexpected state %d</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">state</span><span class="p">);</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
@@ -370,7 +370,7 @@
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">err</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span>
|
||||
<span class="k">goto</span> <span class="n">cleanup</span><span class="p">;</span>
|
||||
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_merge_analysis-15" class="fnlink" href="../../#v1.6.0/group/merge/git_merge_analysis">git_merge_analysis</a></span><span class="p">(</span><span class="o">&</span><span class="n">analysis</span><span class="p">,</span> <span class="o">&</span><span class="n">preference</span><span class="p">,</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_merge_analysis-15" class="fnlink" href="../../#v1.6.1/group/merge/git_merge_analysis">git_merge_analysis</a></span><span class="p">(</span><span class="o">&</span><span class="n">analysis</span><span class="p">,</span> <span class="o">&</span><span class="n">preference</span><span class="p">,</span>
|
||||
<span class="n">repo</span><span class="p">,</span>
|
||||
<span class="p">(</span><span class="k">const</span> <span class="n">git_annotated_commit</span> <span class="o">**</span><span class="p">)</span><span class="n">opts</span><span class="p">.</span><span class="n">annotated</span><span class="p">,</span>
|
||||
<span class="n">opts</span><span class="p">.</span><span class="n">annotated_count</span><span class="p">);</span>
|
||||
@@ -390,7 +390,7 @@
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="cm">/* Since this is a fast-forward, there can be only one merge head */</span>
|
||||
<span class="n">target_oid</span> <span class="o">=</span> <span class="n"><a name="git_annotated_commit_id-3" class="fnlink" href="../../#v1.6.0/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">opts</span><span class="p">.</span><span class="n">annotated</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
|
||||
<span class="n">target_oid</span> <span class="o">=</span> <span class="n"><a name="git_annotated_commit_id-3" class="fnlink" href="../../#v1.6.1/group/annotated/git_annotated_commit_id">git_annotated_commit_id</a></span><span class="p">(</span><span class="n">opts</span><span class="p">.</span><span class="n">annotated</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
|
||||
<span class="n">assert</span><span class="p">(</span><span class="n">opts</span><span class="p">.</span><span class="n">annotated_count</span> <span class="o">==</span> <span class="mi">1</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">perform_fastforward</span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">target_oid</span><span class="p">,</span> <span class="p">(</span><span class="n">analysis</span> <span class="o">&</span> <span class="n">GIT_MERGE_ANALYSIS_UNBORN</span><span class="p">));</span>
|
||||
@@ -408,7 +408,7 @@
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_merge-16" class="fnlink" href="../../#v1.6.0/group/merge/git_merge">git_merge</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span>
|
||||
<span class="n">err</span> <span class="o">=</span> <span class="n"><a name="git_merge-16" class="fnlink" href="../../#v1.6.1/group/merge/git_merge">git_merge</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span>
|
||||
<span class="p">(</span><span class="k">const</span> <span class="n">git_annotated_commit</span> <span class="o">**</span><span class="p">)</span><span class="n">opts</span><span class="p">.</span><span class="n">annotated</span><span class="p">,</span> <span class="n">opts</span><span class="p">.</span><span class="n">annotated_count</span><span class="p">,</span>
|
||||
<span class="o">&</span><span class="n">merge_opts</span><span class="p">,</span> <span class="o">&</span><span class="n">checkout_opts</span><span class="p">);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">err</span><span class="p">,</span> <span class="s">"merge failed"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
@@ -416,9 +416,9 @@
|
||||
|
||||
<span class="cm">/* If we get here, we actually performed the merge above */</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_repository_index-33" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"failed to get repository index"</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_repository_index-33" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_index">git_repository_index</a></span><span class="p">(</span><span class="o">&</span><span class="n">index</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span> <span class="s">"failed to get repository index"</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"><a name="git_index_has_conflicts-11" class="fnlink" href="../../#v1.6.0/group/index/git_index_has_conflicts">git_index_has_conflicts</a></span><span class="p">(</span><span class="n">index</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_index_has_conflicts-11" class="fnlink" href="../../#v1.6.1/group/index/git_index_has_conflicts">git_index_has_conflicts</a></span><span class="p">(</span><span class="n">index</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="cm">/* Handle conflicts */</span>
|
||||
<span class="n">output_conflicts</span><span class="p">(</span><span class="n">index</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">opts</span><span class="p">.</span><span class="n">no_commit</span><span class="p">)</span> <span class="p">{</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -131,11 +131,11 @@ simulate <code>git push</code>.</p>
|
||||
<span class="k">return</span> <span class="o">-</span><span class="mi">1</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_remote_lookup-1" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"origin"</span> <span class="p">),</span> <span class="s">"Unable to lookup remote"</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_remote_lookup-1" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="s">"origin"</span> <span class="p">),</span> <span class="s">"Unable to lookup remote"</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_push_options_init-2" class="fnlink" href="../../#v1.6.0/group/push/git_push_options_init">git_push_options_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">options</span><span class="p">,</span> <span class="n">GIT_PUSH_OPTIONS_VERSION</span> <span class="p">),</span> <span class="s">"Error initializing push"</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_push_options_init-2" class="fnlink" href="../../#v1.6.1/group/push/git_push_options_init">git_push_options_init</a></span><span class="p">(</span><span class="o">&</span><span class="n">options</span><span class="p">,</span> <span class="n">GIT_PUSH_OPTIONS_VERSION</span> <span class="p">),</span> <span class="s">"Error initializing push"</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_remote_push-3" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_push">git_remote_push</a></span><span class="p">(</span><span class="n">remote</span><span class="p">,</span> <span class="o">&</span><span class="n">refspecs</span><span class="p">,</span> <span class="o">&</span><span class="n">options</span><span class="p">),</span> <span class="s">"Error pushing"</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_remote_push-3" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_push">git_remote_push</a></span><span class="p">(</span><span class="n">remote</span><span class="p">,</span> <span class="o">&</span><span class="n">refspecs</span><span class="p">,</span> <span class="o">&</span><span class="n">options</span><span class="p">),</span> <span class="s">"Error pushing"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"pushed</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -161,7 +161,7 @@ program is emulating.</p>
|
||||
<span class="n">name</span> <span class="o">=</span> <span class="n">o</span><span class="o">-></span><span class="n">argv</span><span class="p">[</span><span class="mi">0</span><span class="p">];</span>
|
||||
<span class="n">url</span> <span class="o">=</span> <span class="n">o</span><span class="o">-></span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">];</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_remote_create-1" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_create">git_remote_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">url</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_remote_create-1" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_create">git_remote_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">url</span><span class="p">),</span>
|
||||
<span class="s">"could not create remote"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -176,7 +176,7 @@ program is emulating.</p>
|
||||
|
||||
<span class="n">name</span> <span class="o">=</span> <span class="n">o</span><span class="o">-></span><span class="n">argv</span><span class="p">[</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_remote_delete-10" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_delete">git_remote_delete</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_remote_delete-10" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_delete">git_remote_delete</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">),</span>
|
||||
<span class="s">"could not delete remote"</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -194,7 +194,7 @@ program is emulating.</p>
|
||||
<span class="n">old</span> <span class="o">=</span> <span class="n">o</span><span class="o">-></span><span class="n">argv</span><span class="p">[</span><span class="mi">0</span><span class="p">];</span>
|
||||
<span class="n">new</span> <span class="o">=</span> <span class="n">o</span><span class="o">-></span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">];</span>
|
||||
|
||||
<span class="n">retval</span> <span class="o">=</span> <span class="n"><a name="git_remote_rename-9" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_rename">git_remote_rename</a></span><span class="p">(</span><span class="o">&</span><span class="n">problems</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">old</span><span class="p">,</span> <span class="n">new</span><span class="p">);</span>
|
||||
<span class="n">retval</span> <span class="o">=</span> <span class="n"><a name="git_remote_rename-9" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_rename">git_remote_rename</a></span><span class="p">(</span><span class="o">&</span><span class="n">problems</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">old</span><span class="p">,</span> <span class="n">new</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">retval</span><span class="p">)</span>
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
|
||||
@@ -202,7 +202,7 @@ program is emulating.</p>
|
||||
<span class="n">puts</span><span class="p">(</span><span class="n">problems</span><span class="p">.</span><span class="n">strings</span><span class="p">[</span><span class="mi">0</span><span class="p">]);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_strarray_dispose-11" class="fnlink" href="../../#v1.6.0/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">problems</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_strarray_dispose-11" class="fnlink" href="../../#v1.6.1/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">problems</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="n">retval</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
@@ -230,9 +230,9 @@ program is emulating.</p>
|
||||
<span class="n">usage</span><span class="p">(</span><span class="s">"you need to specify remote and the new URL"</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">push</span><span class="p">)</span>
|
||||
<span class="n">retval</span> <span class="o">=</span> <span class="n"><a name="git_remote_set_pushurl-6" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_set_pushurl">git_remote_set_pushurl</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">url</span><span class="p">);</span>
|
||||
<span class="n">retval</span> <span class="o">=</span> <span class="n"><a name="git_remote_set_pushurl-6" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_set_pushurl">git_remote_set_pushurl</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">url</span><span class="p">);</span>
|
||||
<span class="k">else</span>
|
||||
<span class="n">retval</span> <span class="o">=</span> <span class="n"><a name="git_remote_set_url-5" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_set_url">git_remote_set_url</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">url</span><span class="p">);</span>
|
||||
<span class="n">retval</span> <span class="o">=</span> <span class="n"><a name="git_remote_set_url-5" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_set_url">git_remote_set_url</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">url</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">retval</span><span class="p">,</span> <span class="s">"could not set URL"</span><span class="p">,</span> <span class="n">url</span><span class="p">);</span>
|
||||
|
||||
@@ -255,7 +255,7 @@ program is emulating.</p>
|
||||
<span class="p">}</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_remote_list-8" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_list">git_remote_list</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_remote_list-8" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_list">git_remote_list</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span>
|
||||
<span class="s">"could not retrieve remotes"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="p">(</span><span class="kt">int</span><span class="p">)</span> <span class="n">remotes</span><span class="p">.</span><span class="n">count</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
@@ -265,22 +265,22 @@ program is emulating.</p>
|
||||
<span class="k">continue</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_remote_lookup-2" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_remote_lookup-2" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_lookup">git_remote_lookup</a></span><span class="p">(</span><span class="o">&</span><span class="n">remote</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">),</span>
|
||||
<span class="s">"could not look up remote"</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
|
||||
<span class="n">fetch</span> <span class="o">=</span> <span class="n"><a name="git_remote_url-3" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_url">git_remote_url</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="n">fetch</span> <span class="o">=</span> <span class="n"><a name="git_remote_url-3" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_url">git_remote_url</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">fetch</span><span class="p">)</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\t</span><span class="s">%s (fetch)</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">fetch</span><span class="p">);</span>
|
||||
<span class="n">push</span> <span class="o">=</span> <span class="n"><a name="git_remote_pushurl-4" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_pushurl">git_remote_pushurl</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="n">push</span> <span class="o">=</span> <span class="n"><a name="git_remote_pushurl-4" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_pushurl">git_remote_pushurl</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="cm">/* use fetch URL if no distinct push URL has been set */</span>
|
||||
<span class="n">push</span> <span class="o">=</span> <span class="n">push</span> <span class="o">?</span> <span class="nl">push</span> <span class="p">:</span> <span class="n">fetch</span><span class="p">;</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">push</span><span class="p">)</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\t</span><span class="s">%s (push)</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">push</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_remote_free-7" class="fnlink" href="../../#v1.6.0/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_remote_free-7" class="fnlink" href="../../#v1.6.1/group/remote/git_remote_free">git_remote_free</a></span><span class="p">(</span><span class="n">remote</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_strarray_dispose-12" class="fnlink" href="../../#v1.6.0/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_strarray_dispose-12" class="fnlink" href="../../#v1.6.1/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">remotes</span><span class="p">);</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -143,34 +143,34 @@
|
||||
<span class="n">git_revspec</span> <span class="n">rs</span><span class="p">;</span>
|
||||
<span class="kt">char</span> <span class="n">str</span><span class="p">[</span><span class="n">GIT_OID_SHA1_HEXSIZE</span> <span class="o">+</span> <span class="mi">1</span><span class="p">];</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse-14" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse">git_revparse</a></span><span class="p">(</span><span class="o">&</span><span class="n">rs</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">),</span> <span class="s">"Could not parse"</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">);</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse-14" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse">git_revparse</a></span><span class="p">(</span><span class="o">&</span><span class="n">rs</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">),</span> <span class="s">"Could not parse"</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">rs</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_REVSPEC_SINGLE</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_tostr-10" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="n"><a name="git_object_id-2" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-10" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="n"><a name="git_object_id-2" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">str</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-7" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-7" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">else</span> <span class="k">if</span> <span class="p">((</span><span class="n">rs</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_REVSPEC_RANGE</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n"><a name="git_oid_tostr-11" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="n"><a name="git_object_id-3" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">to</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-11" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="n"><a name="git_object_id-3" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">to</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">str</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-8" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">to</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-8" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">to</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">((</span><span class="n">rs</span><span class="p">.</span><span class="n">flags</span> <span class="o">&</span> <span class="n">GIT_REVSPEC_MERGE_BASE</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">git_oid</span> <span class="n">base</span><span class="p">;</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_merge_base-1" class="fnlink" href="../../#v1.6.0/group/merge/git_merge_base">git_merge_base</a></span><span class="p">(</span><span class="o">&</span><span class="n">base</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_object_id-4" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">),</span> <span class="n"><a name="git_object_id-5" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">to</span><span class="p">)),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_merge_base-1" class="fnlink" href="../../#v1.6.1/group/merge/git_merge_base">git_merge_base</a></span><span class="p">(</span><span class="o">&</span><span class="n">base</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_object_id-4" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">),</span> <span class="n"><a name="git_object_id-5" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">to</span><span class="p">)),</span>
|
||||
<span class="s">"Could not find merge base"</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-12" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="o">&</span><span class="n">base</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_oid_tostr-12" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="o">&</span><span class="n">base</span><span class="p">);</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">str</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_oid_tostr-13" class="fnlink" href="../../#v1.6.0/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="n"><a name="git_object_id-6" class="fnlink" href="../../#v1.6.0/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_oid_tostr-13" class="fnlink" href="../../#v1.6.1/group/oid/git_oid_tostr">git_oid_tostr</a></span><span class="p">(</span><span class="n">str</span><span class="p">,</span> <span class="k">sizeof</span><span class="p">(</span><span class="n">str</span><span class="p">),</span> <span class="n"><a name="git_object_id-6" class="fnlink" href="../../#v1.6.1/group/object/git_object_id">git_object_id</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"^%s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">str</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-9" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-9" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">rs</span><span class="p">.</span><span class="n">from</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
<span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Invalid results from <a name="git_revparse-15" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse">git_revparse</a>"</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">);</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Invalid results from <a name="git_revparse-15" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse">git_revparse</a>"</span><span class="p">,</span> <span class="n">ps</span><span class="o">-></span><span class="n">spec</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -149,9 +149,9 @@ from <code>git status</code></li>
|
||||
|
||||
<span class="n">parse_opts</span><span class="p">(</span><span class="o">&</span><span class="n">o</span><span class="p">,</span> <span class="n">argc</span><span class="p">,</span> <span class="n">argv</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_repository_is_bare-5" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_is_bare">git_repository_is_bare</a></span><span class="p">(</span><span class="n">repo</span><span class="p">))</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n"><a name="git_repository_is_bare-5" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_is_bare">git_repository_is_bare</a></span><span class="p">(</span><span class="n">repo</span><span class="p">))</span>
|
||||
<span class="n">fatal</span><span class="p">(</span><span class="s">"Cannot report status on bare repository"</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_repository_path-4" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_path">git_repository_path</a></span><span class="p">(</span><span class="n">repo</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_repository_path-4" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_path">git_repository_path</a></span><span class="p">(</span><span class="n">repo</span><span class="p">));</span>
|
||||
|
||||
<span class="nl">show_status</span><span class="p">:</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">repeat</span><span class="p">)</span>
|
||||
@@ -165,18 +165,18 @@ from <code>git status</code></li>
|
||||
</div>
|
||||
<p>Run status on the repository</p>
|
||||
|
||||
<p>We use <code><a name="git_status_list_new-8" class="fnlink" href="../../#v1.6.0/group/status/git_status_list_new">git_status_list_new</a>()</code> to generate a list of status
|
||||
<p>We use <code><a name="git_status_list_new-8" class="fnlink" href="../../#v1.6.1/group/status/git_status_list_new">git_status_list_new</a>()</code> to generate a list of status
|
||||
information which lets us iterate over it at our
|
||||
convenience and extract the data we want to show out of
|
||||
each entry.</p>
|
||||
|
||||
<p>You can use <code><a name="git_status_foreach-6" class="fnlink" href="../../#v1.6.0/group/status/git_status_foreach">git_status_foreach</a>()</code> or
|
||||
<code><a name="git_status_foreach_ext-7" class="fnlink" href="../../#v1.6.0/group/status/git_status_foreach_ext">git_status_foreach_ext</a>()</code> if you'd prefer to execute a
|
||||
<p>You can use <code><a name="git_status_foreach-6" class="fnlink" href="../../#v1.6.1/group/status/git_status_foreach">git_status_foreach</a>()</code> or
|
||||
<code><a name="git_status_foreach_ext-7" class="fnlink" href="../../#v1.6.1/group/status/git_status_foreach_ext">git_status_foreach_ext</a>()</code> if you'd prefer to execute a
|
||||
callback for each entry. The latter gives you more control
|
||||
about what results are presented.</p>
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_status_list_new-9" class="fnlink" href="../../#v1.6.0/group/status/git_status_list_new">git_status_list_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">status</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">statusopt</span><span class="p">),</span>
|
||||
<div class='highlight'><pre> <span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_status_list_new-9" class="fnlink" href="../../#v1.6.1/group/status/git_status_list_new">git_status_list_new</a></span><span class="p">(</span><span class="o">&</span><span class="n">status</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="o">&</span><span class="n">o</span><span class="p">.</span><span class="n">statusopt</span><span class="p">),</span>
|
||||
<span class="s">"Could not get status"</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="p">.</span><span class="n">showbranch</span><span class="p">)</span>
|
||||
@@ -184,7 +184,7 @@ about what results are presented.</p>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">showsubmod</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="kt">int</span> <span class="n">submod_count</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_submodule_foreach-19" class="fnlink" href="../../#v1.6.0/group/submodule/git_submodule_foreach">git_submodule_foreach</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">print_submod</span><span class="p">,</span> <span class="o">&</span><span class="n">submod_count</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_submodule_foreach-19" class="fnlink" href="../../#v1.6.1/group/submodule/git_submodule_foreach">git_submodule_foreach</a></span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">print_submod</span><span class="p">,</span> <span class="o">&</span><span class="n">submod_count</span><span class="p">),</span>
|
||||
<span class="s">"Cannot iterate submodules"</span><span class="p">,</span> <span class="n">o</span><span class="p">.</span><span class="n">repodir</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
@@ -193,7 +193,7 @@ about what results are presented.</p>
|
||||
<span class="k">else</span>
|
||||
<span class="n">print_short</span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="n">status</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_status_list_free-18" class="fnlink" href="../../#v1.6.0/group/status/git_status_list_free">git_status_list_free</a></span><span class="p">(</span><span class="n">status</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_status_list_free-18" class="fnlink" href="../../#v1.6.1/group/status/git_status_list_free">git_status_list_free</a></span><span class="p">(</span><span class="n">status</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">repeat</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">sleep</span><span class="p">(</span><span class="n">o</span><span class="p">.</span><span class="n">repeat</span><span class="p">);</span>
|
||||
@@ -219,12 +219,12 @@ branch.</p>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">branch</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span>
|
||||
<span class="n">git_reference</span> <span class="o">*</span><span class="n">head</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span>
|
||||
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_head-3" class="fnlink" href="../../#v1.6.0/group/repository/git_repository_head">git_repository_head</a></span><span class="p">(</span><span class="o">&</span><span class="n">head</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
<span class="n">error</span> <span class="o">=</span> <span class="n"><a name="git_repository_head-3" class="fnlink" href="../../#v1.6.1/group/repository/git_repository_head">git_repository_head</a></span><span class="p">(</span><span class="o">&</span><span class="n">head</span><span class="p">,</span> <span class="n">repo</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">error</span> <span class="o">==</span> <span class="n">GIT_EUNBORNBRANCH</span> <span class="o">||</span> <span class="n">error</span> <span class="o">==</span> <span class="n">GIT_ENOTFOUND</span><span class="p">)</span>
|
||||
<span class="n">branch</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span>
|
||||
<span class="k">else</span> <span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">error</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">branch</span> <span class="o">=</span> <span class="n"><a name="git_reference_shorthand-2" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_shorthand">git_reference_shorthand</a></span><span class="p">(</span><span class="n">head</span><span class="p">);</span>
|
||||
<span class="n">branch</span> <span class="o">=</span> <span class="n"><a name="git_reference_shorthand-2" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_shorthand">git_reference_shorthand</a></span><span class="p">(</span><span class="n">head</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n">error</span><span class="p">,</span> <span class="s">"failed to get current branch"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
@@ -234,7 +234,7 @@ branch.</p>
|
||||
<span class="k">else</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"## %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">branch</span> <span class="o">?</span> <span class="nl">branch</span> <span class="p">:</span> <span class="s">"HEAD (no branch)"</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_reference_free-1" class="fnlink" href="../../#v1.6.0/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">head</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_reference_free-1" class="fnlink" href="../../#v1.6.1/group/reference/git_reference_free">git_reference_free</a></span><span class="p">(</span><span class="n">head</span><span class="p">);</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -249,7 +249,7 @@ in long form, including the command-line hints.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre><span class="k">static</span> <span class="kt">void</span> <span class="nf">print_long</span><span class="p">(</span><span class="n">git_status_list</span> <span class="o">*</span><span class="n">status</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">,</span> <span class="n">maxi</span> <span class="o">=</span> <span class="n"><a name="git_status_list_entrycount-10" class="fnlink" href="../../#v1.6.0/group/status/git_status_list_entrycount">git_status_list_entrycount</a></span><span class="p">(</span><span class="n">status</span><span class="p">);</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">,</span> <span class="n">maxi</span> <span class="o">=</span> <span class="n"><a name="git_status_list_entrycount-10" class="fnlink" href="../../#v1.6.1/group/status/git_status_list_entrycount">git_status_list_entrycount</a></span><span class="p">(</span><span class="n">status</span><span class="p">);</span>
|
||||
<span class="k">const</span> <span class="n">git_status_entry</span> <span class="o">*</span><span class="n">s</span><span class="p">;</span>
|
||||
<span class="kt">int</span> <span class="n">header</span> <span class="o">=</span> <span class="mi">0</span><span class="p">,</span> <span class="n">changes_in_index</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="kt">int</span> <span class="n">changed_in_workdir</span> <span class="o">=</span> <span class="mi">0</span><span class="p">,</span> <span class="n">rm_in_workdir</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
@@ -267,7 +267,7 @@ in long form, including the command-line hints.</p>
|
||||
<div class='highlight'><pre> <span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">maxi</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="kt">char</span> <span class="o">*</span><span class="n">istatus</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span>
|
||||
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-12" class="fnlink" href="../../#v1.6.0/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-12" class="fnlink" href="../../#v1.6.1/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">status</span> <span class="o">==</span> <span class="n">GIT_STATUS_CURRENT</span><span class="p">)</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
@@ -323,7 +323,7 @@ in long form, including the command-line hints.</p>
|
||||
<div class='highlight'><pre> <span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">maxi</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="kt">char</span> <span class="o">*</span><span class="n">wstatus</span> <span class="o">=</span> <span class="nb">NULL</span><span class="p">;</span>
|
||||
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-13" class="fnlink" href="../../#v1.6.0/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span></pre></div>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-13" class="fnlink" href="../../#v1.6.1/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span></pre></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id='section-8'>
|
||||
@@ -394,7 +394,7 @@ no differences, in which case it will be a <code>GIT_DELTA_UNMODIFIED</code>.</p
|
||||
<div class='highlight'><pre> <span class="n">header</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">maxi</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-14" class="fnlink" href="../../#v1.6.0/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-14" class="fnlink" href="../../#v1.6.1/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">status</span> <span class="o">==</span> <span class="n">GIT_STATUS_WT_NEW</span><span class="p">)</span> <span class="p">{</span>
|
||||
|
||||
@@ -421,7 +421,7 @@ no differences, in which case it will be a <code>GIT_DELTA_UNMODIFIED</code>.</p
|
||||
</td>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre> <span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">maxi</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-15" class="fnlink" href="../../#v1.6.0/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-15" class="fnlink" href="../../#v1.6.1/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">status</span> <span class="o">==</span> <span class="n">GIT_STATUS_IGNORED</span><span class="p">)</span> <span class="p">{</span>
|
||||
|
||||
@@ -452,13 +452,13 @@ columns and shows submodule status information.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre><span class="k">static</span> <span class="kt">void</span> <span class="nf">print_short</span><span class="p">(</span><span class="n">git_repository</span> <span class="o">*</span><span class="n">repo</span><span class="p">,</span> <span class="n">git_status_list</span> <span class="o">*</span><span class="n">status</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">,</span> <span class="n">maxi</span> <span class="o">=</span> <span class="n"><a name="git_status_list_entrycount-11" class="fnlink" href="../../#v1.6.0/group/status/git_status_list_entrycount">git_status_list_entrycount</a></span><span class="p">(</span><span class="n">status</span><span class="p">);</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">,</span> <span class="n">maxi</span> <span class="o">=</span> <span class="n"><a name="git_status_list_entrycount-11" class="fnlink" href="../../#v1.6.1/group/status/git_status_list_entrycount">git_status_list_entrycount</a></span><span class="p">(</span><span class="n">status</span><span class="p">);</span>
|
||||
<span class="k">const</span> <span class="n">git_status_entry</span> <span class="o">*</span><span class="n">s</span><span class="p">;</span>
|
||||
<span class="kt">char</span> <span class="n">istatus</span><span class="p">,</span> <span class="n">wstatus</span><span class="p">;</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">extra</span><span class="p">,</span> <span class="o">*</span><span class="n">a</span><span class="p">,</span> <span class="o">*</span><span class="n">b</span><span class="p">,</span> <span class="o">*</span><span class="n">c</span><span class="p">;</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">maxi</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-16" class="fnlink" href="../../#v1.6.0/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-16" class="fnlink" href="../../#v1.6.1/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">status</span> <span class="o">==</span> <span class="n">GIT_STATUS_CURRENT</span><span class="p">)</span>
|
||||
<span class="k">continue</span><span class="p">;</span>
|
||||
@@ -515,7 +515,7 @@ let's go take a look at its status.</p>
|
||||
<span class="p">{</span>
|
||||
<span class="kt">unsigned</span> <span class="kt">int</span> <span class="n">smstatus</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n"><a name="git_submodule_status-22" class="fnlink" href="../../#v1.6.0/group/submodule/git_submodule_status">git_submodule_status</a></span><span class="p">(</span><span class="o">&</span><span class="n">smstatus</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">index_to_workdir</span><span class="o">-></span><span class="n">new_file</span><span class="p">.</span><span class="n">path</span><span class="p">,</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n"><a name="git_submodule_status-22" class="fnlink" href="../../#v1.6.1/group/submodule/git_submodule_status">git_submodule_status</a></span><span class="p">(</span><span class="o">&</span><span class="n">smstatus</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">index_to_workdir</span><span class="o">-></span><span class="n">new_file</span><span class="p">.</span><span class="n">path</span><span class="p">,</span>
|
||||
<span class="n">GIT_SUBMODULE_IGNORE_UNSPECIFIED</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">smstatus</span> <span class="o">&</span> <span class="n">GIT_SUBMODULE_STATUS_WD_MODIFIED</span><span class="p">)</span>
|
||||
<span class="n">extra</span> <span class="o">=</span> <span class="s">" (new commits)"</span><span class="p">;</span>
|
||||
@@ -563,7 +563,7 @@ let's go take a look at its status.</p>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">for</span> <span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">maxi</span><span class="p">;</span> <span class="o">++</span><span class="n">i</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-17" class="fnlink" href="../../#v1.6.0/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
<span class="n">s</span> <span class="o">=</span> <span class="n"><a name="git_status_byindex-17" class="fnlink" href="../../#v1.6.1/group/status/git_status_byindex">git_status_byindex</a></span><span class="p">(</span><span class="n">status</span><span class="p">,</span> <span class="n">i</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">s</span><span class="o">-></span><span class="n">status</span> <span class="o">==</span> <span class="n">GIT_STATUS_WT_NEW</span><span class="p">)</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"?? %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">s</span><span class="o">-></span><span class="n">index_to_workdir</span><span class="o">-></span><span class="n">old_file</span><span class="p">.</span><span class="n">path</span><span class="p">);</span>
|
||||
@@ -580,7 +580,7 @@ let's go take a look at its status.</p>
|
||||
<span class="p">(</span><span class="o">*</span><span class="n">count</span><span class="p">)</span><span class="o">++</span><span class="p">;</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"# - submodule '%s' at %s</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span>
|
||||
<span class="n"><a name="git_submodule_name-20" class="fnlink" href="../../#v1.6.0/group/submodule/git_submodule_name">git_submodule_name</a></span><span class="p">(</span><span class="n">sm</span><span class="p">),</span> <span class="n"><a name="git_submodule_path-21" class="fnlink" href="../../#v1.6.0/group/submodule/git_submodule_path">git_submodule_path</a></span><span class="p">(</span><span class="n">sm</span><span class="p">));</span>
|
||||
<span class="n"><a name="git_submodule_name-20" class="fnlink" href="../../#v1.6.1/group/submodule/git_submodule_name">git_submodule_name</a></span><span class="p">(</span><span class="n">sm</span><span class="p">),</span> <span class="n"><a name="git_submodule_path-21" class="fnlink" href="../../#v1.6.1/group/submodule/git_submodule_path">git_submodule_path</a></span><span class="p">(</span><span class="n">sm</span><span class="p">));</span>
|
||||
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span></pre></div>
|
||||
@@ -16,7 +16,7 @@
|
||||
Jump To …
|
||||
<div id="jump_wrapper">
|
||||
<div id="jump_page">
|
||||
<a class="source" href="../../#v1.6.0">API Docs</a>
|
||||
<a class="source" href="../../#v1.6.1">API Docs</a>
|
||||
<a class="source" href="add.html">add.c</a>
|
||||
<a class="source" href="args.html">args.c</a>
|
||||
<a class="source" href="blame.html">blame.c</a>
|
||||
@@ -251,10 +251,10 @@ all of the use cases.</p>
|
||||
<td class=code>
|
||||
<div class='highlight'><pre><span class="k">static</span> <span class="kt">void</span> <span class="nf">print_tag</span><span class="p">(</span><span class="n">git_tag</span> <span class="o">*</span><span class="n">tag</span><span class="p">,</span> <span class="k">const</span> <span class="n">tag_state</span> <span class="o">*</span><span class="n">state</span><span class="p">)</span>
|
||||
<span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%-16s"</span><span class="p">,</span> <span class="n"><a name="git_tag_name-16" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_name">git_tag_name</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%-16s"</span><span class="p">,</span> <span class="n"><a name="git_tag_name-16" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_name">git_tag_name</a></span><span class="p">(</span><span class="n">tag</span><span class="p">));</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">state</span><span class="o">-></span><span class="n">opts</span><span class="o">-></span><span class="n">num_lines</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">msg</span> <span class="o">=</span> <span class="n"><a name="git_tag_message-17" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">msg</span> <span class="o">=</span> <span class="n"><a name="git_tag_message-17" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_message">git_tag_message</a></span><span class="p">(</span><span class="n">tag</span><span class="p">);</span>
|
||||
<span class="n">print_list_lines</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="n">state</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
@@ -276,7 +276,7 @@ all of the use cases.</p>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"%-16s"</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="n">state</span><span class="o">-></span><span class="n">opts</span><span class="o">-></span><span class="n">num_lines</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">msg</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-2" class="fnlink" href="../../#v1.6.0/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">msg</span> <span class="o">=</span> <span class="n"><a name="git_commit_message-2" class="fnlink" href="../../#v1.6.1/group/commit/git_commit_message">git_commit_message</a></span><span class="p">(</span><span class="n">commit</span><span class="p">);</span>
|
||||
<span class="n">print_list_lines</span><span class="p">(</span><span class="n">msg</span><span class="p">,</span> <span class="n">state</span><span class="p">);</span>
|
||||
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"</span><span class="se">\n</span><span class="s">"</span><span class="p">);</span>
|
||||
@@ -311,10 +311,10 @@ all of the use cases.</p>
|
||||
<span class="n">git_repository</span> <span class="o">*</span><span class="n">repo</span> <span class="o">=</span> <span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">;</span>
|
||||
<span class="n">git_object</span> <span class="o">*</span><span class="n">obj</span><span class="p">;</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-9" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-9" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">name</span><span class="p">),</span>
|
||||
<span class="s">"Failed to lookup rev"</span><span class="p">,</span> <span class="n">name</span><span class="p">);</span>
|
||||
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n"><a name="git_object_type-4" class="fnlink" href="../../#v1.6.0/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">switch</span> <span class="p">(</span><span class="n"><a name="git_object_type-4" class="fnlink" href="../../#v1.6.1/group/object/git_object_type">git_object_type</a></span><span class="p">(</span><span class="n">obj</span><span class="p">))</span> <span class="p">{</span>
|
||||
<span class="k">case</span> <span class="nl">GIT_OBJECT_TAG</span><span class="p">:</span>
|
||||
<span class="n">print_tag</span><span class="p">((</span><span class="n">git_tag</span> <span class="o">*</span><span class="p">)</span> <span class="n">obj</span><span class="p">,</span> <span class="n">state</span><span class="p">);</span>
|
||||
<span class="k">break</span><span class="p">;</span>
|
||||
@@ -325,7 +325,7 @@ all of the use cases.</p>
|
||||
<span class="n">print_name</span><span class="p">(</span><span class="n">name</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_object_free-5" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-5" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
@@ -335,14 +335,14 @@ all of the use cases.</p>
|
||||
<span class="n">git_strarray</span> <span class="n">tag_names</span> <span class="o">=</span> <span class="p">{</span><span class="mi">0</span><span class="p">};</span>
|
||||
<span class="kt">size_t</span> <span class="n">i</span><span class="p">;</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_list_match-21" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_list_match">git_tag_list_match</a></span><span class="p">(</span><span class="o">&</span><span class="n">tag_names</span><span class="p">,</span> <span class="n">pattern</span> <span class="o">?</span> <span class="nl">pattern</span> <span class="p">:</span> <span class="s">"*"</span><span class="p">,</span> <span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_list_match-21" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_list_match">git_tag_list_match</a></span><span class="p">(</span><span class="o">&</span><span class="n">tag_names</span><span class="p">,</span> <span class="n">pattern</span> <span class="o">?</span> <span class="nl">pattern</span> <span class="p">:</span> <span class="s">"*"</span><span class="p">,</span> <span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">),</span>
|
||||
<span class="s">"Unable to get list of tags"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="k">for</span><span class="p">(</span><span class="n">i</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span> <span class="n">i</span> <span class="o"><</span> <span class="n">tag_names</span><span class="p">.</span><span class="n">count</span><span class="p">;</span> <span class="n">i</span><span class="o">++</span><span class="p">)</span> <span class="p">{</span>
|
||||
<span class="n">each_tag</span><span class="p">(</span><span class="n">tag_names</span><span class="p">.</span><span class="n">strings</span><span class="p">[</span><span class="n">i</span><span class="p">],</span> <span class="n">state</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="n"><a name="git_strarray_dispose-15" class="fnlink" href="../../#v1.6.0/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">tag_names</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_strarray_dispose-15" class="fnlink" href="../../#v1.6.1/group/strarray/git_strarray_dispose">git_strarray_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">tag_names</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">void</span> <span class="nf">action_delete_tag</span><span class="p">(</span><span class="n">tag_state</span> <span class="o">*</span><span class="n">state</span><span class="p">)</span>
|
||||
@@ -353,19 +353,19 @@ all of the use cases.</p>
|
||||
|
||||
<span class="n">check</span><span class="p">(</span><span class="o">!</span><span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">,</span> <span class="s">"Name required"</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-10" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-10" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">obj</span><span class="p">,</span> <span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">),</span>
|
||||
<span class="s">"Failed to lookup rev"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_object_short_id-3" class="fnlink" href="../../#v1.6.0/group/object/git_object_short_id">git_object_short_id</a></span><span class="p">(</span><span class="o">&</span><span class="n">abbrev_oid</span><span class="p">,</span> <span class="n">obj</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_object_short_id-3" class="fnlink" href="../../#v1.6.1/group/object/git_object_short_id">git_object_short_id</a></span><span class="p">(</span><span class="o">&</span><span class="n">abbrev_oid</span><span class="p">,</span> <span class="n">obj</span><span class="p">),</span>
|
||||
<span class="s">"Unable to get abbreviated OID"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_delete-20" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_delete">git_tag_delete</a></span><span class="p">(</span><span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_delete-20" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_delete">git_tag_delete</a></span><span class="p">(</span><span class="n">state</span><span class="o">-></span><span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">),</span>
|
||||
<span class="s">"Unable to delete tag"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">);</span>
|
||||
|
||||
<span class="n">printf</span><span class="p">(</span><span class="s">"Deleted tag '%s' (was %s)</span><span class="se">\n</span><span class="s">"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">,</span> <span class="n">abbrev_oid</span><span class="p">.</span><span class="n">ptr</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_buf_dispose-1" class="fnlink" href="../../#v1.6.0/group/buf/git_buf_dispose">git_buf_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">abbrev_oid</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-6" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_buf_dispose-1" class="fnlink" href="../../#v1.6.1/group/buf/git_buf_dispose">git_buf_dispose</a></span><span class="p">(</span><span class="o">&</span><span class="n">abbrev_oid</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-6" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">obj</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">void</span> <span class="nf">action_create_lightweight_tag</span><span class="p">(</span><span class="n">tag_state</span> <span class="o">*</span><span class="n">state</span><span class="p">)</span>
|
||||
@@ -381,13 +381,13 @@ all of the use cases.</p>
|
||||
|
||||
<span class="n">check</span><span class="p">(</span><span class="o">!</span><span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">,</span> <span class="s">"Target required"</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-11" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-11" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">),</span>
|
||||
<span class="s">"Unable to resolve spec"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_create_lightweight-19" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_create_lightweight">git_tag_create_lightweight</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">,</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_create_lightweight-19" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_create_lightweight">git_tag_create_lightweight</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">,</span>
|
||||
<span class="n">target</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">force</span><span class="p">),</span> <span class="s">"Unable to create tag"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_object_free-7" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-7" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">void</span> <span class="nf">action_create_tag</span><span class="p">(</span><span class="n">tag_state</span> <span class="o">*</span><span class="n">state</span><span class="p">)</span>
|
||||
@@ -403,17 +403,17 @@ all of the use cases.</p>
|
||||
|
||||
<span class="k">if</span> <span class="p">(</span><span class="o">!</span><span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">)</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span> <span class="o">=</span> <span class="s">"HEAD"</span><span class="p">;</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-12" class="fnlink" href="../../#v1.6.0/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_revparse_single-12" class="fnlink" href="../../#v1.6.1/group/revparse/git_revparse_single">git_revparse_single</a></span><span class="p">(</span><span class="o">&</span><span class="n">target</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">),</span>
|
||||
<span class="s">"Unable to resolve spec"</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">target</span><span class="p">);</span>
|
||||
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_signature_default-13" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_default">git_signature_default</a></span><span class="p">(</span><span class="o">&</span><span class="n">tagger</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_signature_default-13" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_default">git_signature_default</a></span><span class="p">(</span><span class="o">&</span><span class="n">tagger</span><span class="p">,</span> <span class="n">repo</span><span class="p">),</span>
|
||||
<span class="s">"Unable to create signature"</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_tag_create-18" class="fnlink" href="../../#v1.6.0/group/tag/git_tag_create">git_tag_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">,</span>
|
||||
<span class="n">check_lg2</span><span class="p">(</span><span class="n"><a name="git_tag_create-18" class="fnlink" href="../../#v1.6.1/group/tag/git_tag_create">git_tag_create</a></span><span class="p">(</span><span class="o">&</span><span class="n">oid</span><span class="p">,</span> <span class="n">repo</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">tag_name</span><span class="p">,</span>
|
||||
<span class="n">target</span><span class="p">,</span> <span class="n">tagger</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">message</span><span class="p">,</span> <span class="n">opts</span><span class="o">-></span><span class="n">force</span><span class="p">),</span> <span class="s">"Unable to create tag"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
|
||||
|
||||
<span class="n"><a name="git_object_free-8" class="fnlink" href="../../#v1.6.0/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-14" class="fnlink" href="../../#v1.6.0/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">tagger</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_object_free-8" class="fnlink" href="../../#v1.6.1/group/object/git_object_free">git_object_free</a></span><span class="p">(</span><span class="n">target</span><span class="p">);</span>
|
||||
<span class="n"><a name="git_signature_free-14" class="fnlink" href="../../#v1.6.1/group/signature/git_signature_free">git_signature_free</a></span><span class="p">(</span><span class="n">tagger</span><span class="p">);</span>
|
||||
<span class="p">}</span>
|
||||
|
||||
<span class="k">static</span> <span class="kt">void</span> <span class="nf">print_usage</span><span class="p">(</span><span class="kt">void</span><span class="p">)</span>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user