rugged 0.19.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +151 -25
- data/ext/rugged/extconf.rb +48 -27
- data/ext/rugged/rugged.c +107 -35
- data/ext/rugged/rugged.h +44 -8
- data/ext/rugged/rugged_blame.c +292 -0
- data/ext/rugged/rugged_blob.c +84 -31
- data/ext/rugged/rugged_branch.c +90 -223
- data/ext/rugged/rugged_branch_collection.c +445 -0
- data/ext/rugged/rugged_commit.c +190 -9
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_cred.c +125 -0
- data/ext/rugged/rugged_diff.c +267 -94
- data/ext/rugged/rugged_diff_delta.c +14 -3
- data/ext/rugged/rugged_diff_hunk.c +31 -28
- data/ext/rugged/rugged_diff_line.c +21 -17
- data/ext/rugged/rugged_index.c +326 -6
- data/ext/rugged/rugged_note.c +39 -34
- data/ext/rugged/rugged_object.c +9 -9
- data/ext/rugged/rugged_patch.c +245 -0
- data/ext/rugged/rugged_reference.c +67 -332
- data/ext/rugged/rugged_reference_collection.c +490 -0
- data/ext/rugged/rugged_remote.c +447 -351
- data/ext/rugged/rugged_remote_collection.c +285 -0
- data/ext/rugged/rugged_repo.c +752 -203
- data/ext/rugged/rugged_revwalk.c +119 -27
- data/ext/rugged/rugged_settings.c +48 -1
- data/ext/rugged/rugged_signature.c +30 -16
- data/ext/rugged/rugged_tag.c +86 -191
- data/ext/rugged/rugged_tag_collection.c +279 -0
- data/ext/rugged/rugged_tree.c +159 -22
- data/lib/rugged/branch.rb +8 -17
- data/lib/rugged/credentials.rb +43 -0
- data/lib/rugged/diff/delta.rb +1 -2
- data/lib/rugged/diff/hunk.rb +4 -9
- data/lib/rugged/diff/line.rb +23 -3
- data/lib/rugged/diff.rb +3 -1
- data/lib/rugged/patch.rb +26 -0
- data/lib/rugged/reference.rb +1 -3
- data/lib/rugged/remote.rb +0 -9
- data/lib/rugged/repository.rb +70 -13
- data/lib/rugged/tag.rb +23 -18
- data/lib/rugged/tree.rb +7 -0
- data/lib/rugged/version.rb +1 -1
- data/lib/rugged.rb +8 -1
- data/vendor/libgit2/AUTHORS +75 -0
- data/vendor/libgit2/CMakeLists.txt +490 -0
- data/vendor/libgit2/COPYING +920 -0
- data/vendor/libgit2/Makefile.embed +25 -7
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +16 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +43 -0
- data/vendor/libgit2/cmake/Modules/FindLIBSSH2.cmake +44 -0
- data/vendor/libgit2/deps/http-parser/LICENSE-MIT +23 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/include/git2/attr.h +2 -1
- data/vendor/libgit2/include/git2/blame.h +213 -0
- data/vendor/libgit2/include/git2/blob.h +57 -29
- data/vendor/libgit2/include/git2/branch.h +56 -44
- data/vendor/libgit2/include/git2/buffer.h +112 -0
- data/vendor/libgit2/include/git2/checkout.h +72 -37
- data/vendor/libgit2/include/git2/cherrypick.h +87 -0
- data/vendor/libgit2/include/git2/clone.h +153 -56
- data/vendor/libgit2/include/git2/commit.h +82 -12
- data/vendor/libgit2/include/git2/common.h +31 -19
- data/vendor/libgit2/include/git2/config.h +124 -19
- data/vendor/libgit2/include/git2/cred_helpers.h +1 -1
- data/vendor/libgit2/include/git2/diff.h +636 -494
- data/vendor/libgit2/include/git2/errors.h +48 -15
- data/vendor/libgit2/include/git2/filter.h +149 -0
- data/vendor/libgit2/include/git2/graph.h +14 -0
- data/vendor/libgit2/include/git2/index.h +95 -54
- data/vendor/libgit2/include/git2/indexer.h +15 -9
- data/vendor/libgit2/include/git2/merge.h +402 -39
- data/vendor/libgit2/include/git2/message.h +9 -14
- data/vendor/libgit2/include/git2/net.h +5 -0
- data/vendor/libgit2/include/git2/notes.h +6 -6
- data/vendor/libgit2/include/git2/object.h +34 -2
- data/vendor/libgit2/include/git2/odb.h +77 -14
- data/vendor/libgit2/include/git2/odb_backend.h +50 -6
- data/vendor/libgit2/include/git2/oid.h +4 -8
- data/vendor/libgit2/include/git2/pack.h +58 -4
- data/vendor/libgit2/include/git2/patch.h +277 -0
- data/vendor/libgit2/include/git2/pathspec.h +263 -0
- data/vendor/libgit2/include/git2/push.h +55 -5
- data/vendor/libgit2/include/git2/reflog.h +11 -8
- data/vendor/libgit2/include/git2/refs.h +219 -33
- data/vendor/libgit2/include/git2/refspec.h +3 -4
- data/vendor/libgit2/include/git2/remote.h +216 -76
- data/vendor/libgit2/include/git2/repository.h +85 -40
- data/vendor/libgit2/include/git2/reset.h +15 -4
- data/vendor/libgit2/include/git2/revert.h +86 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +44 -6
- data/vendor/libgit2/include/git2/signature.h +17 -3
- data/vendor/libgit2/include/git2/stash.h +8 -12
- data/vendor/libgit2/include/git2/status.h +67 -18
- data/vendor/libgit2/include/git2/submodule.h +100 -85
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +44 -3
- data/vendor/libgit2/include/git2/sys/diff.h +91 -0
- data/vendor/libgit2/include/git2/sys/filter.h +301 -0
- data/vendor/libgit2/include/git2/sys/index.h +0 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +85 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +33 -11
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +51 -5
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +2 -2
- data/vendor/libgit2/include/git2/sys/repository.h +19 -1
- data/vendor/libgit2/include/git2/transport.h +216 -75
- data/vendor/libgit2/include/git2/tree.h +32 -11
- data/vendor/libgit2/include/git2/types.h +124 -10
- data/vendor/libgit2/include/git2/version.h +4 -2
- data/vendor/libgit2/include/git2.h +41 -40
- data/vendor/libgit2/libgit2.pc.in +10 -0
- data/vendor/libgit2/src/array.h +16 -8
- data/vendor/libgit2/src/attr.c +140 -402
- data/vendor/libgit2/src/attr.h +1 -33
- data/vendor/libgit2/src/attr_file.c +298 -135
- data/vendor/libgit2/src/attr_file.h +61 -22
- data/vendor/libgit2/src/attrcache.c +449 -0
- data/vendor/libgit2/src/attrcache.h +38 -6
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +488 -0
- data/vendor/libgit2/src/blame.h +93 -0
- data/vendor/libgit2/src/blame_git.c +624 -0
- data/vendor/libgit2/src/blame_git.h +20 -0
- data/vendor/libgit2/src/blob.c +137 -92
- data/vendor/libgit2/src/blob.h +9 -0
- data/vendor/libgit2/src/branch.c +175 -156
- data/vendor/libgit2/src/buf_text.c +29 -14
- data/vendor/libgit2/src/buf_text.h +5 -4
- data/vendor/libgit2/src/buffer.c +158 -15
- data/vendor/libgit2/src/buffer.h +33 -20
- data/vendor/libgit2/src/cc-compat.h +8 -2
- data/vendor/libgit2/src/checkout.c +1081 -287
- data/vendor/libgit2/src/checkout.h +1 -1
- data/vendor/libgit2/src/cherrypick.c +226 -0
- data/vendor/libgit2/src/clone.c +297 -245
- data/vendor/libgit2/src/{compress.h → clone.h} +4 -8
- data/vendor/libgit2/src/commit.c +313 -101
- data/vendor/libgit2/src/commit.h +6 -3
- data/vendor/libgit2/src/commit_list.c +3 -3
- data/vendor/libgit2/src/commit_list.h +1 -1
- data/vendor/libgit2/src/common.h +74 -1
- data/vendor/libgit2/src/config.c +570 -145
- data/vendor/libgit2/src/config.h +39 -6
- data/vendor/libgit2/src/config_cache.c +32 -18
- data/vendor/libgit2/src/config_file.c +711 -424
- data/vendor/libgit2/src/config_file.h +4 -3
- data/vendor/libgit2/src/crlf.c +149 -109
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/diff.c +719 -414
- data/vendor/libgit2/src/diff.h +52 -7
- data/vendor/libgit2/src/diff_driver.c +183 -85
- data/vendor/libgit2/src/diff_driver.h +1 -1
- data/vendor/libgit2/src/diff_file.c +65 -84
- data/vendor/libgit2/src/diff_file.h +12 -10
- data/vendor/libgit2/src/diff_patch.c +274 -333
- data/vendor/libgit2/src/diff_patch.h +10 -9
- data/vendor/libgit2/src/diff_print.c +381 -179
- data/vendor/libgit2/src/diff_stats.c +336 -0
- data/vendor/libgit2/src/diff_tform.c +393 -215
- data/vendor/libgit2/src/diff_xdiff.c +117 -42
- data/vendor/libgit2/src/errors.c +59 -4
- data/vendor/libgit2/src/fetch.c +40 -34
- data/vendor/libgit2/src/fetch.h +2 -5
- data/vendor/libgit2/src/fetchhead.c +14 -7
- data/vendor/libgit2/src/filebuf.c +13 -24
- data/vendor/libgit2/src/filebuf.h +3 -3
- data/vendor/libgit2/src/fileops.c +104 -296
- data/vendor/libgit2/src/fileops.h +23 -94
- data/vendor/libgit2/src/filter.c +642 -43
- data/vendor/libgit2/src/filter.h +7 -66
- data/vendor/libgit2/src/fnmatch.c +46 -3
- data/vendor/libgit2/src/fnmatch.h +24 -3
- data/vendor/libgit2/src/global.c +158 -42
- data/vendor/libgit2/src/global.h +9 -0
- data/vendor/libgit2/src/graph.c +34 -20
- data/vendor/libgit2/src/hash/hash_generic.h +0 -1
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -1
- data/vendor/libgit2/src/hash/hash_win32.c +14 -29
- data/vendor/libgit2/src/hash.h +0 -2
- data/vendor/libgit2/src/hashsig.c +97 -117
- data/vendor/libgit2/src/ident.c +125 -0
- data/vendor/libgit2/src/ignore.c +159 -110
- data/vendor/libgit2/src/ignore.h +13 -3
- data/vendor/libgit2/src/index.c +803 -445
- data/vendor/libgit2/src/index.h +43 -6
- data/vendor/libgit2/src/indexer.c +475 -157
- data/vendor/libgit2/src/iterator.c +198 -55
- data/vendor/libgit2/src/iterator.h +28 -4
- data/vendor/libgit2/src/map.h +1 -0
- data/vendor/libgit2/src/merge.c +849 -142
- data/vendor/libgit2/src/merge.h +11 -4
- data/vendor/libgit2/src/merge_file.c +183 -78
- data/vendor/libgit2/src/merge_file.h +0 -57
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/mwindow.c +117 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +164 -59
- data/vendor/libgit2/src/netops.h +37 -1
- data/vendor/libgit2/src/notes.c +9 -18
- data/vendor/libgit2/src/notes.h +1 -1
- data/vendor/libgit2/src/object.c +78 -2
- data/vendor/libgit2/src/odb.c +191 -59
- data/vendor/libgit2/src/odb.h +2 -1
- data/vendor/libgit2/src/odb_loose.c +66 -51
- data/vendor/libgit2/src/odb_mempack.c +182 -0
- data/vendor/libgit2/src/odb_pack.c +151 -61
- data/vendor/libgit2/src/oid.c +30 -19
- data/vendor/libgit2/src/oid.h +13 -10
- data/vendor/libgit2/src/pack-objects.c +198 -147
- data/vendor/libgit2/src/pack-objects.h +7 -0
- data/vendor/libgit2/src/pack.c +272 -101
- data/vendor/libgit2/src/pack.h +15 -1
- data/vendor/libgit2/src/path.c +359 -117
- data/vendor/libgit2/src/path.h +110 -20
- data/vendor/libgit2/src/pathspec.c +583 -57
- data/vendor/libgit2/src/pathspec.h +36 -15
- data/vendor/libgit2/src/pool.c +4 -5
- data/vendor/libgit2/src/posix.c +45 -2
- data/vendor/libgit2/src/posix.h +13 -5
- data/vendor/libgit2/src/pqueue.c +73 -119
- data/vendor/libgit2/src/pqueue.h +35 -82
- data/vendor/libgit2/src/push.c +116 -48
- data/vendor/libgit2/src/push.h +5 -0
- data/vendor/libgit2/src/refdb.c +45 -6
- data/vendor/libgit2/src/refdb.h +13 -3
- data/vendor/libgit2/src/refdb_fs.c +1130 -551
- data/vendor/libgit2/src/reflog.c +36 -327
- data/vendor/libgit2/src/reflog.h +6 -1
- data/vendor/libgit2/src/refs.c +345 -142
- data/vendor/libgit2/src/refs.h +9 -2
- data/vendor/libgit2/src/refspec.c +90 -62
- data/vendor/libgit2/src/refspec.h +7 -24
- data/vendor/libgit2/src/remote.c +815 -415
- data/vendor/libgit2/src/remote.h +3 -4
- data/vendor/libgit2/src/repository.c +360 -207
- data/vendor/libgit2/src/repository.h +16 -10
- data/vendor/libgit2/src/reset.c +28 -13
- data/vendor/libgit2/src/revert.c +228 -0
- data/vendor/libgit2/src/revparse.c +29 -30
- data/vendor/libgit2/src/revwalk.c +141 -96
- data/vendor/libgit2/src/revwalk.h +6 -1
- data/vendor/libgit2/src/settings.c +140 -0
- data/vendor/libgit2/src/sha1_lookup.c +71 -0
- data/vendor/libgit2/src/sha1_lookup.h +5 -0
- data/vendor/libgit2/src/signature.c +38 -10
- data/vendor/libgit2/src/sortedcache.c +378 -0
- data/vendor/libgit2/src/sortedcache.h +178 -0
- data/vendor/libgit2/src/stash.c +98 -116
- data/vendor/libgit2/src/status.c +88 -60
- data/vendor/libgit2/src/status.h +2 -2
- data/vendor/libgit2/src/strmap.c +32 -0
- data/vendor/libgit2/src/strmap.h +14 -1
- data/vendor/libgit2/src/strnlen.h +23 -0
- data/vendor/libgit2/src/submodule.c +1073 -615
- data/vendor/libgit2/src/submodule.h +89 -21
- data/vendor/libgit2/src/sysdir.c +252 -0
- data/vendor/libgit2/src/sysdir.h +101 -0
- data/vendor/libgit2/src/tag.c +31 -20
- data/vendor/libgit2/src/thread-utils.h +98 -17
- data/vendor/libgit2/src/trace.h +0 -2
- data/vendor/libgit2/src/transport.c +76 -6
- data/vendor/libgit2/src/transports/cred.c +164 -61
- data/vendor/libgit2/src/transports/git.c +41 -48
- data/vendor/libgit2/src/transports/http.c +65 -109
- data/vendor/libgit2/src/transports/local.c +88 -65
- data/vendor/libgit2/src/transports/smart.c +91 -19
- data/vendor/libgit2/src/transports/smart.h +13 -5
- data/vendor/libgit2/src/transports/smart_pkt.c +24 -14
- data/vendor/libgit2/src/transports/smart_protocol.c +268 -113
- data/vendor/libgit2/src/transports/ssh.c +284 -186
- data/vendor/libgit2/src/transports/winhttp.c +279 -198
- data/vendor/libgit2/src/tree-cache.c +21 -23
- data/vendor/libgit2/src/tree-cache.h +1 -0
- data/vendor/libgit2/src/tree.c +109 -92
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +7 -1
- data/vendor/libgit2/src/unix/posix.h +0 -1
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +16 -112
- data/vendor/libgit2/src/util.h +107 -3
- data/vendor/libgit2/src/vector.c +72 -17
- data/vendor/libgit2/src/vector.h +32 -5
- data/vendor/libgit2/src/win32/dir.c +15 -40
- data/vendor/libgit2/src/win32/dir.h +3 -2
- data/vendor/libgit2/src/win32/error.c +5 -31
- data/vendor/libgit2/src/win32/findfile.c +47 -66
- data/vendor/libgit2/src/win32/findfile.h +1 -12
- data/vendor/libgit2/src/win32/git2.rc +40 -0
- data/vendor/libgit2/src/win32/map.c +7 -1
- data/vendor/libgit2/src/win32/mingw-compat.h +3 -0
- data/vendor/libgit2/src/win32/posix.h +17 -11
- data/vendor/libgit2/src/win32/posix_w32.c +424 -292
- data/vendor/libgit2/src/win32/precompiled.h +6 -2
- data/vendor/libgit2/src/win32/pthread.c +141 -18
- data/vendor/libgit2/src/win32/pthread.h +50 -8
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/utf-conv.c +117 -60
- data/vendor/libgit2/src/win32/utf-conv.h +81 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_util.c +139 -0
- data/vendor/libgit2/src/win32/w32_util.h +54 -0
- data/vendor/libgit2/src/zstream.c +156 -0
- data/vendor/libgit2/src/zstream.h +39 -0
- metadata +84 -167
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/compress.c +0 -53
data/vendor/libgit2/src/branch.c
CHANGED
@@ -21,27 +21,22 @@ static int retrieve_branch_reference(
|
|
21
21
|
const char *branch_name,
|
22
22
|
int is_remote)
|
23
23
|
{
|
24
|
-
git_reference *branch;
|
25
|
-
int error =
|
24
|
+
git_reference *branch = NULL;
|
25
|
+
int error = 0;
|
26
26
|
char *prefix;
|
27
27
|
git_buf ref_name = GIT_BUF_INIT;
|
28
28
|
|
29
|
-
*branch_reference_out = NULL;
|
30
|
-
|
31
29
|
prefix = is_remote ? GIT_REFS_REMOTES_DIR : GIT_REFS_HEADS_DIR;
|
32
30
|
|
33
|
-
if (git_buf_joinpath(&ref_name, prefix, branch_name) < 0)
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
goto cleanup;
|
40
|
-
}
|
31
|
+
if ((error = git_buf_joinpath(&ref_name, prefix, branch_name)) < 0)
|
32
|
+
/* OOM */;
|
33
|
+
else if ((error = git_reference_lookup(&branch, repo, ref_name.ptr)) < 0)
|
34
|
+
giterr_set(
|
35
|
+
GITERR_REFERENCE, "Cannot locate %s branch '%s'",
|
36
|
+
is_remote ? "remote-tracking" : "local", branch_name);
|
41
37
|
|
42
|
-
*branch_reference_out = branch;
|
38
|
+
*branch_reference_out = branch; /* will be NULL on error */
|
43
39
|
|
44
|
-
cleanup:
|
45
40
|
git_buf_free(&ref_name);
|
46
41
|
return error;
|
47
42
|
}
|
@@ -59,26 +54,53 @@ int git_branch_create(
|
|
59
54
|
git_repository *repository,
|
60
55
|
const char *branch_name,
|
61
56
|
const git_commit *commit,
|
62
|
-
int force
|
57
|
+
int force,
|
58
|
+
const git_signature *signature,
|
59
|
+
const char *log_message)
|
63
60
|
{
|
61
|
+
int is_head = 0;
|
64
62
|
git_reference *branch = NULL;
|
65
|
-
git_buf canonical_branch_name = GIT_BUF_INIT
|
63
|
+
git_buf canonical_branch_name = GIT_BUF_INIT,
|
64
|
+
log_message_buf = GIT_BUF_INIT;
|
66
65
|
int error = -1;
|
67
66
|
|
68
67
|
assert(branch_name && commit && ref_out);
|
69
68
|
assert(git_object_owner((const git_object *)commit) == repository);
|
70
69
|
|
70
|
+
if (force && git_branch_lookup(&branch, repository, branch_name, GIT_BRANCH_LOCAL) == 0) {
|
71
|
+
error = git_branch_is_head(branch);
|
72
|
+
git_reference_free(branch);
|
73
|
+
branch = NULL;
|
74
|
+
|
75
|
+
if (error < 0)
|
76
|
+
goto cleanup;
|
77
|
+
|
78
|
+
is_head = error;
|
79
|
+
}
|
80
|
+
|
81
|
+
if (is_head && force) {
|
82
|
+
giterr_set(GITERR_REFERENCE, "Cannot force update branch '%s' as it is "
|
83
|
+
"the current HEAD of the repository.", branch_name);
|
84
|
+
error = -1;
|
85
|
+
goto cleanup;
|
86
|
+
}
|
87
|
+
|
71
88
|
if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0)
|
72
89
|
goto cleanup;
|
73
90
|
|
91
|
+
if (git_buf_sets(&log_message_buf, log_message ? log_message : "Branch: created") < 0)
|
92
|
+
goto cleanup;
|
93
|
+
|
74
94
|
error = git_reference_create(&branch, repository,
|
75
|
-
git_buf_cstr(&canonical_branch_name), git_commit_id(commit), force
|
95
|
+
git_buf_cstr(&canonical_branch_name), git_commit_id(commit), force, signature,
|
96
|
+
git_buf_cstr(&log_message_buf));
|
76
97
|
|
77
98
|
if (!error)
|
78
99
|
*ref_out = branch;
|
79
100
|
|
80
101
|
cleanup:
|
81
102
|
git_buf_free(&canonical_branch_name);
|
103
|
+
git_buf_free(&log_message_buf);
|
82
104
|
return error;
|
83
105
|
}
|
84
106
|
|
@@ -90,33 +112,35 @@ int git_branch_delete(git_reference *branch)
|
|
90
112
|
|
91
113
|
assert(branch);
|
92
114
|
|
93
|
-
if (!git_reference_is_branch(branch) &&
|
94
|
-
|
95
|
-
|
96
|
-
return
|
115
|
+
if (!git_reference_is_branch(branch) && !git_reference_is_remote(branch)) {
|
116
|
+
giterr_set(GITERR_INVALID, "Reference '%s' is not a valid branch.",
|
117
|
+
git_reference_name(branch));
|
118
|
+
return GIT_ENOTFOUND;
|
97
119
|
}
|
98
120
|
|
99
121
|
if ((is_head = git_branch_is_head(branch)) < 0)
|
100
122
|
return is_head;
|
101
123
|
|
102
124
|
if (is_head) {
|
103
|
-
giterr_set(GITERR_REFERENCE,
|
104
|
-
|
125
|
+
giterr_set(GITERR_REFERENCE, "Cannot delete branch '%s' as it is "
|
126
|
+
"the current HEAD of the repository.", git_reference_name(branch));
|
105
127
|
return -1;
|
106
128
|
}
|
107
129
|
|
108
|
-
if (
|
130
|
+
if (git_buf_join(&config_section, '.', "branch",
|
131
|
+
git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR)) < 0)
|
109
132
|
goto on_error;
|
110
133
|
|
111
134
|
if (git_config_rename_section(
|
112
|
-
git_reference_owner(branch),
|
113
|
-
|
114
|
-
NULL) < 0)
|
115
|
-
goto on_error;
|
135
|
+
git_reference_owner(branch), git_buf_cstr(&config_section), NULL) < 0)
|
136
|
+
goto on_error;
|
116
137
|
|
117
138
|
if (git_reference_delete(branch) < 0)
|
118
139
|
goto on_error;
|
119
140
|
|
141
|
+
if (git_reflog_delete(git_reference_owner(branch), git_reference_name(branch)) < 0)
|
142
|
+
goto on_error;
|
143
|
+
|
120
144
|
error = 0;
|
121
145
|
|
122
146
|
on_error:
|
@@ -124,59 +148,83 @@ on_error:
|
|
124
148
|
return error;
|
125
149
|
}
|
126
150
|
|
127
|
-
|
128
|
-
git_repository *repo,
|
129
|
-
unsigned int list_flags,
|
130
|
-
git_branch_foreach_cb callback,
|
131
|
-
void *payload)
|
132
|
-
{
|
151
|
+
typedef struct {
|
133
152
|
git_reference_iterator *iter;
|
134
|
-
|
135
|
-
|
153
|
+
unsigned int flags;
|
154
|
+
} branch_iter;
|
136
155
|
|
137
|
-
|
138
|
-
|
156
|
+
int git_branch_next(git_reference **out, git_branch_t *out_type, git_branch_iterator *_iter)
|
157
|
+
{
|
158
|
+
branch_iter *iter = (branch_iter *) _iter;
|
159
|
+
git_reference *ref;
|
160
|
+
int error;
|
139
161
|
|
140
|
-
while ((error = git_reference_next(&ref, iter)) == 0) {
|
141
|
-
if (
|
142
|
-
git__prefixcmp(ref->name, GIT_REFS_HEADS_DIR)
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
162
|
+
while ((error = git_reference_next(&ref, iter->iter)) == 0) {
|
163
|
+
if ((iter->flags & GIT_BRANCH_LOCAL) &&
|
164
|
+
!git__prefixcmp(ref->name, GIT_REFS_HEADS_DIR)) {
|
165
|
+
*out = ref;
|
166
|
+
*out_type = GIT_BRANCH_LOCAL;
|
167
|
+
|
168
|
+
return 0;
|
169
|
+
} else if ((iter->flags & GIT_BRANCH_REMOTE) &&
|
170
|
+
!git__prefixcmp(ref->name, GIT_REFS_REMOTES_DIR)) {
|
171
|
+
*out = ref;
|
172
|
+
*out_type = GIT_BRANCH_REMOTE;
|
173
|
+
|
174
|
+
return 0;
|
175
|
+
} else {
|
176
|
+
git_reference_free(ref);
|
147
177
|
}
|
178
|
+
}
|
148
179
|
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
180
|
+
return error;
|
181
|
+
}
|
182
|
+
|
183
|
+
int git_branch_iterator_new(
|
184
|
+
git_branch_iterator **out,
|
185
|
+
git_repository *repo,
|
186
|
+
git_branch_t list_flags)
|
187
|
+
{
|
188
|
+
branch_iter *iter;
|
189
|
+
|
190
|
+
iter = git__calloc(1, sizeof(branch_iter));
|
191
|
+
GITERR_CHECK_ALLOC(iter);
|
156
192
|
|
157
|
-
|
193
|
+
iter->flags = list_flags;
|
158
194
|
|
159
|
-
|
160
|
-
|
161
|
-
|
195
|
+
if (git_reference_iterator_new(&iter->iter, repo) < 0) {
|
196
|
+
git__free(iter);
|
197
|
+
return -1;
|
162
198
|
}
|
163
199
|
|
164
|
-
|
165
|
-
error = 0;
|
200
|
+
*out = (git_branch_iterator *) iter;
|
166
201
|
|
167
|
-
|
168
|
-
|
202
|
+
return 0;
|
203
|
+
}
|
204
|
+
|
205
|
+
void git_branch_iterator_free(git_branch_iterator *_iter)
|
206
|
+
{
|
207
|
+
branch_iter *iter = (branch_iter *) _iter;
|
208
|
+
|
209
|
+
if (iter == NULL)
|
210
|
+
return;
|
211
|
+
|
212
|
+
git_reference_iterator_free(iter->iter);
|
213
|
+
git__free(iter);
|
169
214
|
}
|
170
215
|
|
171
216
|
int git_branch_move(
|
172
217
|
git_reference **out,
|
173
218
|
git_reference *branch,
|
174
219
|
const char *new_branch_name,
|
175
|
-
int force
|
220
|
+
int force,
|
221
|
+
const git_signature *signature,
|
222
|
+
const char *log_message)
|
176
223
|
{
|
177
224
|
git_buf new_reference_name = GIT_BUF_INIT,
|
178
|
-
|
179
|
-
|
225
|
+
old_config_section = GIT_BUF_INIT,
|
226
|
+
new_config_section = GIT_BUF_INIT,
|
227
|
+
log_message_buf = GIT_BUF_INIT;
|
180
228
|
int error;
|
181
229
|
|
182
230
|
assert(branch && new_branch_name);
|
@@ -184,26 +232,40 @@ int git_branch_move(
|
|
184
232
|
if (!git_reference_is_branch(branch))
|
185
233
|
return not_a_local_branch(git_reference_name(branch));
|
186
234
|
|
187
|
-
error = git_buf_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)
|
188
|
-
if (error < 0)
|
235
|
+
if ((error = git_buf_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)) < 0)
|
189
236
|
goto done;
|
190
237
|
|
191
|
-
|
192
|
-
|
238
|
+
if (log_message) {
|
239
|
+
if ((error = git_buf_sets(&log_message_buf, log_message)) < 0)
|
240
|
+
goto done;
|
241
|
+
} else {
|
242
|
+
if ((error = git_buf_printf(&log_message_buf, "Branch: renamed %s to %s",
|
243
|
+
git_reference_name(branch), git_buf_cstr(&new_reference_name))) < 0)
|
244
|
+
goto done;
|
245
|
+
}
|
193
246
|
|
194
|
-
|
247
|
+
/* first update ref then config so failure won't trash config */
|
195
248
|
|
196
|
-
|
197
|
-
git_buf_cstr(&
|
198
|
-
git_buf_cstr(&
|
249
|
+
error = git_reference_rename(
|
250
|
+
out, branch, git_buf_cstr(&new_reference_name), force,
|
251
|
+
signature, git_buf_cstr(&log_message_buf));
|
252
|
+
if (error < 0)
|
199
253
|
goto done;
|
200
254
|
|
201
|
-
|
255
|
+
git_buf_join(&old_config_section, '.', "branch",
|
256
|
+
git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR));
|
257
|
+
git_buf_join(&new_config_section, '.', "branch", new_branch_name);
|
258
|
+
|
259
|
+
error = git_config_rename_section(
|
260
|
+
git_reference_owner(branch),
|
261
|
+
git_buf_cstr(&old_config_section),
|
262
|
+
git_buf_cstr(&new_config_section));
|
202
263
|
|
203
264
|
done:
|
204
265
|
git_buf_free(&new_reference_name);
|
205
266
|
git_buf_free(&old_config_section);
|
206
267
|
git_buf_free(&new_config_section);
|
268
|
+
git_buf_free(&log_message_buf);
|
207
269
|
|
208
270
|
return error;
|
209
271
|
}
|
@@ -219,7 +281,9 @@ int git_branch_lookup(
|
|
219
281
|
return retrieve_branch_reference(ref_out, repo, branch_name, branch_type == GIT_BRANCH_REMOTE);
|
220
282
|
}
|
221
283
|
|
222
|
-
int git_branch_name(
|
284
|
+
int git_branch_name(
|
285
|
+
const char **out,
|
286
|
+
const git_reference *ref)
|
223
287
|
{
|
224
288
|
const char *branch_name;
|
225
289
|
|
@@ -242,17 +306,13 @@ int git_branch_name(const char **out, git_reference *ref)
|
|
242
306
|
|
243
307
|
static int retrieve_upstream_configuration(
|
244
308
|
const char **out,
|
245
|
-
|
309
|
+
const git_config *config,
|
246
310
|
const char *canonical_branch_name,
|
247
311
|
const char *format)
|
248
312
|
{
|
249
|
-
git_config *config;
|
250
313
|
git_buf buf = GIT_BUF_INIT;
|
251
314
|
int error;
|
252
315
|
|
253
|
-
if (git_repository_config__weakptr(&config, repo) < 0)
|
254
|
-
return -1;
|
255
|
-
|
256
316
|
if (git_buf_printf(&buf, format,
|
257
317
|
canonical_branch_name + strlen(GIT_REFS_HEADS_DIR)) < 0)
|
258
318
|
return -1;
|
@@ -262,33 +322,39 @@ static int retrieve_upstream_configuration(
|
|
262
322
|
return error;
|
263
323
|
}
|
264
324
|
|
265
|
-
int
|
266
|
-
git_buf *
|
325
|
+
int git_branch_upstream_name(
|
326
|
+
git_buf *out,
|
267
327
|
git_repository *repo,
|
268
|
-
const char *
|
328
|
+
const char *refname)
|
269
329
|
{
|
270
330
|
const char *remote_name, *merge_name;
|
271
331
|
git_buf buf = GIT_BUF_INIT;
|
272
332
|
int error = -1;
|
273
333
|
git_remote *remote = NULL;
|
274
334
|
const git_refspec *refspec;
|
335
|
+
git_config *config;
|
275
336
|
|
276
|
-
assert(
|
337
|
+
assert(out && refname);
|
277
338
|
|
278
|
-
|
279
|
-
|
339
|
+
git_buf_sanitize(out);
|
340
|
+
|
341
|
+
if (!git_reference__is_branch(refname))
|
342
|
+
return not_a_local_branch(refname);
|
343
|
+
|
344
|
+
if ((error = git_repository_config_snapshot(&config, repo)) < 0)
|
345
|
+
return error;
|
280
346
|
|
281
347
|
if ((error = retrieve_upstream_configuration(
|
282
|
-
&remote_name,
|
348
|
+
&remote_name, config, refname, "branch.%s.remote")) < 0)
|
283
349
|
goto cleanup;
|
284
350
|
|
285
351
|
if ((error = retrieve_upstream_configuration(
|
286
|
-
&merge_name,
|
352
|
+
&merge_name, config, refname, "branch.%s.merge")) < 0)
|
287
353
|
goto cleanup;
|
288
354
|
|
289
355
|
if (!*remote_name || !*merge_name) {
|
290
356
|
giterr_set(GITERR_REFERENCE,
|
291
|
-
"branch '%s' does not have an upstream",
|
357
|
+
"branch '%s' does not have an upstream", refname);
|
292
358
|
error = GIT_ENOTFOUND;
|
293
359
|
goto cleanup;
|
294
360
|
}
|
@@ -303,21 +369,22 @@ int git_branch_upstream__name(
|
|
303
369
|
goto cleanup;
|
304
370
|
}
|
305
371
|
|
306
|
-
if (
|
372
|
+
if (git_refspec_transform(&buf, refspec, merge_name) < 0)
|
307
373
|
goto cleanup;
|
308
374
|
} else
|
309
375
|
if (git_buf_sets(&buf, merge_name) < 0)
|
310
376
|
goto cleanup;
|
311
377
|
|
312
|
-
error = git_buf_set(
|
378
|
+
error = git_buf_set(out, git_buf_cstr(&buf), git_buf_len(&buf));
|
313
379
|
|
314
380
|
cleanup:
|
381
|
+
git_config_free(config);
|
315
382
|
git_remote_free(remote);
|
316
383
|
git_buf_free(&buf);
|
317
384
|
return error;
|
318
385
|
}
|
319
386
|
|
320
|
-
|
387
|
+
int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refname)
|
321
388
|
{
|
322
389
|
git_strarray remote_list = {0};
|
323
390
|
size_t i;
|
@@ -326,12 +393,14 @@ static int remote_name(git_buf *buf, git_repository *repo, const char *canonical
|
|
326
393
|
int error = 0;
|
327
394
|
char *remote_name = NULL;
|
328
395
|
|
329
|
-
assert(buf && repo &&
|
396
|
+
assert(buf && repo && refname);
|
397
|
+
|
398
|
+
git_buf_sanitize(buf);
|
330
399
|
|
331
400
|
/* Verify that this is a remote branch */
|
332
|
-
if (!git_reference__is_remote(
|
401
|
+
if (!git_reference__is_remote(refname)) {
|
333
402
|
giterr_set(GITERR_INVALID, "Reference '%s' is not a remote branch.",
|
334
|
-
|
403
|
+
refname);
|
335
404
|
error = GIT_ERROR;
|
336
405
|
goto cleanup;
|
337
406
|
}
|
@@ -345,7 +414,7 @@ static int remote_name(git_buf *buf, git_repository *repo, const char *canonical
|
|
345
414
|
if ((error = git_remote_load(&remote, repo, remote_list.strings[i])) < 0)
|
346
415
|
continue;
|
347
416
|
|
348
|
-
fetchspec = git_remote__matching_dst_refspec(remote,
|
417
|
+
fetchspec = git_remote__matching_dst_refspec(remote, refname);
|
349
418
|
if (fetchspec) {
|
350
419
|
/* If we have not already set out yet, then set
|
351
420
|
* it to the matching remote name. Otherwise
|
@@ -357,7 +426,7 @@ static int remote_name(git_buf *buf, git_repository *repo, const char *canonical
|
|
357
426
|
git_remote_free(remote);
|
358
427
|
|
359
428
|
giterr_set(GITERR_REFERENCE,
|
360
|
-
"Reference '%s' is ambiguous",
|
429
|
+
"Reference '%s' is ambiguous", refname);
|
361
430
|
error = GIT_EAMBIGUOUS;
|
362
431
|
goto cleanup;
|
363
432
|
}
|
@@ -371,76 +440,26 @@ static int remote_name(git_buf *buf, git_repository *repo, const char *canonical
|
|
371
440
|
error = git_buf_puts(buf, remote_name);
|
372
441
|
} else {
|
373
442
|
giterr_set(GITERR_REFERENCE,
|
374
|
-
"Could not determine remote for '%s'",
|
443
|
+
"Could not determine remote for '%s'", refname);
|
375
444
|
error = GIT_ENOTFOUND;
|
376
445
|
}
|
377
446
|
|
378
447
|
cleanup:
|
448
|
+
if (error < 0)
|
449
|
+
git_buf_free(buf);
|
450
|
+
|
379
451
|
git_strarray_free(&remote_list);
|
380
452
|
return error;
|
381
453
|
}
|
382
454
|
|
383
|
-
int git_branch_remote_name(char *buffer, size_t buffer_len, git_repository *repo, const char *refname)
|
384
|
-
{
|
385
|
-
int ret;
|
386
|
-
git_buf buf = GIT_BUF_INIT;
|
387
|
-
|
388
|
-
if ((ret = remote_name(&buf, repo, refname)) < 0)
|
389
|
-
return ret;
|
390
|
-
|
391
|
-
if (buffer)
|
392
|
-
git_buf_copy_cstr(buffer, buffer_len, &buf);
|
393
|
-
|
394
|
-
ret = (int)git_buf_len(&buf) + 1;
|
395
|
-
git_buf_free(&buf);
|
396
|
-
|
397
|
-
return ret;
|
398
|
-
}
|
399
|
-
|
400
|
-
int git_branch_upstream_name(
|
401
|
-
char *tracking_branch_name_out,
|
402
|
-
size_t buffer_size,
|
403
|
-
git_repository *repo,
|
404
|
-
const char *canonical_branch_name)
|
405
|
-
{
|
406
|
-
git_buf buf = GIT_BUF_INIT;
|
407
|
-
int error;
|
408
|
-
|
409
|
-
assert(canonical_branch_name);
|
410
|
-
|
411
|
-
if (tracking_branch_name_out && buffer_size)
|
412
|
-
*tracking_branch_name_out = '\0';
|
413
|
-
|
414
|
-
if ((error = git_branch_upstream__name(
|
415
|
-
&buf, repo, canonical_branch_name)) < 0)
|
416
|
-
goto cleanup;
|
417
|
-
|
418
|
-
if (tracking_branch_name_out && buf.size + 1 > buffer_size) { /* +1 for NUL byte */
|
419
|
-
giterr_set(
|
420
|
-
GITERR_INVALID,
|
421
|
-
"Buffer too short to hold the tracked reference name.");
|
422
|
-
error = -1;
|
423
|
-
goto cleanup;
|
424
|
-
}
|
425
|
-
|
426
|
-
if (tracking_branch_name_out)
|
427
|
-
git_buf_copy_cstr(tracking_branch_name_out, buffer_size, &buf);
|
428
|
-
|
429
|
-
error = (int)buf.size + 1;
|
430
|
-
|
431
|
-
cleanup:
|
432
|
-
git_buf_free(&buf);
|
433
|
-
return (int)error;
|
434
|
-
}
|
435
|
-
|
436
455
|
int git_branch_upstream(
|
437
|
-
|
438
|
-
|
456
|
+
git_reference **tracking_out,
|
457
|
+
const git_reference *branch)
|
439
458
|
{
|
440
459
|
int error;
|
441
460
|
git_buf tracking_name = GIT_BUF_INIT;
|
442
461
|
|
443
|
-
if ((error =
|
462
|
+
if ((error = git_branch_upstream_name(&tracking_name,
|
444
463
|
git_reference_owner(branch), git_reference_name(branch))) < 0)
|
445
464
|
return error;
|
446
465
|
|
@@ -523,7 +542,7 @@ int git_branch_set_upstream(git_reference *branch, const char *upstream_name)
|
|
523
542
|
if (local)
|
524
543
|
git_buf_puts(&value, ".");
|
525
544
|
else
|
526
|
-
|
545
|
+
git_branch_remote_name(&value, repo, git_reference_name(upstream));
|
527
546
|
|
528
547
|
if (git_buf_printf(&key, "branch.%s.remote", shortname) < 0)
|
529
548
|
goto on_error;
|
@@ -542,7 +561,7 @@ int git_branch_set_upstream(git_reference *branch, const char *upstream_name)
|
|
542
561
|
|
543
562
|
fetchspec = git_remote__matching_dst_refspec(remote, git_reference_name(upstream));
|
544
563
|
git_buf_clear(&value);
|
545
|
-
if (!fetchspec ||
|
564
|
+
if (!fetchspec || git_refspec_rtransform(&value, fetchspec, git_reference_name(upstream)) < 0)
|
546
565
|
goto on_error;
|
547
566
|
|
548
567
|
git_remote_free(remote);
|
@@ -572,7 +591,7 @@ on_error:
|
|
572
591
|
}
|
573
592
|
|
574
593
|
int git_branch_is_head(
|
575
|
-
git_reference *branch)
|
594
|
+
const git_reference *branch)
|
576
595
|
{
|
577
596
|
git_reference *head;
|
578
597
|
bool is_same = false;
|
@@ -585,7 +604,7 @@ int git_branch_is_head(
|
|
585
604
|
|
586
605
|
error = git_repository_head(&head, git_reference_owner(branch));
|
587
606
|
|
588
|
-
if (error ==
|
607
|
+
if (error == GIT_EUNBORNBRANCH || error == GIT_ENOTFOUND)
|
589
608
|
return false;
|
590
609
|
|
591
610
|
if (error < 0)
|
@@ -70,10 +70,10 @@ int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src)
|
|
70
70
|
assert(tgt != src);
|
71
71
|
|
72
72
|
if (!next)
|
73
|
-
return
|
73
|
+
return git_buf_set(tgt, src->ptr, src->size);
|
74
74
|
|
75
75
|
/* reduce reallocs while in the loop */
|
76
|
-
if (git_buf_grow(tgt, src->size) < 0)
|
76
|
+
if (git_buf_grow(tgt, src->size + 1) < 0)
|
77
77
|
return -1;
|
78
78
|
out = tgt->ptr;
|
79
79
|
tgt->size = 0;
|
@@ -81,20 +81,25 @@ int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src)
|
|
81
81
|
/* Find the next \r and copy whole chunk up to there to tgt */
|
82
82
|
for (; next; scan = next + 1, next = memchr(scan, '\r', scan_end - scan)) {
|
83
83
|
if (next > scan) {
|
84
|
-
size_t copylen = next - scan;
|
84
|
+
size_t copylen = (size_t)(next - scan);
|
85
85
|
memcpy(out, scan, copylen);
|
86
86
|
out += copylen;
|
87
87
|
}
|
88
88
|
|
89
89
|
/* Do not drop \r unless it is followed by \n */
|
90
|
-
if (next[1] != '\n')
|
90
|
+
if (next + 1 == scan_end || next[1] != '\n')
|
91
91
|
*out++ = '\r';
|
92
92
|
}
|
93
93
|
|
94
94
|
/* Copy remaining input into dest */
|
95
|
-
|
96
|
-
|
97
|
-
|
95
|
+
if (scan < scan_end) {
|
96
|
+
size_t remaining = (size_t)(scan_end - scan);
|
97
|
+
memcpy(out, scan, remaining);
|
98
|
+
out += remaining;
|
99
|
+
}
|
100
|
+
|
101
|
+
tgt->size = (size_t)(out - tgt->ptr);
|
102
|
+
tgt->ptr[tgt->size] = '\0';
|
98
103
|
|
99
104
|
return 0;
|
100
105
|
}
|
@@ -109,7 +114,7 @@ int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src)
|
|
109
114
|
assert(tgt != src);
|
110
115
|
|
111
116
|
if (!next)
|
112
|
-
return
|
117
|
+
return git_buf_set(tgt, src->ptr, src->size);
|
113
118
|
|
114
119
|
/* attempt to reduce reallocs while in the loop */
|
115
120
|
if (git_buf_grow(tgt, src->size + (src->size >> 4) + 1) < 0)
|
@@ -118,9 +123,13 @@ int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src)
|
|
118
123
|
|
119
124
|
for (; next; scan = next + 1, next = memchr(scan, '\n', end - scan)) {
|
120
125
|
size_t copylen = next - scan;
|
121
|
-
|
122
|
-
|
123
|
-
|
126
|
+
size_t needsize = tgt->size + copylen + 2 + 1;
|
127
|
+
|
128
|
+
/* if we find mixed line endings, bail */
|
129
|
+
if (next > start && next[-1] == '\r') {
|
130
|
+
git_buf_free(tgt);
|
131
|
+
return GIT_PASSTHROUGH;
|
132
|
+
}
|
124
133
|
|
125
134
|
if (tgt->asize < needsize && git_buf_grow(tgt, needsize) < 0)
|
126
135
|
return -1;
|
@@ -129,8 +138,8 @@ int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src)
|
|
129
138
|
memcpy(tgt->ptr + tgt->size, scan, copylen);
|
130
139
|
tgt->size += copylen;
|
131
140
|
}
|
132
|
-
|
133
|
-
|
141
|
+
|
142
|
+
tgt->ptr[tgt->size++] = '\r';
|
134
143
|
tgt->ptr[tgt->size++] = '\n';
|
135
144
|
}
|
136
145
|
|
@@ -170,8 +179,14 @@ int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strings)
|
|
170
179
|
bool git_buf_text_is_binary(const git_buf *buf)
|
171
180
|
{
|
172
181
|
const char *scan = buf->ptr, *end = buf->ptr + buf->size;
|
182
|
+
git_bom_t bom;
|
173
183
|
int printable = 0, nonprintable = 0;
|
174
184
|
|
185
|
+
scan += git_buf_text_detect_bom(&bom, buf, 0);
|
186
|
+
|
187
|
+
if (bom > GIT_BOM_UTF8)
|
188
|
+
return 1;
|
189
|
+
|
175
190
|
while (scan < end) {
|
176
191
|
unsigned char c = *scan++;
|
177
192
|
|
@@ -262,7 +277,7 @@ bool git_buf_text_gather_stats(
|
|
262
277
|
while (scan < end) {
|
263
278
|
unsigned char c = *scan++;
|
264
279
|
|
265
|
-
if (
|
280
|
+
if (c > 0x1F && c != 0x7F)
|
266
281
|
stats->printable++;
|
267
282
|
else switch (c) {
|
268
283
|
case '\0':
|
@@ -56,16 +56,17 @@ GIT_INLINE(int) git_buf_text_puts_escape_regex(git_buf *buf, const char *string)
|
|
56
56
|
extern void git_buf_text_unescape(git_buf *buf);
|
57
57
|
|
58
58
|
/**
|
59
|
-
* Replace all \r\n with \n
|
59
|
+
* Replace all \r\n with \n.
|
60
60
|
*
|
61
|
-
* @return 0 on success,
|
61
|
+
* @return 0 on success, -1 on memory error, GIT_PASSTHROUGH if the
|
62
|
+
* source buffer has mixed line endings.
|
62
63
|
*/
|
63
64
|
extern int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src);
|
64
65
|
|
65
66
|
/**
|
66
|
-
* Replace all \n with \r\n
|
67
|
+
* Replace all \n with \r\n. Does not modify existing \r\n.
|
67
68
|
*
|
68
|
-
* @return 0 on success,
|
69
|
+
* @return 0 on success, -1 on memory error
|
69
70
|
*/
|
70
71
|
extern int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src);
|
71
72
|
|