rugged 0.19.0 → 0.28.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 +184 -33
- data/ext/rugged/extconf.rb +111 -28
- data/ext/rugged/rugged.c +327 -89
- data/ext/rugged/rugged.h +64 -28
- data/ext/rugged/rugged_allocator.c +89 -0
- data/ext/rugged/rugged_backend.c +17 -0
- data/ext/rugged/rugged_blame.c +278 -0
- data/ext/rugged/rugged_blob.c +301 -75
- data/ext/rugged/rugged_branch.c +92 -242
- data/ext/rugged/rugged_branch_collection.c +388 -0
- data/ext/rugged/rugged_commit.c +575 -79
- data/ext/rugged/rugged_config.c +129 -36
- data/ext/rugged/rugged_cred.c +131 -0
- data/ext/rugged/rugged_diff.c +291 -122
- data/ext/rugged/rugged_diff_delta.c +16 -22
- data/ext/rugged/rugged_diff_hunk.c +35 -51
- data/ext/rugged/rugged_diff_line.c +23 -36
- data/ext/rugged/rugged_index.c +289 -152
- data/ext/rugged/rugged_note.c +50 -60
- data/ext/rugged/rugged_object.c +13 -30
- data/ext/rugged/rugged_patch.c +400 -0
- data/ext/rugged/rugged_rebase.c +397 -0
- data/ext/rugged/rugged_reference.c +76 -346
- data/ext/rugged/rugged_reference_collection.c +423 -0
- data/ext/rugged/rugged_remote.c +438 -461
- data/ext/rugged/rugged_remote_collection.c +435 -0
- data/ext/rugged/rugged_repo.c +1548 -365
- data/ext/rugged/rugged_revwalk.c +378 -99
- data/ext/rugged/rugged_settings.c +86 -23
- data/ext/rugged/rugged_signature.c +47 -37
- data/ext/rugged/rugged_submodule.c +835 -0
- data/ext/rugged/rugged_submodule_collection.c +366 -0
- data/ext/rugged/rugged_tag.c +88 -210
- data/ext/rugged/rugged_tag_collection.c +326 -0
- data/ext/rugged/rugged_tree.c +460 -217
- data/lib/rugged/attributes.rb +46 -0
- data/lib/rugged/blob.rb +33 -0
- data/lib/rugged/branch.rb +12 -16
- data/lib/rugged/commit.rb +9 -0
- data/lib/rugged/console.rb +5 -0
- data/lib/rugged/credentials.rb +48 -0
- data/lib/rugged/diff/delta.rb +6 -2
- data/lib/rugged/diff/hunk.rb +9 -9
- data/lib/rugged/diff/line.rb +28 -5
- data/lib/rugged/diff.rb +7 -1
- data/lib/rugged/index.rb +120 -0
- data/lib/rugged/object.rb +5 -0
- data/lib/rugged/patch.rb +41 -0
- data/lib/rugged/reference.rb +6 -3
- data/lib/rugged/remote.rb +5 -9
- data/lib/rugged/repository.rb +126 -14
- data/lib/rugged/submodule_collection.rb +53 -0
- data/lib/rugged/tag.rb +45 -16
- data/lib/rugged/tree.rb +163 -1
- data/lib/rugged/version.rb +6 -1
- data/lib/rugged/walker.rb +5 -0
- data/lib/rugged.rb +16 -1
- data/vendor/libgit2/AUTHORS +77 -0
- data/vendor/libgit2/CMakeLists.txt +317 -0
- data/vendor/libgit2/COPYING +993 -0
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +30 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +29 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +96 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +11 -0
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +26 -0
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +324 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +45 -0
- data/vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +20 -0
- data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
- data/vendor/libgit2/cmake/Modules/IdeSplitSources.cmake +22 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +5 -0
- data/vendor/libgit2/deps/http-parser/COPYING +23 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +5 -2
- data/vendor/libgit2/deps/http-parser/http_parser.h +2 -0
- data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
- data/vendor/libgit2/deps/regex/COPYING +502 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +26 -0
- data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
- data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
- data/vendor/libgit2/deps/winhttp/urlmon.h +45 -0
- data/vendor/libgit2/deps/winhttp/winhttp.def +29 -0
- data/vendor/libgit2/deps/winhttp/winhttp.h +594 -0
- data/vendor/libgit2/deps/winhttp/winhttp64.def +29 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +5 -0
- data/vendor/libgit2/deps/zlib/COPYING +27 -0
- data/vendor/libgit2/deps/zlib/adler32.c +51 -34
- data/vendor/libgit2/deps/zlib/crc32.c +61 -61
- data/vendor/libgit2/deps/zlib/crc32.h +1 -1
- data/vendor/libgit2/deps/zlib/deflate.c +681 -352
- data/vendor/libgit2/deps/zlib/deflate.h +25 -18
- data/vendor/libgit2/deps/zlib/gzguts.h +218 -0
- data/vendor/libgit2/deps/zlib/infback.c +640 -0
- data/vendor/libgit2/deps/zlib/inffast.c +36 -53
- data/vendor/libgit2/deps/zlib/inffixed.h +3 -3
- data/vendor/libgit2/deps/zlib/inflate.c +167 -86
- data/vendor/libgit2/deps/zlib/inflate.h +7 -4
- data/vendor/libgit2/deps/zlib/inftrees.c +24 -50
- data/vendor/libgit2/deps/zlib/trees.c +55 -96
- data/vendor/libgit2/deps/zlib/zconf.h +499 -19
- data/vendor/libgit2/deps/zlib/zlib.h +526 -227
- data/vendor/libgit2/deps/zlib/zutil.c +39 -32
- data/vendor/libgit2/deps/zlib/zutil.h +75 -78
- data/vendor/libgit2/include/git2/annotated_commit.h +125 -0
- data/vendor/libgit2/include/git2/apply.h +129 -0
- data/vendor/libgit2/include/git2/attr.h +36 -21
- data/vendor/libgit2/include/git2/blame.h +229 -0
- data/vendor/libgit2/include/git2/blob.h +81 -44
- data/vendor/libgit2/include/git2/branch.h +81 -42
- data/vendor/libgit2/include/git2/buffer.h +128 -0
- data/vendor/libgit2/include/git2/checkout.h +141 -67
- data/vendor/libgit2/include/git2/cherrypick.h +92 -0
- data/vendor/libgit2/include/git2/clone.h +157 -58
- data/vendor/libgit2/include/git2/commit.h +231 -12
- data/vendor/libgit2/include/git2/common.h +216 -30
- data/vendor/libgit2/include/git2/config.h +274 -48
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -4
- data/vendor/libgit2/include/git2/deprecated.h +253 -0
- data/vendor/libgit2/include/git2/describe.h +189 -0
- data/vendor/libgit2/include/git2/diff.h +985 -575
- data/vendor/libgit2/include/git2/errors.h +93 -52
- data/vendor/libgit2/include/git2/filter.h +217 -0
- data/vendor/libgit2/include/git2/global.h +44 -0
- data/vendor/libgit2/include/git2/graph.h +17 -0
- data/vendor/libgit2/include/git2/ignore.h +2 -2
- data/vendor/libgit2/include/git2/index.h +269 -94
- data/vendor/libgit2/include/git2/indexer.h +44 -12
- data/vendor/libgit2/include/git2/mailmap.h +115 -0
- data/vendor/libgit2/include/git2/merge.h +501 -64
- data/vendor/libgit2/include/git2/message.h +52 -17
- data/vendor/libgit2/include/git2/net.h +11 -5
- data/vendor/libgit2/include/git2/notes.h +120 -16
- data/vendor/libgit2/include/git2/object.h +62 -23
- data/vendor/libgit2/include/git2/odb.h +140 -24
- data/vendor/libgit2/include/git2/odb_backend.h +56 -12
- data/vendor/libgit2/include/git2/oid.h +17 -18
- data/vendor/libgit2/include/git2/oidarray.h +40 -0
- data/vendor/libgit2/include/git2/pack.h +86 -7
- data/vendor/libgit2/include/git2/patch.h +274 -0
- data/vendor/libgit2/include/git2/pathspec.h +280 -0
- data/vendor/libgit2/include/git2/proxy.h +96 -0
- data/vendor/libgit2/include/git2/rebase.h +323 -0
- data/vendor/libgit2/include/git2/reflog.h +12 -9
- data/vendor/libgit2/include/git2/refs.h +241 -46
- data/vendor/libgit2/include/git2/refspec.h +20 -4
- data/vendor/libgit2/include/git2/remote.h +636 -209
- data/vendor/libgit2/include/git2/repository.h +267 -57
- data/vendor/libgit2/include/git2/reset.h +36 -6
- data/vendor/libgit2/include/git2/revert.h +91 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +78 -35
- data/vendor/libgit2/include/git2/signature.h +32 -5
- data/vendor/libgit2/include/git2/stash.h +160 -21
- data/vendor/libgit2/include/git2/status.h +92 -30
- data/vendor/libgit2/include/git2/submodule.h +226 -133
- data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +68 -9
- data/vendor/libgit2/include/git2/sys/diff.h +94 -0
- data/vendor/libgit2/include/git2/sys/filter.h +332 -0
- data/vendor/libgit2/include/git2/sys/hashsig.h +106 -0
- data/vendor/libgit2/include/git2/sys/index.h +6 -5
- data/vendor/libgit2/include/git2/sys/mempack.h +86 -0
- data/vendor/libgit2/include/git2/sys/merge.h +182 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -28
- data/vendor/libgit2/include/git2/sys/openssl.h +38 -0
- data/vendor/libgit2/include/git2/sys/path.h +64 -0
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +79 -19
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +13 -2
- data/vendor/libgit2/include/git2/sys/repository.h +64 -1
- data/vendor/libgit2/include/git2/sys/stream.h +138 -0
- data/vendor/libgit2/include/git2/sys/time.h +31 -0
- data/vendor/libgit2/include/git2/sys/transport.h +439 -0
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +1 -1
- data/vendor/libgit2/include/git2/transaction.h +121 -0
- data/vendor/libgit2/include/git2/transport.h +261 -292
- data/vendor/libgit2/include/git2/tree.h +111 -21
- data/vendor/libgit2/include/git2/types.h +244 -32
- data/vendor/libgit2/include/git2/version.h +5 -2
- data/vendor/libgit2/include/git2/worktree.h +255 -0
- data/vendor/libgit2/include/git2.h +50 -40
- data/vendor/libgit2/libgit2.pc.in +13 -0
- data/vendor/libgit2/src/CMakeLists.txt +525 -0
- data/vendor/libgit2/src/alloc.c +55 -0
- data/vendor/libgit2/src/alloc.h +40 -0
- data/vendor/libgit2/src/annotated_commit.c +228 -0
- data/vendor/libgit2/src/annotated_commit.h +52 -0
- data/vendor/libgit2/src/apply.c +855 -0
- data/vendor/libgit2/src/apply.h +25 -0
- data/vendor/libgit2/src/array.h +74 -16
- data/vendor/libgit2/src/attr.c +239 -408
- data/vendor/libgit2/src/attr.h +3 -33
- data/vendor/libgit2/src/attr_file.c +424 -156
- data/vendor/libgit2/src/attr_file.h +95 -23
- data/vendor/libgit2/src/attrcache.c +469 -0
- data/vendor/libgit2/src/attrcache.h +37 -5
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +532 -0
- data/vendor/libgit2/src/blame.h +95 -0
- data/vendor/libgit2/src/blame_git.c +668 -0
- data/vendor/libgit2/src/blame_git.h +22 -0
- data/vendor/libgit2/src/blob.c +233 -129
- data/vendor/libgit2/src/blob.h +29 -1
- data/vendor/libgit2/src/branch.c +295 -197
- data/vendor/libgit2/src/branch.h +2 -0
- data/vendor/libgit2/src/buf_text.c +52 -27
- data/vendor/libgit2/src/buf_text.h +7 -7
- data/vendor/libgit2/src/buffer.c +609 -52
- data/vendor/libgit2/src/buffer.h +68 -23
- data/vendor/libgit2/src/cache.c +48 -51
- data/vendor/libgit2/src/cache.h +6 -4
- data/vendor/libgit2/src/cc-compat.h +35 -7
- data/vendor/libgit2/src/checkout.c +1827 -483
- data/vendor/libgit2/src/checkout.h +4 -1
- data/vendor/libgit2/src/cherrypick.c +230 -0
- data/vendor/libgit2/src/clone.c +338 -258
- data/vendor/libgit2/src/{compress.h → clone.h} +5 -5
- data/vendor/libgit2/src/commit.c +711 -124
- data/vendor/libgit2/src/commit.h +10 -3
- data/vendor/libgit2/src/commit_list.c +21 -14
- data/vendor/libgit2/src/commit_list.h +9 -3
- data/vendor/libgit2/src/common.h +153 -13
- data/vendor/libgit2/src/config.c +871 -242
- data/vendor/libgit2/src/config.h +58 -14
- data/vendor/libgit2/src/config_backend.h +84 -0
- data/vendor/libgit2/src/config_cache.c +44 -18
- data/vendor/libgit2/src/config_entries.c +259 -0
- data/vendor/libgit2/src/config_entries.h +23 -0
- data/vendor/libgit2/src/config_file.c +837 -1113
- data/vendor/libgit2/src/config_mem.c +224 -0
- data/vendor/libgit2/src/config_parse.c +558 -0
- data/vendor/libgit2/src/config_parse.h +64 -0
- data/vendor/libgit2/src/crlf.c +290 -195
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +275 -71
- data/vendor/libgit2/src/delta.h +80 -58
- data/vendor/libgit2/src/describe.c +893 -0
- data/vendor/libgit2/src/diff.c +330 -1128
- data/vendor/libgit2/src/diff.h +25 -67
- data/vendor/libgit2/src/diff_driver.c +225 -109
- data/vendor/libgit2/src/diff_driver.h +5 -2
- data/vendor/libgit2/src/diff_file.c +128 -103
- data/vendor/libgit2/src/diff_file.h +17 -12
- data/vendor/libgit2/src/diff_generate.c +1622 -0
- data/vendor/libgit2/src/diff_generate.h +128 -0
- data/vendor/libgit2/src/diff_parse.c +108 -0
- data/vendor/libgit2/src/diff_parse.h +20 -0
- data/vendor/libgit2/src/diff_print.c +578 -218
- data/vendor/libgit2/src/diff_stats.c +362 -0
- data/vendor/libgit2/src/diff_tform.c +429 -257
- data/vendor/libgit2/src/diff_tform.h +25 -0
- data/vendor/libgit2/src/diff_xdiff.c +143 -46
- data/vendor/libgit2/src/diff_xdiff.h +12 -5
- data/vendor/libgit2/src/errors.c +150 -34
- data/vendor/libgit2/src/features.h.in +37 -0
- data/vendor/libgit2/src/fetch.c +69 -46
- data/vendor/libgit2/src/fetch.h +6 -12
- data/vendor/libgit2/src/fetchhead.c +40 -33
- data/vendor/libgit2/src/fetchhead.h +5 -4
- data/vendor/libgit2/src/filebuf.c +163 -61
- data/vendor/libgit2/src/filebuf.h +13 -7
- data/vendor/libgit2/src/fileops.c +549 -407
- data/vendor/libgit2/src/fileops.h +97 -106
- data/vendor/libgit2/src/filter.c +989 -46
- data/vendor/libgit2/src/filter.h +21 -70
- data/vendor/libgit2/src/fnmatch.c +67 -11
- data/vendor/libgit2/src/fnmatch.h +27 -7
- data/vendor/libgit2/src/global.c +257 -63
- data/vendor/libgit2/src/global.h +19 -0
- data/vendor/libgit2/src/graph.c +39 -23
- data/vendor/libgit2/src/hash/hash_collisiondetect.h +51 -0
- data/vendor/libgit2/src/hash/hash_common_crypto.h +61 -0
- data/vendor/libgit2/src/hash/hash_generic.c +3 -3
- data/vendor/libgit2/src/hash/hash_generic.h +10 -5
- data/vendor/libgit2/src/hash/hash_mbedtls.c +38 -0
- data/vendor/libgit2/src/hash/hash_mbedtls.h +24 -0
- data/vendor/libgit2/src/hash/hash_openssl.h +26 -8
- data/vendor/libgit2/src/hash/hash_win32.c +71 -43
- data/vendor/libgit2/src/hash/hash_win32.h +4 -3
- data/vendor/libgit2/src/hash/sha1dc/sha1.c +1900 -0
- data/vendor/libgit2/src/hash/sha1dc/sha1.h +110 -0
- data/vendor/libgit2/src/hash/sha1dc/ubc_check.c +372 -0
- data/vendor/libgit2/src/hash/sha1dc/ubc_check.h +52 -0
- data/vendor/libgit2/src/hash.c +0 -1
- data/vendor/libgit2/src/hash.h +13 -6
- data/vendor/libgit2/src/hashsig.c +121 -126
- data/vendor/libgit2/src/ident.c +129 -0
- data/vendor/libgit2/src/idxmap.c +153 -0
- data/vendor/libgit2/src/idxmap.h +41 -0
- data/vendor/libgit2/src/ignore.c +362 -123
- data/vendor/libgit2/src/ignore.h +16 -4
- data/vendor/libgit2/src/index.c +2131 -692
- data/vendor/libgit2/src/index.h +138 -6
- data/vendor/libgit2/src/indexer.c +866 -266
- data/vendor/libgit2/src/indexer.h +16 -0
- data/vendor/libgit2/src/integer.h +106 -0
- data/vendor/libgit2/src/iterator.c +1888 -967
- data/vendor/libgit2/src/iterator.h +130 -67
- data/vendor/libgit2/src/khash.h +43 -29
- data/vendor/libgit2/src/mailmap.c +485 -0
- data/vendor/libgit2/src/mailmap.h +35 -0
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +1679 -479
- data/vendor/libgit2/src/merge.h +89 -22
- data/vendor/libgit2/src/merge_driver.c +426 -0
- data/vendor/libgit2/src/merge_driver.h +62 -0
- data/vendor/libgit2/src/merge_file.c +238 -101
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/message.h +3 -1
- data/vendor/libgit2/src/mwindow.c +123 -15
- data/vendor/libgit2/src/mwindow.h +10 -1
- data/vendor/libgit2/src/netops.c +178 -499
- data/vendor/libgit2/src/netops.h +51 -27
- data/vendor/libgit2/src/notes.c +251 -94
- data/vendor/libgit2/src/notes.h +5 -2
- data/vendor/libgit2/src/object.c +253 -67
- data/vendor/libgit2/src/object.h +40 -2
- data/vendor/libgit2/src/object_api.c +30 -11
- data/vendor/libgit2/src/odb.c +765 -201
- data/vendor/libgit2/src/odb.h +40 -8
- data/vendor/libgit2/src/odb_loose.c +560 -346
- data/vendor/libgit2/src/odb_mempack.c +185 -0
- data/vendor/libgit2/src/odb_pack.c +117 -73
- data/vendor/libgit2/src/offmap.c +113 -0
- data/vendor/libgit2/src/offmap.h +32 -42
- data/vendor/libgit2/src/oid.c +45 -25
- data/vendor/libgit2/src/oid.h +26 -8
- data/vendor/libgit2/src/oidarray.c +34 -0
- data/vendor/libgit2/src/oidarray.h +20 -0
- data/vendor/libgit2/src/oidmap.c +125 -0
- data/vendor/libgit2/src/oidmap.h +30 -17
- data/vendor/libgit2/src/pack-objects.c +688 -265
- data/vendor/libgit2/src/pack-objects.h +27 -13
- data/vendor/libgit2/src/pack.c +418 -202
- data/vendor/libgit2/src/pack.h +25 -16
- data/vendor/libgit2/src/parse.c +124 -0
- data/vendor/libgit2/src/parse.h +61 -0
- data/vendor/libgit2/src/patch.c +223 -0
- data/vendor/libgit2/src/patch.h +68 -0
- data/vendor/libgit2/src/patch_generate.c +901 -0
- data/vendor/libgit2/src/patch_generate.h +69 -0
- data/vendor/libgit2/src/patch_parse.c +1136 -0
- data/vendor/libgit2/src/patch_parse.h +51 -0
- data/vendor/libgit2/src/path.c +1247 -241
- data/vendor/libgit2/src/path.h +353 -57
- data/vendor/libgit2/src/pathspec.c +586 -58
- data/vendor/libgit2/src/pathspec.h +37 -15
- data/vendor/libgit2/src/pool.c +134 -221
- data/vendor/libgit2/src/pool.h +38 -50
- data/vendor/libgit2/src/posix.c +76 -10
- data/vendor/libgit2/src/posix.h +74 -32
- data/vendor/libgit2/src/pqueue.c +79 -117
- data/vendor/libgit2/src/pqueue.h +38 -82
- data/vendor/libgit2/src/proxy.c +39 -0
- data/vendor/libgit2/src/proxy.h +17 -0
- data/vendor/libgit2/src/push.c +178 -279
- data/vendor/libgit2/src/push.h +93 -4
- data/vendor/libgit2/src/reader.c +265 -0
- data/vendor/libgit2/src/reader.h +107 -0
- data/vendor/libgit2/src/rebase.c +1364 -0
- data/vendor/libgit2/src/refdb.c +74 -19
- data/vendor/libgit2/src/refdb.h +16 -3
- data/vendor/libgit2/src/refdb_fs.c +1472 -603
- data/vendor/libgit2/src/refdb_fs.h +4 -0
- data/vendor/libgit2/src/reflog.c +40 -330
- data/vendor/libgit2/src/reflog.h +8 -2
- data/vendor/libgit2/src/refs.c +641 -225
- data/vendor/libgit2/src/refs.h +53 -6
- data/vendor/libgit2/src/refspec.c +175 -62
- data/vendor/libgit2/src/refspec.h +10 -25
- data/vendor/libgit2/src/remote.c +1741 -723
- data/vendor/libgit2/src/remote.h +17 -5
- data/vendor/libgit2/src/repository.c +1505 -421
- data/vendor/libgit2/src/repository.h +95 -15
- data/vendor/libgit2/src/reset.c +63 -26
- data/vendor/libgit2/src/revert.c +232 -0
- data/vendor/libgit2/src/revparse.c +94 -80
- data/vendor/libgit2/src/revwalk.c +427 -194
- data/vendor/libgit2/src/revwalk.h +14 -5
- data/vendor/libgit2/src/settings.c +290 -0
- data/vendor/libgit2/src/sha1_lookup.c +16 -159
- data/vendor/libgit2/src/sha1_lookup.h +5 -4
- data/vendor/libgit2/src/signature.c +138 -26
- data/vendor/libgit2/src/signature.h +5 -0
- data/vendor/libgit2/src/sortedcache.c +395 -0
- data/vendor/libgit2/src/sortedcache.h +180 -0
- data/vendor/libgit2/src/stash.c +629 -168
- data/vendor/libgit2/src/status.c +125 -75
- data/vendor/libgit2/src/status.h +4 -2
- data/vendor/libgit2/src/stdalloc.c +120 -0
- data/vendor/libgit2/src/stdalloc.h +17 -0
- data/vendor/libgit2/src/stream.h +86 -0
- data/vendor/libgit2/src/streams/mbedtls.c +483 -0
- data/vendor/libgit2/src/streams/mbedtls.h +23 -0
- data/vendor/libgit2/src/streams/openssl.c +789 -0
- data/vendor/libgit2/src/streams/openssl.h +23 -0
- data/vendor/libgit2/src/streams/registry.c +118 -0
- data/vendor/libgit2/src/streams/registry.h +19 -0
- data/vendor/libgit2/src/streams/socket.c +235 -0
- data/vendor/libgit2/src/streams/socket.h +23 -0
- data/vendor/libgit2/src/streams/stransport.c +323 -0
- data/vendor/libgit2/src/streams/stransport.h +21 -0
- data/vendor/libgit2/src/streams/tls.c +73 -0
- data/vendor/libgit2/src/streams/tls.h +31 -0
- data/vendor/libgit2/src/strmap.c +147 -0
- data/vendor/libgit2/src/strmap.h +46 -51
- data/vendor/libgit2/src/strnlen.h +24 -0
- data/vendor/libgit2/src/submodule.c +1633 -877
- data/vendor/libgit2/src/submodule.h +83 -21
- data/vendor/libgit2/src/sysdir.c +355 -0
- data/vendor/libgit2/src/sysdir.h +119 -0
- data/vendor/libgit2/src/tag.c +87 -62
- data/vendor/libgit2/src/tag.h +4 -1
- data/vendor/libgit2/src/thread-utils.c +3 -0
- data/vendor/libgit2/src/thread-utils.h +71 -35
- data/vendor/libgit2/src/trace.c +4 -4
- data/vendor/libgit2/src/trace.h +11 -3
- data/vendor/libgit2/src/trailer.c +416 -0
- data/vendor/libgit2/src/transaction.c +382 -0
- data/vendor/libgit2/src/transaction.h +14 -0
- data/vendor/libgit2/src/transport.c +133 -67
- data/vendor/libgit2/src/transports/auth.c +75 -0
- data/vendor/libgit2/src/transports/auth.h +64 -0
- data/vendor/libgit2/src/transports/auth_negotiate.c +277 -0
- data/vendor/libgit2/src/transports/auth_negotiate.h +27 -0
- data/vendor/libgit2/src/transports/cred.c +296 -68
- data/vendor/libgit2/src/transports/cred.h +16 -0
- data/vendor/libgit2/src/transports/cred_helpers.c +4 -0
- data/vendor/libgit2/src/transports/git.c +108 -90
- data/vendor/libgit2/src/transports/http.c +803 -258
- data/vendor/libgit2/src/transports/http.h +25 -0
- data/vendor/libgit2/src/transports/local.c +265 -169
- data/vendor/libgit2/src/transports/smart.c +255 -45
- data/vendor/libgit2/src/transports/smart.h +42 -22
- data/vendor/libgit2/src/transports/smart_pkt.c +250 -159
- data/vendor/libgit2/src/transports/smart_protocol.c +414 -196
- data/vendor/libgit2/src/transports/ssh.c +645 -236
- data/vendor/libgit2/src/transports/ssh.h +14 -0
- data/vendor/libgit2/src/transports/winhttp.c +809 -353
- data/vendor/libgit2/src/tree-cache.c +138 -52
- data/vendor/libgit2/src/tree-cache.h +14 -7
- data/vendor/libgit2/src/tree.c +620 -259
- data/vendor/libgit2/src/tree.h +12 -19
- data/vendor/libgit2/src/tsort.c +3 -2
- data/vendor/libgit2/src/unix/map.c +25 -7
- data/vendor/libgit2/src/unix/posix.h +77 -12
- data/vendor/libgit2/src/unix/pthread.h +56 -0
- data/vendor/libgit2/src/unix/realpath.c +12 -8
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +349 -165
- data/vendor/libgit2/src/util.h +167 -85
- data/vendor/libgit2/src/varint.c +43 -0
- data/vendor/libgit2/src/varint.h +17 -0
- data/vendor/libgit2/src/vector.c +156 -33
- data/vendor/libgit2/src/vector.h +41 -5
- data/vendor/libgit2/src/win32/dir.c +22 -42
- data/vendor/libgit2/src/win32/dir.h +7 -5
- data/vendor/libgit2/src/win32/error.c +6 -32
- data/vendor/libgit2/src/win32/error.h +4 -2
- data/vendor/libgit2/src/win32/findfile.c +62 -69
- data/vendor/libgit2/src/win32/findfile.h +5 -13
- data/vendor/libgit2/src/win32/git2.rc +44 -0
- data/vendor/libgit2/src/win32/map.c +39 -11
- data/vendor/libgit2/src/win32/mingw-compat.h +10 -11
- data/vendor/libgit2/src/win32/msvc-compat.h +10 -33
- data/vendor/libgit2/src/win32/path_w32.c +476 -0
- data/vendor/libgit2/src/win32/path_w32.h +104 -0
- data/vendor/libgit2/src/win32/posix.h +35 -30
- data/vendor/libgit2/src/win32/posix_w32.c +659 -327
- data/vendor/libgit2/src/win32/precompiled.h +7 -2
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/thread.c +258 -0
- data/vendor/libgit2/src/win32/thread.h +64 -0
- data/vendor/libgit2/src/win32/utf-conv.c +127 -62
- data/vendor/libgit2/src/win32/utf-conv.h +47 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_buffer.c +54 -0
- data/vendor/libgit2/src/win32/w32_buffer.h +20 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +438 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +129 -0
- data/vendor/libgit2/src/win32/w32_stack.c +193 -0
- data/vendor/libgit2/src/win32/w32_stack.h +140 -0
- data/vendor/libgit2/src/win32/w32_util.c +95 -0
- data/vendor/libgit2/src/win32/w32_util.h +170 -0
- data/vendor/libgit2/src/win32/win32-compat.h +52 -0
- data/vendor/libgit2/src/worktree.c +578 -0
- data/vendor/libgit2/src/worktree.h +39 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +33 -18
- data/vendor/libgit2/src/xdiff/xdiffi.c +578 -88
- data/vendor/libgit2/src/xdiff/xdiffi.h +3 -2
- data/vendor/libgit2/src/xdiff/xemit.c +106 -45
- data/vendor/libgit2/src/xdiff/xemit.h +3 -3
- data/vendor/libgit2/src/xdiff/xhistogram.c +5 -4
- data/vendor/libgit2/src/xdiff/xinclude.h +3 -2
- data/vendor/libgit2/src/xdiff/xmacros.h +2 -2
- data/vendor/libgit2/src/xdiff/xmerge.c +167 -48
- data/vendor/libgit2/src/xdiff/xpatience.c +42 -10
- data/vendor/libgit2/src/xdiff/xprepare.c +14 -14
- data/vendor/libgit2/src/xdiff/xprepare.h +2 -2
- data/vendor/libgit2/src/xdiff/xtypes.h +2 -2
- data/vendor/libgit2/src/xdiff/xutils.c +60 -56
- data/vendor/libgit2/src/xdiff/xutils.h +3 -5
- data/vendor/libgit2/src/zstream.c +205 -0
- data/vendor/libgit2/src/zstream.h +53 -0
- metadata +281 -233
- 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/Makefile.embed +0 -42
- data/vendor/libgit2/include/git2/push.h +0 -131
- data/vendor/libgit2/include/git2/threads.h +0 -50
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/bswap.h +0 -97
- data/vendor/libgit2/src/compress.c +0 -53
- data/vendor/libgit2/src/config_file.h +0 -60
- data/vendor/libgit2/src/delta-apply.c +0 -134
- data/vendor/libgit2/src/delta-apply.h +0 -50
- data/vendor/libgit2/src/diff_patch.c +0 -995
- data/vendor/libgit2/src/diff_patch.h +0 -46
- data/vendor/libgit2/src/hashsig.h +0 -72
- data/vendor/libgit2/src/merge_file.h +0 -71
- data/vendor/libgit2/src/win32/pthread.c +0 -144
- data/vendor/libgit2/src/win32/pthread.h +0 -50
data/vendor/libgit2/src/stash.c
CHANGED
@@ -6,20 +6,30 @@
|
|
6
6
|
*/
|
7
7
|
|
8
8
|
#include "common.h"
|
9
|
+
|
9
10
|
#include "repository.h"
|
10
11
|
#include "commit.h"
|
12
|
+
#include "message.h"
|
11
13
|
#include "tree.h"
|
12
14
|
#include "reflog.h"
|
15
|
+
#include "blob.h"
|
13
16
|
#include "git2/diff.h"
|
14
17
|
#include "git2/stash.h"
|
15
18
|
#include "git2/status.h"
|
16
19
|
#include "git2/checkout.h"
|
17
20
|
#include "git2/index.h"
|
21
|
+
#include "git2/transaction.h"
|
22
|
+
#include "git2/merge.h"
|
23
|
+
#include "index.h"
|
18
24
|
#include "signature.h"
|
25
|
+
#include "iterator.h"
|
26
|
+
#include "merge.h"
|
27
|
+
#include "diff.h"
|
28
|
+
#include "diff_generate.h"
|
19
29
|
|
20
30
|
static int create_error(int error, const char *msg)
|
21
31
|
{
|
22
|
-
|
32
|
+
git_error_set(GIT_ERROR_STASH, "cannot stash changes - %s", msg);
|
23
33
|
return error;
|
24
34
|
}
|
25
35
|
|
@@ -27,8 +37,8 @@ static int retrieve_head(git_reference **out, git_repository *repo)
|
|
27
37
|
{
|
28
38
|
int error = git_repository_head(out, repo);
|
29
39
|
|
30
|
-
if (error ==
|
31
|
-
return create_error(error, "
|
40
|
+
if (error == GIT_EUNBORNBRANCH)
|
41
|
+
return create_error(error, "you do not have the initial commit yet.");
|
32
42
|
|
33
43
|
return error;
|
34
44
|
}
|
@@ -38,7 +48,7 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
|
|
38
48
|
char *formatted_oid;
|
39
49
|
|
40
50
|
formatted_oid = git_oid_allocfmt(b_commit);
|
41
|
-
|
51
|
+
GIT_ERROR_CHECK_ALLOC(formatted_oid);
|
42
52
|
|
43
53
|
git_buf_put(out, formatted_oid, 7);
|
44
54
|
git__free(formatted_oid);
|
@@ -48,23 +58,14 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
|
|
48
58
|
|
49
59
|
static int append_commit_description(git_buf *out, git_commit* commit)
|
50
60
|
{
|
51
|
-
const char *
|
52
|
-
|
61
|
+
const char *summary = git_commit_summary(commit);
|
62
|
+
GIT_ERROR_CHECK_ALLOC(summary);
|
53
63
|
|
54
64
|
if (append_abbreviated_oid(out, git_commit_id(commit)) < 0)
|
55
65
|
return -1;
|
56
66
|
|
57
|
-
message = git_commit_message(commit);
|
58
|
-
len = strlen(message);
|
59
|
-
|
60
|
-
/* TODO: Replace with proper commit short message
|
61
|
-
* when git_commit_message_short() is implemented.
|
62
|
-
*/
|
63
|
-
while (pos < len && message[pos] != '\n')
|
64
|
-
pos++;
|
65
|
-
|
66
67
|
git_buf_putc(out, ' ');
|
67
|
-
|
68
|
+
git_buf_puts(out, summary);
|
68
69
|
git_buf_putc(out, '\n');
|
69
70
|
|
70
71
|
return git_buf_oom(out) ? -1 : 0;
|
@@ -103,21 +104,25 @@ cleanup:
|
|
103
104
|
return error;
|
104
105
|
}
|
105
106
|
|
106
|
-
static int build_tree_from_index(
|
107
|
+
static int build_tree_from_index(
|
108
|
+
git_tree **out,
|
109
|
+
git_repository *repo,
|
110
|
+
git_index *index)
|
107
111
|
{
|
108
112
|
int error;
|
109
113
|
git_oid i_tree_oid;
|
110
114
|
|
111
|
-
if ((error =
|
112
|
-
return
|
115
|
+
if ((error = git_index_write_tree_to(&i_tree_oid, index, repo)) < 0)
|
116
|
+
return error;
|
113
117
|
|
114
|
-
return git_tree_lookup(out,
|
118
|
+
return git_tree_lookup(out, repo, &i_tree_oid);
|
115
119
|
}
|
116
120
|
|
117
121
|
static int commit_index(
|
118
122
|
git_commit **i_commit,
|
123
|
+
git_repository *repo,
|
119
124
|
git_index *index,
|
120
|
-
git_signature *stasher,
|
125
|
+
const git_signature *stasher,
|
121
126
|
const char *message,
|
122
127
|
const git_commit *parent)
|
123
128
|
{
|
@@ -126,7 +131,7 @@ static int commit_index(
|
|
126
131
|
git_buf msg = GIT_BUF_INIT;
|
127
132
|
int error;
|
128
133
|
|
129
|
-
if ((error = build_tree_from_index(&i_tree, index)) < 0)
|
134
|
+
if ((error = build_tree_from_index(&i_tree, repo, index)) < 0)
|
130
135
|
goto cleanup;
|
131
136
|
|
132
137
|
if ((error = git_buf_printf(&msg, "index on %s\n", message)) < 0)
|
@@ -149,86 +154,114 @@ static int commit_index(
|
|
149
154
|
|
150
155
|
cleanup:
|
151
156
|
git_tree_free(i_tree);
|
152
|
-
|
157
|
+
git_buf_dispose(&msg);
|
153
158
|
return error;
|
154
159
|
}
|
155
160
|
|
156
|
-
struct
|
157
|
-
git_index *index;
|
158
|
-
|
159
|
-
int error;
|
160
|
-
|
161
|
+
struct stash_update_rules {
|
161
162
|
bool include_changed;
|
162
163
|
bool include_untracked;
|
163
164
|
bool include_ignored;
|
164
165
|
};
|
165
166
|
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
167
|
+
/*
|
168
|
+
* Similar to git_index_add_bypath but able to operate on any
|
169
|
+
* index without making assumptions about the repository's index
|
170
|
+
*/
|
171
|
+
static int stash_to_index(
|
172
|
+
git_repository *repo,
|
173
|
+
git_index *index,
|
174
|
+
const char *path)
|
170
175
|
{
|
171
|
-
|
172
|
-
|
176
|
+
git_index *repo_index;
|
177
|
+
git_index_entry entry = {{0}};
|
178
|
+
struct stat st;
|
179
|
+
int error;
|
173
180
|
|
174
|
-
|
181
|
+
if (!git_repository_is_bare(repo) &&
|
182
|
+
(error = git_repository_index__weakptr(&repo_index, repo)) < 0)
|
183
|
+
return error;
|
175
184
|
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
185
|
+
if ((error = git_blob__create_from_paths(
|
186
|
+
&entry.id, &st, repo, NULL, path, 0, true)) < 0)
|
187
|
+
return error;
|
188
|
+
|
189
|
+
git_index_entry__init_from_stat(&entry, &st,
|
190
|
+
(repo_index != NULL || !repo_index->distrust_filemode));
|
191
|
+
|
192
|
+
entry.path = path;
|
193
|
+
|
194
|
+
return git_index_add(index, &entry);
|
195
|
+
}
|
181
196
|
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
197
|
+
static int stash_update_index_from_diff(
|
198
|
+
git_repository *repo,
|
199
|
+
git_index *index,
|
200
|
+
const git_diff *diff,
|
201
|
+
struct stash_update_rules *data)
|
202
|
+
{
|
203
|
+
int error = 0;
|
204
|
+
size_t d, max_d = git_diff_num_deltas(diff);
|
186
205
|
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
add_path = delta->new_file.path;
|
191
|
-
break;
|
206
|
+
for (d = 0; !error && d < max_d; ++d) {
|
207
|
+
const char *add_path = NULL;
|
208
|
+
const git_diff_delta *delta = git_diff_get_delta(diff, d);
|
192
209
|
|
193
|
-
|
194
|
-
|
210
|
+
switch (delta->status) {
|
211
|
+
case GIT_DELTA_IGNORED:
|
212
|
+
if (data->include_ignored)
|
213
|
+
add_path = delta->new_file.path;
|
214
|
+
break;
|
215
|
+
|
216
|
+
case GIT_DELTA_UNTRACKED:
|
217
|
+
if (data->include_untracked &&
|
218
|
+
delta->new_file.mode != GIT_FILEMODE_TREE)
|
219
|
+
add_path = delta->new_file.path;
|
220
|
+
break;
|
221
|
+
|
222
|
+
case GIT_DELTA_ADDED:
|
223
|
+
case GIT_DELTA_MODIFIED:
|
224
|
+
if (data->include_changed)
|
225
|
+
add_path = delta->new_file.path;
|
226
|
+
break;
|
227
|
+
|
228
|
+
case GIT_DELTA_DELETED:
|
229
|
+
if (data->include_changed &&
|
230
|
+
!git_index_find(NULL, index, delta->old_file.path))
|
231
|
+
error = git_index_remove(index, delta->old_file.path, 0);
|
195
232
|
break;
|
196
|
-
if (git_index_find(NULL, data->index, delta->old_file.path) == 0)
|
197
|
-
data->error = git_index_remove(
|
198
|
-
data->index, delta->old_file.path, 0);
|
199
|
-
break;
|
200
|
-
|
201
|
-
default:
|
202
|
-
/* Unimplemented */
|
203
|
-
giterr_set(
|
204
|
-
GITERR_INVALID,
|
205
|
-
"Cannot update index. Unimplemented status (%d)",
|
206
|
-
delta->status);
|
207
|
-
data->error = -1;
|
208
|
-
break;
|
209
|
-
}
|
210
233
|
|
211
|
-
|
212
|
-
|
234
|
+
default:
|
235
|
+
/* Unimplemented */
|
236
|
+
git_error_set(
|
237
|
+
GIT_ERROR_INVALID,
|
238
|
+
"cannot update index. Unimplemented status (%d)",
|
239
|
+
delta->status);
|
240
|
+
return -1;
|
241
|
+
}
|
213
242
|
|
214
|
-
|
243
|
+
if (add_path != NULL)
|
244
|
+
error = stash_to_index(repo, index, add_path);
|
245
|
+
}
|
246
|
+
|
247
|
+
return error;
|
215
248
|
}
|
216
249
|
|
217
250
|
static int build_untracked_tree(
|
218
251
|
git_tree **tree_out,
|
219
|
-
|
252
|
+
git_repository *repo,
|
220
253
|
git_commit *i_commit,
|
221
254
|
uint32_t flags)
|
222
255
|
{
|
256
|
+
git_index *i_index = NULL;
|
223
257
|
git_tree *i_tree = NULL;
|
224
|
-
|
258
|
+
git_diff *diff = NULL;
|
225
259
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
226
|
-
struct
|
260
|
+
struct stash_update_rules data = {0};
|
227
261
|
int error;
|
228
262
|
|
229
|
-
|
230
|
-
|
231
|
-
data.index = index;
|
263
|
+
if ((error = git_index_new(&i_index)) < 0)
|
264
|
+
goto cleanup;
|
232
265
|
|
233
266
|
if (flags & GIT_STASH_INCLUDE_UNTRACKED) {
|
234
267
|
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED |
|
@@ -237,37 +270,33 @@ static int build_untracked_tree(
|
|
237
270
|
}
|
238
271
|
|
239
272
|
if (flags & GIT_STASH_INCLUDE_IGNORED) {
|
240
|
-
opts.flags |= GIT_DIFF_INCLUDE_IGNORED
|
273
|
+
opts.flags |= GIT_DIFF_INCLUDE_IGNORED |
|
274
|
+
GIT_DIFF_RECURSE_IGNORED_DIRS;
|
241
275
|
data.include_ignored = true;
|
242
276
|
}
|
243
277
|
|
244
278
|
if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
|
245
279
|
goto cleanup;
|
246
280
|
|
247
|
-
if ((error = git_diff_tree_to_workdir(
|
248
|
-
&diff, git_index_owner(index), i_tree, &opts)) < 0)
|
281
|
+
if ((error = git_diff_tree_to_workdir(&diff, repo, i_tree, &opts)) < 0)
|
249
282
|
goto cleanup;
|
250
283
|
|
251
|
-
if ((error =
|
252
|
-
diff, update_index_cb, NULL, NULL, &data)) < 0)
|
253
|
-
{
|
254
|
-
if (error == GIT_EUSER)
|
255
|
-
error = data.error;
|
284
|
+
if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
|
256
285
|
goto cleanup;
|
257
|
-
}
|
258
286
|
|
259
|
-
error = build_tree_from_index(tree_out,
|
287
|
+
error = build_tree_from_index(tree_out, repo, i_index);
|
260
288
|
|
261
289
|
cleanup:
|
262
|
-
|
290
|
+
git_diff_free(diff);
|
263
291
|
git_tree_free(i_tree);
|
292
|
+
git_index_free(i_index);
|
264
293
|
return error;
|
265
294
|
}
|
266
295
|
|
267
296
|
static int commit_untracked(
|
268
297
|
git_commit **u_commit,
|
269
|
-
|
270
|
-
git_signature *stasher,
|
298
|
+
git_repository *repo,
|
299
|
+
const git_signature *stasher,
|
271
300
|
const char *message,
|
272
301
|
git_commit *i_commit,
|
273
302
|
uint32_t flags)
|
@@ -277,7 +306,7 @@ static int commit_untracked(
|
|
277
306
|
git_buf msg = GIT_BUF_INIT;
|
278
307
|
int error;
|
279
308
|
|
280
|
-
if ((error = build_untracked_tree(&u_tree,
|
309
|
+
if ((error = build_untracked_tree(&u_tree, repo, i_commit, flags)) < 0)
|
281
310
|
goto cleanup;
|
282
311
|
|
283
312
|
if ((error = git_buf_printf(&msg, "untracked files on %s\n", message)) < 0)
|
@@ -285,7 +314,7 @@ static int commit_untracked(
|
|
285
314
|
|
286
315
|
if ((error = git_commit_create(
|
287
316
|
&u_commit_oid,
|
288
|
-
|
317
|
+
repo,
|
289
318
|
NULL,
|
290
319
|
stasher,
|
291
320
|
stasher,
|
@@ -296,56 +325,65 @@ static int commit_untracked(
|
|
296
325
|
NULL)) < 0)
|
297
326
|
goto cleanup;
|
298
327
|
|
299
|
-
error = git_commit_lookup(u_commit,
|
328
|
+
error = git_commit_lookup(u_commit, repo, &u_commit_oid);
|
300
329
|
|
301
330
|
cleanup:
|
302
331
|
git_tree_free(u_tree);
|
303
|
-
|
332
|
+
git_buf_dispose(&msg);
|
304
333
|
return error;
|
305
334
|
}
|
306
335
|
|
336
|
+
static git_diff_delta *stash_delta_merge(
|
337
|
+
const git_diff_delta *a,
|
338
|
+
const git_diff_delta *b,
|
339
|
+
git_pool *pool)
|
340
|
+
{
|
341
|
+
/* Special case for stash: if a file is deleted in the index, but exists
|
342
|
+
* in the working tree, we need to stash the workdir copy for the workdir.
|
343
|
+
*/
|
344
|
+
if (a->status == GIT_DELTA_DELETED && b->status == GIT_DELTA_UNTRACKED) {
|
345
|
+
git_diff_delta *dup = git_diff__delta_dup(b, pool);
|
346
|
+
|
347
|
+
if (dup)
|
348
|
+
dup->status = GIT_DELTA_MODIFIED;
|
349
|
+
return dup;
|
350
|
+
}
|
351
|
+
|
352
|
+
return git_diff__merge_like_cgit(a, b, pool);
|
353
|
+
}
|
354
|
+
|
307
355
|
static int build_workdir_tree(
|
308
356
|
git_tree **tree_out,
|
309
|
-
|
357
|
+
git_repository *repo,
|
358
|
+
git_index *i_index,
|
310
359
|
git_commit *b_commit)
|
311
360
|
{
|
312
|
-
git_repository *repo = git_index_owner(index);
|
313
361
|
git_tree *b_tree = NULL;
|
314
|
-
|
362
|
+
git_diff *diff = NULL, *idx_to_wd = NULL;
|
315
363
|
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
|
316
|
-
struct
|
364
|
+
struct stash_update_rules data = {0};
|
317
365
|
int error;
|
318
366
|
|
319
|
-
|
320
|
-
goto cleanup;
|
321
|
-
|
322
|
-
if ((error = git_diff_tree_to_index(&diff, repo, b_tree, NULL, &opts)) < 0)
|
323
|
-
goto cleanup;
|
367
|
+
opts.flags = GIT_DIFF_IGNORE_SUBMODULES | GIT_DIFF_INCLUDE_UNTRACKED;
|
324
368
|
|
325
|
-
if ((error =
|
369
|
+
if ((error = git_commit_tree(&b_tree, b_commit)) < 0)
|
326
370
|
goto cleanup;
|
327
371
|
|
328
|
-
if ((error =
|
372
|
+
if ((error = git_diff_tree_to_index(&diff, repo, b_tree, i_index, &opts)) < 0 ||
|
373
|
+
(error = git_diff_index_to_workdir(&idx_to_wd, repo, i_index, &opts)) < 0 ||
|
374
|
+
(error = git_diff__merge(diff, idx_to_wd, stash_delta_merge)) < 0)
|
329
375
|
goto cleanup;
|
330
376
|
|
331
|
-
data.index = index;
|
332
377
|
data.include_changed = true;
|
333
378
|
|
334
|
-
if ((error =
|
335
|
-
diff, update_index_cb, NULL, NULL, &data)) < 0)
|
336
|
-
{
|
337
|
-
if (error == GIT_EUSER)
|
338
|
-
error = data.error;
|
379
|
+
if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
|
339
380
|
goto cleanup;
|
340
|
-
}
|
341
|
-
|
342
381
|
|
343
|
-
|
344
|
-
goto cleanup;
|
382
|
+
error = build_tree_from_index(tree_out, repo, i_index);
|
345
383
|
|
346
384
|
cleanup:
|
347
|
-
|
348
|
-
|
385
|
+
git_diff_free(idx_to_wd);
|
386
|
+
git_diff_free(diff);
|
349
387
|
git_tree_free(b_tree);
|
350
388
|
|
351
389
|
return error;
|
@@ -353,8 +391,8 @@ cleanup:
|
|
353
391
|
|
354
392
|
static int commit_worktree(
|
355
393
|
git_oid *w_commit_oid,
|
356
|
-
|
357
|
-
git_signature *stasher,
|
394
|
+
git_repository *repo,
|
395
|
+
const git_signature *stasher,
|
358
396
|
const char *message,
|
359
397
|
git_commit *i_commit,
|
360
398
|
git_commit *b_commit,
|
@@ -362,7 +400,9 @@ static int commit_worktree(
|
|
362
400
|
{
|
363
401
|
int error = 0;
|
364
402
|
git_tree *w_tree = NULL, *i_tree = NULL;
|
403
|
+
git_index *i_index = NULL;
|
365
404
|
const git_commit *parents[] = { NULL, NULL, NULL };
|
405
|
+
int ignorecase;
|
366
406
|
|
367
407
|
parents[0] = b_commit;
|
368
408
|
parents[1] = i_commit;
|
@@ -371,15 +411,21 @@ static int commit_worktree(
|
|
371
411
|
if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
|
372
412
|
goto cleanup;
|
373
413
|
|
374
|
-
if ((error =
|
414
|
+
if ((error = git_index_new(&i_index)) < 0 ||
|
415
|
+
(error = git_repository__cvar(&ignorecase, repo, GIT_CVAR_IGNORECASE)) < 0)
|
416
|
+
goto cleanup;
|
417
|
+
|
418
|
+
git_index__set_ignore_case(i_index, ignorecase);
|
419
|
+
|
420
|
+
if ((error = git_index_read_tree(i_index, i_tree)) < 0)
|
375
421
|
goto cleanup;
|
376
422
|
|
377
|
-
if ((error = build_workdir_tree(&w_tree,
|
423
|
+
if ((error = build_workdir_tree(&w_tree, repo, i_index, b_commit)) < 0)
|
378
424
|
goto cleanup;
|
379
425
|
|
380
426
|
error = git_commit_create(
|
381
427
|
w_commit_oid,
|
382
|
-
|
428
|
+
repo,
|
383
429
|
NULL,
|
384
430
|
stasher,
|
385
431
|
stasher,
|
@@ -392,6 +438,7 @@ static int commit_worktree(
|
|
392
438
|
cleanup:
|
393
439
|
git_tree_free(i_tree);
|
394
440
|
git_tree_free(w_tree);
|
441
|
+
git_index_free(i_index);
|
395
442
|
return error;
|
396
443
|
}
|
397
444
|
|
@@ -423,7 +470,7 @@ static int prepare_worktree_commit_message(
|
|
423
470
|
error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0;
|
424
471
|
|
425
472
|
cleanup:
|
426
|
-
|
473
|
+
git_buf_dispose(&buf);
|
427
474
|
|
428
475
|
return error;
|
429
476
|
}
|
@@ -431,28 +478,18 @@ cleanup:
|
|
431
478
|
static int update_reflog(
|
432
479
|
git_oid *w_commit_oid,
|
433
480
|
git_repository *repo,
|
434
|
-
git_signature *stasher,
|
435
481
|
const char *message)
|
436
482
|
{
|
437
|
-
git_reference *stash
|
438
|
-
git_reflog *reflog = NULL;
|
483
|
+
git_reference *stash;
|
439
484
|
int error;
|
440
485
|
|
441
|
-
if ((error =
|
442
|
-
|
443
|
-
|
444
|
-
if ((error = git_reflog_read(&reflog, stash)) < 0)
|
445
|
-
goto cleanup;
|
446
|
-
|
447
|
-
if ((error = git_reflog_append(reflog, w_commit_oid, stasher, message)) < 0)
|
448
|
-
goto cleanup;
|
486
|
+
if ((error = git_reference_ensure_log(repo, GIT_REFS_STASH_FILE)) < 0)
|
487
|
+
return error;
|
449
488
|
|
450
|
-
|
451
|
-
goto cleanup;
|
489
|
+
error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, w_commit_oid, 1, message);
|
452
490
|
|
453
|
-
cleanup:
|
454
491
|
git_reference_free(stash);
|
455
|
-
|
492
|
+
|
456
493
|
return error;
|
457
494
|
}
|
458
495
|
|
@@ -462,7 +499,7 @@ static int is_dirty_cb(const char *path, unsigned int status, void *payload)
|
|
462
499
|
GIT_UNUSED(status);
|
463
500
|
GIT_UNUSED(payload);
|
464
501
|
|
465
|
-
return
|
502
|
+
return GIT_PASSTHROUGH;
|
466
503
|
}
|
467
504
|
|
468
505
|
static int ensure_there_are_changes_to_stash(
|
@@ -474,20 +511,23 @@ static int ensure_there_are_changes_to_stash(
|
|
474
511
|
git_status_options opts = GIT_STATUS_OPTIONS_INIT;
|
475
512
|
|
476
513
|
opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
|
514
|
+
opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
|
515
|
+
|
477
516
|
if (include_untracked_files)
|
478
|
-
opts.flags
|
479
|
-
|
517
|
+
opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
|
518
|
+
GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
|
480
519
|
|
481
520
|
if (include_ignored_files)
|
482
|
-
opts.flags
|
521
|
+
opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED |
|
522
|
+
GIT_STATUS_OPT_RECURSE_IGNORED_DIRS;
|
483
523
|
|
484
524
|
error = git_status_foreach_ext(repo, &opts, is_dirty_cb, NULL);
|
485
525
|
|
486
|
-
if (error ==
|
526
|
+
if (error == GIT_PASSTHROUGH)
|
487
527
|
return 0;
|
488
528
|
|
489
529
|
if (!error)
|
490
|
-
return create_error(GIT_ENOTFOUND, "
|
530
|
+
return create_error(GIT_ENOTFOUND, "there is nothing to stash.");
|
491
531
|
|
492
532
|
return error;
|
493
533
|
}
|
@@ -495,22 +535,26 @@ static int ensure_there_are_changes_to_stash(
|
|
495
535
|
static int reset_index_and_workdir(
|
496
536
|
git_repository *repo,
|
497
537
|
git_commit *commit,
|
498
|
-
bool remove_untracked
|
538
|
+
bool remove_untracked,
|
539
|
+
bool remove_ignored)
|
499
540
|
{
|
500
|
-
|
541
|
+
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
|
501
542
|
|
502
543
|
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
|
503
544
|
|
504
545
|
if (remove_untracked)
|
505
546
|
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
|
506
547
|
|
548
|
+
if (remove_ignored)
|
549
|
+
opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
|
550
|
+
|
507
551
|
return git_checkout_tree(repo, (git_object *)commit, &opts);
|
508
552
|
}
|
509
553
|
|
510
554
|
int git_stash_save(
|
511
555
|
git_oid *out,
|
512
556
|
git_repository *repo,
|
513
|
-
git_signature *stasher,
|
557
|
+
const git_signature *stasher,
|
514
558
|
const char *message,
|
515
559
|
uint32_t flags)
|
516
560
|
{
|
@@ -537,12 +581,12 @@ int git_stash_save(
|
|
537
581
|
goto cleanup;
|
538
582
|
|
539
583
|
if ((error = commit_index(
|
540
|
-
&i_commit, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
|
584
|
+
&i_commit, repo, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
|
541
585
|
goto cleanup;
|
542
586
|
|
543
587
|
if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
|
544
588
|
(error = commit_untracked(
|
545
|
-
&u_commit,
|
589
|
+
&u_commit, repo, stasher, git_buf_cstr(&msg),
|
546
590
|
i_commit, flags)) < 0)
|
547
591
|
goto cleanup;
|
548
592
|
|
@@ -550,24 +594,25 @@ int git_stash_save(
|
|
550
594
|
goto cleanup;
|
551
595
|
|
552
596
|
if ((error = commit_worktree(
|
553
|
-
out,
|
597
|
+
out, repo, stasher, git_buf_cstr(&msg),
|
554
598
|
i_commit, b_commit, u_commit)) < 0)
|
555
599
|
goto cleanup;
|
556
600
|
|
557
601
|
git_buf_rtrim(&msg);
|
558
602
|
|
559
|
-
if ((error = update_reflog(out, repo,
|
603
|
+
if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0)
|
560
604
|
goto cleanup;
|
561
605
|
|
562
606
|
if ((error = reset_index_and_workdir(
|
563
607
|
repo,
|
564
608
|
((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
|
565
|
-
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0
|
609
|
+
(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
|
610
|
+
(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
|
566
611
|
goto cleanup;
|
567
612
|
|
568
613
|
cleanup:
|
569
614
|
|
570
|
-
|
615
|
+
git_buf_dispose(&msg);
|
571
616
|
git_commit_free(i_commit);
|
572
617
|
git_commit_free(b_commit);
|
573
618
|
git_commit_free(u_commit);
|
@@ -576,6 +621,399 @@ cleanup:
|
|
576
621
|
return error;
|
577
622
|
}
|
578
623
|
|
624
|
+
static int retrieve_stash_commit(
|
625
|
+
git_commit **commit,
|
626
|
+
git_repository *repo,
|
627
|
+
size_t index)
|
628
|
+
{
|
629
|
+
git_reference *stash = NULL;
|
630
|
+
git_reflog *reflog = NULL;
|
631
|
+
int error;
|
632
|
+
size_t max;
|
633
|
+
const git_reflog_entry *entry;
|
634
|
+
|
635
|
+
if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0)
|
636
|
+
goto cleanup;
|
637
|
+
|
638
|
+
if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0)
|
639
|
+
goto cleanup;
|
640
|
+
|
641
|
+
max = git_reflog_entrycount(reflog);
|
642
|
+
if (!max || index > max - 1) {
|
643
|
+
error = GIT_ENOTFOUND;
|
644
|
+
git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
|
645
|
+
goto cleanup;
|
646
|
+
}
|
647
|
+
|
648
|
+
entry = git_reflog_entry_byindex(reflog, index);
|
649
|
+
if ((error = git_commit_lookup(commit, repo, git_reflog_entry_id_new(entry))) < 0)
|
650
|
+
goto cleanup;
|
651
|
+
|
652
|
+
cleanup:
|
653
|
+
git_reference_free(stash);
|
654
|
+
git_reflog_free(reflog);
|
655
|
+
return error;
|
656
|
+
}
|
657
|
+
|
658
|
+
static int retrieve_stash_trees(
|
659
|
+
git_tree **out_stash_tree,
|
660
|
+
git_tree **out_base_tree,
|
661
|
+
git_tree **out_index_tree,
|
662
|
+
git_tree **out_index_parent_tree,
|
663
|
+
git_tree **out_untracked_tree,
|
664
|
+
git_commit *stash_commit)
|
665
|
+
{
|
666
|
+
git_tree *stash_tree = NULL;
|
667
|
+
git_commit *base_commit = NULL;
|
668
|
+
git_tree *base_tree = NULL;
|
669
|
+
git_commit *index_commit = NULL;
|
670
|
+
git_tree *index_tree = NULL;
|
671
|
+
git_commit *index_parent_commit = NULL;
|
672
|
+
git_tree *index_parent_tree = NULL;
|
673
|
+
git_commit *untracked_commit = NULL;
|
674
|
+
git_tree *untracked_tree = NULL;
|
675
|
+
int error;
|
676
|
+
|
677
|
+
if ((error = git_commit_tree(&stash_tree, stash_commit)) < 0)
|
678
|
+
goto cleanup;
|
679
|
+
|
680
|
+
if ((error = git_commit_parent(&base_commit, stash_commit, 0)) < 0)
|
681
|
+
goto cleanup;
|
682
|
+
if ((error = git_commit_tree(&base_tree, base_commit)) < 0)
|
683
|
+
goto cleanup;
|
684
|
+
|
685
|
+
if ((error = git_commit_parent(&index_commit, stash_commit, 1)) < 0)
|
686
|
+
goto cleanup;
|
687
|
+
if ((error = git_commit_tree(&index_tree, index_commit)) < 0)
|
688
|
+
goto cleanup;
|
689
|
+
|
690
|
+
if ((error = git_commit_parent(&index_parent_commit, index_commit, 0)) < 0)
|
691
|
+
goto cleanup;
|
692
|
+
if ((error = git_commit_tree(&index_parent_tree, index_parent_commit)) < 0)
|
693
|
+
goto cleanup;
|
694
|
+
|
695
|
+
if (git_commit_parentcount(stash_commit) == 3) {
|
696
|
+
if ((error = git_commit_parent(&untracked_commit, stash_commit, 2)) < 0)
|
697
|
+
goto cleanup;
|
698
|
+
if ((error = git_commit_tree(&untracked_tree, untracked_commit)) < 0)
|
699
|
+
goto cleanup;
|
700
|
+
}
|
701
|
+
|
702
|
+
*out_stash_tree = stash_tree;
|
703
|
+
*out_base_tree = base_tree;
|
704
|
+
*out_index_tree = index_tree;
|
705
|
+
*out_index_parent_tree = index_parent_tree;
|
706
|
+
*out_untracked_tree = untracked_tree;
|
707
|
+
|
708
|
+
cleanup:
|
709
|
+
git_commit_free(untracked_commit);
|
710
|
+
git_commit_free(index_parent_commit);
|
711
|
+
git_commit_free(index_commit);
|
712
|
+
git_commit_free(base_commit);
|
713
|
+
if (error < 0) {
|
714
|
+
git_tree_free(stash_tree);
|
715
|
+
git_tree_free(base_tree);
|
716
|
+
git_tree_free(index_tree);
|
717
|
+
git_tree_free(index_parent_tree);
|
718
|
+
git_tree_free(untracked_tree);
|
719
|
+
}
|
720
|
+
return error;
|
721
|
+
}
|
722
|
+
|
723
|
+
static int merge_indexes(
|
724
|
+
git_index **out,
|
725
|
+
git_repository *repo,
|
726
|
+
git_tree *ancestor_tree,
|
727
|
+
git_index *ours_index,
|
728
|
+
git_index *theirs_index)
|
729
|
+
{
|
730
|
+
git_iterator *ancestor = NULL, *ours = NULL, *theirs = NULL;
|
731
|
+
git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
|
732
|
+
int error;
|
733
|
+
|
734
|
+
iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE;
|
735
|
+
|
736
|
+
if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, &iter_opts)) < 0 ||
|
737
|
+
(error = git_iterator_for_index(&ours, repo, ours_index, &iter_opts)) < 0 ||
|
738
|
+
(error = git_iterator_for_index(&theirs, repo, theirs_index, &iter_opts)) < 0)
|
739
|
+
goto done;
|
740
|
+
|
741
|
+
error = git_merge__iterators(out, repo, ancestor, ours, theirs, NULL);
|
742
|
+
|
743
|
+
done:
|
744
|
+
git_iterator_free(ancestor);
|
745
|
+
git_iterator_free(ours);
|
746
|
+
git_iterator_free(theirs);
|
747
|
+
return error;
|
748
|
+
}
|
749
|
+
|
750
|
+
static int merge_index_and_tree(
|
751
|
+
git_index **out,
|
752
|
+
git_repository *repo,
|
753
|
+
git_tree *ancestor_tree,
|
754
|
+
git_index *ours_index,
|
755
|
+
git_tree *theirs_tree)
|
756
|
+
{
|
757
|
+
git_iterator *ancestor = NULL, *ours = NULL, *theirs = NULL;
|
758
|
+
git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
|
759
|
+
int error;
|
760
|
+
|
761
|
+
iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE;
|
762
|
+
|
763
|
+
if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, &iter_opts)) < 0 ||
|
764
|
+
(error = git_iterator_for_index(&ours, repo, ours_index, &iter_opts)) < 0 ||
|
765
|
+
(error = git_iterator_for_tree(&theirs, theirs_tree, &iter_opts)) < 0)
|
766
|
+
goto done;
|
767
|
+
|
768
|
+
error = git_merge__iterators(out, repo, ancestor, ours, theirs, NULL);
|
769
|
+
|
770
|
+
done:
|
771
|
+
git_iterator_free(ancestor);
|
772
|
+
git_iterator_free(ours);
|
773
|
+
git_iterator_free(theirs);
|
774
|
+
return error;
|
775
|
+
}
|
776
|
+
|
777
|
+
static void normalize_apply_options(
|
778
|
+
git_stash_apply_options *opts,
|
779
|
+
const git_stash_apply_options *given_apply_opts)
|
780
|
+
{
|
781
|
+
if (given_apply_opts != NULL) {
|
782
|
+
memcpy(opts, given_apply_opts, sizeof(git_stash_apply_options));
|
783
|
+
} else {
|
784
|
+
git_stash_apply_options default_apply_opts = GIT_STASH_APPLY_OPTIONS_INIT;
|
785
|
+
memcpy(opts, &default_apply_opts, sizeof(git_stash_apply_options));
|
786
|
+
}
|
787
|
+
|
788
|
+
opts->checkout_options.checkout_strategy |= GIT_CHECKOUT_NO_REFRESH;
|
789
|
+
|
790
|
+
if (!opts->checkout_options.our_label)
|
791
|
+
opts->checkout_options.our_label = "Updated upstream";
|
792
|
+
|
793
|
+
if (!opts->checkout_options.their_label)
|
794
|
+
opts->checkout_options.their_label = "Stashed changes";
|
795
|
+
}
|
796
|
+
|
797
|
+
int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
|
798
|
+
{
|
799
|
+
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
800
|
+
opts, version, git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_INIT);
|
801
|
+
return 0;
|
802
|
+
}
|
803
|
+
|
804
|
+
#define NOTIFY_PROGRESS(opts, progress_type) \
|
805
|
+
do { \
|
806
|
+
if ((opts).progress_cb && \
|
807
|
+
(error = (opts).progress_cb((progress_type), (opts).progress_payload))) { \
|
808
|
+
error = (error < 0) ? error : -1; \
|
809
|
+
goto cleanup; \
|
810
|
+
} \
|
811
|
+
} while(false);
|
812
|
+
|
813
|
+
static int ensure_clean_index(git_repository *repo, git_index *index)
|
814
|
+
{
|
815
|
+
git_tree *head_tree = NULL;
|
816
|
+
git_diff *index_diff = NULL;
|
817
|
+
int error = 0;
|
818
|
+
|
819
|
+
if ((error = git_repository_head_tree(&head_tree, repo)) < 0 ||
|
820
|
+
(error = git_diff_tree_to_index(
|
821
|
+
&index_diff, repo, head_tree, index, NULL)) < 0)
|
822
|
+
goto done;
|
823
|
+
|
824
|
+
if (git_diff_num_deltas(index_diff) > 0) {
|
825
|
+
git_error_set(GIT_ERROR_STASH, "%" PRIuZ " uncommitted changes exist in the index",
|
826
|
+
git_diff_num_deltas(index_diff));
|
827
|
+
error = GIT_EUNCOMMITTED;
|
828
|
+
}
|
829
|
+
|
830
|
+
done:
|
831
|
+
git_diff_free(index_diff);
|
832
|
+
git_tree_free(head_tree);
|
833
|
+
return error;
|
834
|
+
}
|
835
|
+
|
836
|
+
static int stage_new_file(const git_index_entry **entries, void *data)
|
837
|
+
{
|
838
|
+
git_index *index = data;
|
839
|
+
|
840
|
+
if(entries[0] == NULL)
|
841
|
+
return git_index_add(index, entries[1]);
|
842
|
+
else
|
843
|
+
return git_index_add(index, entries[0]);
|
844
|
+
}
|
845
|
+
|
846
|
+
static int stage_new_files(
|
847
|
+
git_index **out,
|
848
|
+
git_tree *parent_tree,
|
849
|
+
git_tree *tree)
|
850
|
+
{
|
851
|
+
git_iterator *iterators[2] = { NULL, NULL };
|
852
|
+
git_iterator_options iterator_options = GIT_ITERATOR_OPTIONS_INIT;
|
853
|
+
git_index *index = NULL;
|
854
|
+
int error;
|
855
|
+
|
856
|
+
if ((error = git_index_new(&index)) < 0 ||
|
857
|
+
(error = git_iterator_for_tree(
|
858
|
+
&iterators[0], parent_tree, &iterator_options)) < 0 ||
|
859
|
+
(error = git_iterator_for_tree(
|
860
|
+
&iterators[1], tree, &iterator_options)) < 0)
|
861
|
+
goto done;
|
862
|
+
|
863
|
+
error = git_iterator_walk(iterators, 2, stage_new_file, index);
|
864
|
+
|
865
|
+
done:
|
866
|
+
if (error < 0)
|
867
|
+
git_index_free(index);
|
868
|
+
else
|
869
|
+
*out = index;
|
870
|
+
|
871
|
+
git_iterator_free(iterators[0]);
|
872
|
+
git_iterator_free(iterators[1]);
|
873
|
+
|
874
|
+
return error;
|
875
|
+
}
|
876
|
+
|
877
|
+
int git_stash_apply(
|
878
|
+
git_repository *repo,
|
879
|
+
size_t index,
|
880
|
+
const git_stash_apply_options *given_opts)
|
881
|
+
{
|
882
|
+
git_stash_apply_options opts;
|
883
|
+
unsigned int checkout_strategy;
|
884
|
+
git_commit *stash_commit = NULL;
|
885
|
+
git_tree *stash_tree = NULL;
|
886
|
+
git_tree *stash_parent_tree = NULL;
|
887
|
+
git_tree *index_tree = NULL;
|
888
|
+
git_tree *index_parent_tree = NULL;
|
889
|
+
git_tree *untracked_tree = NULL;
|
890
|
+
git_index *stash_adds = NULL;
|
891
|
+
git_index *repo_index = NULL;
|
892
|
+
git_index *unstashed_index = NULL;
|
893
|
+
git_index *modified_index = NULL;
|
894
|
+
git_index *untracked_index = NULL;
|
895
|
+
int error;
|
896
|
+
|
897
|
+
GIT_ERROR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options");
|
898
|
+
|
899
|
+
normalize_apply_options(&opts, given_opts);
|
900
|
+
checkout_strategy = opts.checkout_options.checkout_strategy;
|
901
|
+
|
902
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_LOADING_STASH);
|
903
|
+
|
904
|
+
/* Retrieve commit corresponding to the given stash */
|
905
|
+
if ((error = retrieve_stash_commit(&stash_commit, repo, index)) < 0)
|
906
|
+
goto cleanup;
|
907
|
+
|
908
|
+
/* Retrieve all trees in the stash */
|
909
|
+
if ((error = retrieve_stash_trees(
|
910
|
+
&stash_tree, &stash_parent_tree, &index_tree,
|
911
|
+
&index_parent_tree, &untracked_tree, stash_commit)) < 0)
|
912
|
+
goto cleanup;
|
913
|
+
|
914
|
+
/* Load repo index */
|
915
|
+
if ((error = git_repository_index(&repo_index, repo)) < 0)
|
916
|
+
goto cleanup;
|
917
|
+
|
918
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX);
|
919
|
+
|
920
|
+
if ((error = ensure_clean_index(repo, repo_index)) < 0)
|
921
|
+
goto cleanup;
|
922
|
+
|
923
|
+
/* Restore index if required */
|
924
|
+
if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) &&
|
925
|
+
git_oid_cmp(git_tree_id(stash_parent_tree), git_tree_id(index_tree))) {
|
926
|
+
|
927
|
+
if ((error = merge_index_and_tree(
|
928
|
+
&unstashed_index, repo, index_parent_tree, repo_index, index_tree)) < 0)
|
929
|
+
goto cleanup;
|
930
|
+
|
931
|
+
if (git_index_has_conflicts(unstashed_index)) {
|
932
|
+
error = GIT_ECONFLICT;
|
933
|
+
goto cleanup;
|
934
|
+
}
|
935
|
+
|
936
|
+
/* Otherwise, stage any new files in the stash tree. (Note: their
|
937
|
+
* previously unstaged contents are staged, not the previously staged.)
|
938
|
+
*/
|
939
|
+
} else if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) == 0) {
|
940
|
+
if ((error = stage_new_files(
|
941
|
+
&stash_adds, stash_parent_tree, stash_tree)) < 0 ||
|
942
|
+
(error = merge_indexes(
|
943
|
+
&unstashed_index, repo, stash_parent_tree, repo_index, stash_adds)) < 0)
|
944
|
+
goto cleanup;
|
945
|
+
}
|
946
|
+
|
947
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED);
|
948
|
+
|
949
|
+
/* Restore modified files in workdir */
|
950
|
+
if ((error = merge_index_and_tree(
|
951
|
+
&modified_index, repo, stash_parent_tree, repo_index, stash_tree)) < 0)
|
952
|
+
goto cleanup;
|
953
|
+
|
954
|
+
/* If applicable, restore untracked / ignored files in workdir */
|
955
|
+
if (untracked_tree) {
|
956
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED);
|
957
|
+
|
958
|
+
if ((error = merge_index_and_tree(&untracked_index, repo, NULL, repo_index, untracked_tree)) < 0)
|
959
|
+
goto cleanup;
|
960
|
+
}
|
961
|
+
|
962
|
+
if (untracked_index) {
|
963
|
+
opts.checkout_options.checkout_strategy |= GIT_CHECKOUT_DONT_UPDATE_INDEX;
|
964
|
+
|
965
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED);
|
966
|
+
|
967
|
+
if ((error = git_checkout_index(repo, untracked_index, &opts.checkout_options)) < 0)
|
968
|
+
goto cleanup;
|
969
|
+
|
970
|
+
opts.checkout_options.checkout_strategy = checkout_strategy;
|
971
|
+
}
|
972
|
+
|
973
|
+
|
974
|
+
/* If there are conflicts in the modified index, then we need to actually
|
975
|
+
* check that out as the repo's index. Otherwise, we don't update the
|
976
|
+
* index.
|
977
|
+
*/
|
978
|
+
|
979
|
+
if (!git_index_has_conflicts(modified_index))
|
980
|
+
opts.checkout_options.checkout_strategy |= GIT_CHECKOUT_DONT_UPDATE_INDEX;
|
981
|
+
|
982
|
+
/* Check out the modified index using the existing repo index as baseline,
|
983
|
+
* so that existing modifications in the index can be rewritten even when
|
984
|
+
* checking out safely.
|
985
|
+
*/
|
986
|
+
opts.checkout_options.baseline_index = repo_index;
|
987
|
+
|
988
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED);
|
989
|
+
|
990
|
+
if ((error = git_checkout_index(repo, modified_index, &opts.checkout_options)) < 0)
|
991
|
+
goto cleanup;
|
992
|
+
|
993
|
+
if (unstashed_index && !git_index_has_conflicts(modified_index)) {
|
994
|
+
if ((error = git_index_read_index(repo_index, unstashed_index)) < 0)
|
995
|
+
goto cleanup;
|
996
|
+
}
|
997
|
+
|
998
|
+
NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_DONE);
|
999
|
+
|
1000
|
+
error = git_index_write(repo_index);
|
1001
|
+
|
1002
|
+
cleanup:
|
1003
|
+
git_index_free(untracked_index);
|
1004
|
+
git_index_free(modified_index);
|
1005
|
+
git_index_free(unstashed_index);
|
1006
|
+
git_index_free(stash_adds);
|
1007
|
+
git_index_free(repo_index);
|
1008
|
+
git_tree_free(untracked_tree);
|
1009
|
+
git_tree_free(index_parent_tree);
|
1010
|
+
git_tree_free(index_tree);
|
1011
|
+
git_tree_free(stash_parent_tree);
|
1012
|
+
git_tree_free(stash_tree);
|
1013
|
+
git_commit_free(stash_commit);
|
1014
|
+
return error;
|
1015
|
+
}
|
1016
|
+
|
579
1017
|
int git_stash_foreach(
|
580
1018
|
git_repository *repo,
|
581
1019
|
git_stash_cb callback,
|
@@ -589,25 +1027,27 @@ int git_stash_foreach(
|
|
589
1027
|
|
590
1028
|
error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE);
|
591
1029
|
if (error == GIT_ENOTFOUND) {
|
592
|
-
|
1030
|
+
git_error_clear();
|
593
1031
|
return 0;
|
594
1032
|
}
|
595
1033
|
if (error < 0)
|
596
1034
|
goto cleanup;
|
597
1035
|
|
598
|
-
if ((error = git_reflog_read(&reflog,
|
1036
|
+
if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0)
|
599
1037
|
goto cleanup;
|
600
1038
|
|
601
1039
|
max = git_reflog_entrycount(reflog);
|
602
1040
|
for (i = 0; i < max; i++) {
|
603
1041
|
entry = git_reflog_entry_byindex(reflog, i);
|
604
1042
|
|
605
|
-
|
1043
|
+
error = callback(i,
|
606
1044
|
git_reflog_entry_message(entry),
|
607
1045
|
git_reflog_entry_id_new(entry),
|
608
|
-
payload)
|
609
|
-
|
610
|
-
|
1046
|
+
payload);
|
1047
|
+
|
1048
|
+
if (error) {
|
1049
|
+
git_error_set_after_callback(error);
|
1050
|
+
break;
|
611
1051
|
}
|
612
1052
|
}
|
613
1053
|
|
@@ -621,46 +1061,67 @@ int git_stash_drop(
|
|
621
1061
|
git_repository *repo,
|
622
1062
|
size_t index)
|
623
1063
|
{
|
624
|
-
|
1064
|
+
git_transaction *tx;
|
1065
|
+
git_reference *stash = NULL;
|
625
1066
|
git_reflog *reflog = NULL;
|
626
1067
|
size_t max;
|
627
1068
|
int error;
|
628
1069
|
|
629
|
-
if ((error =
|
1070
|
+
if ((error = git_transaction_new(&tx, repo)) < 0)
|
630
1071
|
return error;
|
631
1072
|
|
632
|
-
if ((error =
|
1073
|
+
if ((error = git_transaction_lock_ref(tx, GIT_REFS_STASH_FILE)) < 0)
|
1074
|
+
goto cleanup;
|
1075
|
+
|
1076
|
+
if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0)
|
1077
|
+
goto cleanup;
|
1078
|
+
|
1079
|
+
if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0)
|
633
1080
|
goto cleanup;
|
634
1081
|
|
635
1082
|
max = git_reflog_entrycount(reflog);
|
636
1083
|
|
637
|
-
if (index > max - 1) {
|
1084
|
+
if (!max || index > max - 1) {
|
638
1085
|
error = GIT_ENOTFOUND;
|
639
|
-
|
1086
|
+
git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
|
640
1087
|
goto cleanup;
|
641
1088
|
}
|
642
1089
|
|
643
1090
|
if ((error = git_reflog_drop(reflog, index, true)) < 0)
|
644
1091
|
goto cleanup;
|
645
1092
|
|
646
|
-
if ((error =
|
1093
|
+
if ((error = git_transaction_set_reflog(tx, GIT_REFS_STASH_FILE, reflog)) < 0)
|
647
1094
|
goto cleanup;
|
648
1095
|
|
649
1096
|
if (max == 1) {
|
650
|
-
error =
|
651
|
-
|
652
|
-
stash = NULL;
|
1097
|
+
if ((error = git_transaction_remove(tx, GIT_REFS_STASH_FILE)) < 0)
|
1098
|
+
goto cleanup;
|
653
1099
|
} else if (index == 0) {
|
654
1100
|
const git_reflog_entry *entry;
|
655
1101
|
|
656
1102
|
entry = git_reflog_entry_byindex(reflog, 0);
|
657
|
-
|
658
|
-
|
659
|
-
error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, &entry->oid_cur, 1);
|
1103
|
+
if ((error = git_transaction_set_target(tx, GIT_REFS_STASH_FILE, &entry->oid_cur, NULL, NULL)) < 0)
|
1104
|
+
goto cleanup;
|
660
1105
|
}
|
661
1106
|
|
1107
|
+
error = git_transaction_commit(tx);
|
1108
|
+
|
662
1109
|
cleanup:
|
663
1110
|
git_reference_free(stash);
|
1111
|
+
git_transaction_free(tx);
|
664
1112
|
git_reflog_free(reflog);
|
665
1113
|
return error;
|
666
1114
|
}
|
1115
|
+
|
1116
|
+
int git_stash_pop(
|
1117
|
+
git_repository *repo,
|
1118
|
+
size_t index,
|
1119
|
+
const git_stash_apply_options *options)
|
1120
|
+
{
|
1121
|
+
int error;
|
1122
|
+
|
1123
|
+
if ((error = git_stash_apply(repo, index, options)) < 0)
|
1124
|
+
return error;
|
1125
|
+
|
1126
|
+
return git_stash_drop(repo, index);
|
1127
|
+
}
|