{"id":2873,"date":"2021-01-06T17:15:24","date_gmt":"2021-01-06T08:15:24","guid":{"rendered":"https:\/\/github.blog\/jp\/?p=2873"},"modified":"2021-01-06T17:15:24","modified_gmt":"2021-01-06T08:15:24","slug":"commits-are-snapshots-not-diffs","status":"publish","type":"post","link":"https:\/\/github.blog\/jp\/2021-01-06-commits-are-snapshots-not-diffs\/","title":{"rendered":"\u30b3\u30df\u30c3\u30c8\u306f\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3067\u3042\u308a\u5dee\u5206\u3067\u306f\u306a\u3044"},"content":{"rendered":"

Git \u306f\u7d1b\u3089\u308f\u3057\u3044<\/a>\u3068\u3044\u3046\u8a55\u5224<\/a>\u3067\u3059\u3002\u7528\u8a9e\u3084\u8a00\u3044\u56de\u3057\u304c\u610f\u5473\u3059\u308b\u3082\u306e\u3068\u3001\u305d\u3053\u304b\u3089\u60f3\u50cf\u3059\u308b\u6319\u52d5\u304c\u9055\u3063\u3066\u30e6\u30fc\u30b6\u30fc\u304c\u6df7\u4e71\u3059\u308b\u3068\u8a00\u308f\u308c\u307e\u3059\u3002\u3053\u308c\u306f\u3001git cherry-pick<\/code>\u00a0\u3084\u00a0git rebase<\/code>\u00a0\u306e\u3088\u3046\u306a\u300c\u5c65\u6b74\u3092\u66f8\u304d\u63db\u3048\u308b\u300d\u30b3\u30de\u30f3\u30c9\u306b\u6700\u3082\u9855\u8457\u3067\u3059\u3002\u79c1\u306e\u7d4c\u9a13\u3067\u306f\u3001\u3053\u306e\u6df7\u4e71\u306e\u6839\u672c\u7684\u306a\u539f\u56e0\u306f\u3001\u30b3\u30df\u30c3\u30c8\u306f\u00a0\u5dee\u5206<\/em>\u00a0\u3067\u3042\u308a\u9806\u756a\u3092\u5165\u308c\u66ff\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u3068\u3044\u3046\u89e3\u91c8\u306b\u3042\u308a\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u30b3\u30df\u30c3\u30c8\u306f\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3067\u3042\u3063\u3066\u3001\u5dee\u5206\u3067\u306f\u3042\u308a\u307e\u305b\u3093!<\/strong><\/p>\n

Git \u304c\u30ea\u30dd\u30b8\u30c8\u30ea\u30c7\u30fc\u30bf\u3092\u3069\u306e\u3088\u3046\u306b\u4fdd\u5b58\u3057\u3066\u3044\u308b\u304b\u3092\u898b\u3066\u307f\u308b\u3068\u3001Git \u3092\u7406\u89e3\u3057\u3084\u3059\u304f\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30e2\u30c7\u30eb\u3092\u8abf\u3079\u305f\u5f8c\u306b\u3001\u3053\u306e\u65b0\u3057\u3044\u8996\u70b9\u304c\u00a0git cherry-pick<\/code>\u00a0\u3084\u00a0git rebase<\/code>\u00a0\u306e\u3088\u3046\u306a\u30b3\u30de\u30f3\u30c9\u3092\u7406\u89e3\u3059\u308b\u306e\u306b\u3069\u306e\u3088\u3046\u306b\u5f79\u7acb\u3064\u306e\u304b\u3092\u63a2\u3063\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n

\u672c\u5f53\u306b\u6df1\u304f<\/em>\u00a0\u6398\u308a\u4e0b\u3052\u305f\u3044\u306e\u3067\u3042\u308c\u3070\u3001Pro Git \u3068\u3044\u3046\u66f8\u7c4d\u306e Git Internals \u306e\u7ae0<\/a>\u3092\u8aad\u3080\u3068\u3044\u3044\u3067\u3057\u3087\u3046\u3002<\/p>\n

\u4eca\u56de\u306f\u4f8b\u3068\u3057\u3066\u00a0v2.29.2<\/code>\u00a0\u3067\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u305f\u00a0git\/git \u30ea\u30dd\u30b8\u30c8\u30ea<\/a>\u3092\u4f7f\u3044\u307e\u3059\u3002\u8a18\u4e8b\u3067\u7d39\u4ecb\u3059\u308b\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u306e\u4f8b\u306b\u5f93\u3063\u3066\u305c\u3072\u5b9f\u969b\u306b\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n

<\/a>\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 ID \u306f\u30cf\u30c3\u30b7\u30e5<\/h3>\n

Git \u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306b\u3064\u3044\u3066\u77e5\u3063\u3066\u304a\u304f\u3079\u304d\u6700\u3082\u91cd\u8981\u306a\u3053\u3068\u306f\u3001Git \u306f\u305d\u308c\u305e\u308c\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 ID (\u7565\u3057\u3066 OID) \u3067\u53c2\u7167\u3057\u3066\u3044\u308b\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u3053\u306e OID \u304c\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3078\u306e\u30e6\u30cb\u30fc\u30af\u306a\u540d\u524d\u3068\u306a\u308a\u307e\u3059\u3002\u3053\u308c\u3089\u306e OID \u3092\u8abf\u3079\u308b\u306b\u306f\u00a0git rev-parse <ref><\/code>\u00a0\u30b3\u30de\u30f3\u30c9<\/a>\u00a0\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002\u305d\u308c\u305e\u308c\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u57fa\u672c\u7684\u306b\u306f\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3067\u3042\u308a\u3001\u305d\u306e\u5185\u5bb9\u3092\u8abf\u3079\u308b\u306b\u306f\u00a0git cat-file -p <oid><\/code>\u00a0\u30b3\u30de\u30f3\u30c9<\/a>\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002<\/p>\n

\u307e\u305f\u3001\u3082\u3063\u3068\u77ed\u3044 16 \u9032\u6570\u306e\u6587\u5b57\u5217\u3067\u8868\u73fe\u3055\u308c\u305f OID \u306e\u65b9\u3092\u3088\u304f\u76ee\u306b\u3059\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u3053\u306e\u6587\u5b57\u5217\u306f\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u305f\u3060\u4e00\u3064\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304c\u6301\u3064 OID \u3068\u4e00\u81f4\u3059\u308b\u7701\u7565\u5f62\u3068\u3057\u3066\u5341\u5206\u306a\u9577\u3055\u306e\u3082\u306e\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3042\u307e\u308a\u306b\u3082\u77ed\u304f\u7701\u7565\u3057\u305f OID \u3092\u4f7f\u3063\u3066\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u578b\u3092\u8abf\u3079\u308b\u3068\u3001\u4e00\u81f4\u3059\u308b OID \u306e\u4e00\u89a7\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002<\/p>\n

\n
$ git cat-file -t e0c03<\/span>\r\nerror: short SHA1 e0c03 is ambiguous<\/span>\r\nhint: The candidates are:<\/span>\r\nhint:   e0c03f27484 commit 2016-10-26 - contrib\/buildsystems: ignore irrelevant files in Generators\/<\/span>\r\nhint:   e0c03653e72 tree<\/span>\r\nhint:   e0c03c3eecc blob<\/span>\r\nfatal: Not a valid object name e0c03<\/span><\/pre>\n<\/div>\n
blob<\/code>\u3001tree<\/code>\u3001commit<\/code>\u3068\u3044\u3046\u3053\u308c\u3089\u306e\u578b\u306f\u306a\u3093\u3067\u3057\u3087\u3046\u304b\uff1f\u9806\u306b\u8aac\u660e\u3057\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n
<\/a>\u30d6\u30ed\u30d6\u306f\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9<\/h3>\n
\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30e2\u30c7\u30eb\u306e\u4e00\u756a\u4e0b\u306b\u4f4d\u7f6e\u3059\u308b\u00a0\u30d6\u30ed\u30d6<\/strong>\u00a0\u306b\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u73fe\u5728\u306e\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u30d5\u30a1\u30a4\u30eb\u306e OID \u3092\u8abf\u3079\u308b\u306b\u306f\u3001\u00a0git rev-parse HEAD:<path><\/code>\u00a0\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002\u6b21\u306b\u3001\u00a0git cat-file -p <oid><\/code>\u00a0\u3092\u4f7f\u7528\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3092\u8abf\u3079\u307e\u3059\u3002<\/p>\n
\n
$ git rev-parse HEAD:README.md<\/span>\r\neb8115e6b04814f0c37146bbe3dbc35f3e8992e0<\/span>\r\n\r\n$ git cat-file -p eb8115e6b04814f0c37146bbe3dbc35f3e8992e0 |<\/span> head -n 8<\/span>\r\n[![Build status](https:\/\/github.com\/git\/git\/workflows\/CI\/PR\/badge.png)](https:\/\/github.com\/git\/git\/actions?query=branch%3Amaster+event%3Apush)<\/span>\r\n\r\nGit - fast, scalable, distributed revision control system<\/span>\r\n=========================================================<\/span>\r\n\r\nGit is a fast, scalable, distributed revision control system with an<\/span>\r\nunusually rich command set that provides both high-level operations<\/span>\r\nand full access to internals.<\/span><\/pre>\n<\/div>\n
\u30c7\u30a3\u30b9\u30af\u4e0a\u306e\u00a0README.md<\/code>\u00a0\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3059\u308b\u3068\u3001\u00a0git status<\/code>\u00a0\u306f\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u66f4\u65b0\u6642\u523b\u304c\u6700\u8fd1\u3067\u3042\u308b\u3053\u3068\u306b\u6c17\u4ed8\u304d\u3001\u305d\u306e\u5185\u5bb9\u306e\u30cf\u30c3\u30b7\u30e5\u3092\u8a08\u7b97\u3057\u307e\u3059\u3002\u3082\u3057\u5185\u5bb9\u304c\u73fe\u5728\u306e\u00a0HEAD:README.md<\/code>\u00a0\u306e OID \u3068\u4e00\u81f4\u3057\u306a\u3044\u5834\u5408\u306f\u3001\u00a0git status<\/code>\u00a0\u306f\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u3092 “modified on disk” \u3068\u8868\u793a\u3057\u307e\u3059\u3002\u3053\u306e\u3088\u3046\u306b\u3057\u3066\u3001\u73fe\u5728\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u304c\u00a0HEAD<\/code>\u00a0\u306e\u5185\u5bb9\u3068\u4e00\u81f4\u3057\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u78ba\u8a8d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n
<\/a>\u30c4\u30ea\u30fc\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea<\/h3>\n
\u30d6\u30ed\u30d6\u306b\u306f\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u304c\u3001\u30d5\u30a1\u30a4\u30eb\u540d\u306f\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u3053\u3068\u306b\u6ce8\u610f\u3057\u307e\u3057\u3087\u3046\uff01\u30d5\u30a1\u30a4\u30eb\u540d\u306f\u3001Git \u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u8868\u73fe\u3067\u3042\u308b\u00a0\u30c4\u30ea\u30fc<\/strong>\u00a0\u306b\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u30c4\u30ea\u30fc\u3068\u306f\u3001\u30d1\u30b9\u306e\u30a8\u30f3\u30c8\u30ea\u3092\u9806\u756a\u306b\u4e26\u3079\u305f\u3082\u306e\u3067\u3001\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u7a2e\u985e\u3084\u30d5\u30a1\u30a4\u30eb\u30e2\u30fc\u30c9\u3001\u305d\u3057\u3066\u305d\u306e\u30d1\u30b9\u306b\u3042\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e OID \u3092\u6301\u3061\u307e\u3059\u3002\u30b5\u30d6\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3082\u30c4\u30ea\u30fc\u3068\u3057\u3066\u8868\u73fe\u3055\u308c\u3001\u30c4\u30ea\u30fc\u306f\u4ed6\u306e\u30c4\u30ea\u30fc\u3092\u53c2\u7167\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n
\"\"<\/p>\n
\u3053\u308c\u3089\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304c\u3069\u306e\u3088\u3046\u306b\u95a2\u9023\u3057\u3066\u3044\u308b\u304b\u3092\u8996\u899a\u5316\u3059\u308b\u305f\u3081\u306b\u56f3\u3092\u4f7f\u3044\u307e\u3059\u3002\u30d6\u30ed\u30d6\u306f\u56db\u89d2\u3001\u30c4\u30ea\u30fc\u306f\u4e09\u89d2\u3092\u4f7f\u3063\u3066\u8868\u73fe\u3057\u307e\u3059\u3002<\/p>\n
\n
$ git rev-parse HEAD^{tree}<\/span>\r\n75130889f941eceb57c6ceb95c6f28dfc83b609c<\/span>\r\n\r\n$ git cat-file -p 75130889f941eceb57c6ceb95c6f28dfc83b609c  |<\/span> head -n 15<\/span>\r\n100644 blob c2f5fe385af1bbc161f6c010bdcf0048ab6671ed    .cirrus.yml<\/span>\r\n100644 blob c592dda681fecfaa6bf64fb3f539eafaf4123ed8    .clang-format<\/span>\r\n100644 blob f9d819623d832113014dd5d5366e8ee44ac9666a    .editorconfig<\/span>\r\n100644 blob b08a1416d86012134f823fe51443f498f4911909    .gitattributes<\/span>\r\n040000 tree fbe854556a4ae3d5897e7b92a3eb8636bb08f031    .github<\/span>\r\n100644 blob 6232d339247fae5fdaeffed77ae0bbe4176ab2de    .gitignore<\/span>\r\n100644 blob cbeebdab7a5e2c6afec338c3534930f569c90f63    .gitmodules<\/span>\r\n100644 blob bde7aba756ea74c3af562874ab5c81a829e43c83    .mailmap<\/span>\r\n100644 blob 05f3e3f8d79117c1d32bf5e433d0fd49de93125c    .travis.yml<\/span>\r\n100644 blob 5ba86d68459e61f87dae1332c7f2402860b4280c    .tsan-suppressions<\/span>\r\n100644 blob fc4645d5c08bd005238fc72cfa709495d8722e6a    CODE_OF_CONDUCT.md<\/span>\r\n100644 blob 536e55524db72bd2acf175208aef4f3dfc148d42    COPYING<\/span>\r\n040000 tree a58410edddbdd133cca6b3322bebe4fb37be93fa    Documentation<\/span>\r\n100755 blob ca6ccb49866c595c80718d167e40cfad1ee7f376    GIT-VERSION-GEN<\/span>\r\n100644 blob 9ba33e6a141a3906eb707dd11d1af4b0f8191a55    INSTALL<\/span><\/pre>\n<\/div>\n
\u30c4\u30ea\u30fc\u306f\u3001\u5404\u30b5\u30d6\u30a2\u30a4\u30c6\u30e0\u306e\u540d\u524d\u3092\u6301\u3061\u307e\u3059\u3002\u30c4\u30ea\u30fc\u306b\u306f\u3001Unix \u30d5\u30a1\u30a4\u30eb\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3001\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30bf\u30a4\u30d7\uff08blob<\/code>\u307e\u305f\u306ftree<\/code>\uff09\u3001\u5404\u30a8\u30f3\u30c8\u30ea\u306e OID \u306e\u60c5\u5831\u3082\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u4e0a\u8a18\u3067\u306f\u4e0a\u4f4d 15 \u30a8\u30f3\u30c8\u30ea\u3060\u3051\u306b\u7d5e\u3063\u3066\u3044\u307e\u3059\u304c\u3001\u00a0grep<\/code>\u00a0\u3092\u4f7f\u7528\u3057\u3066\u3053\u306e\u30c4\u30ea\u30fc\u306b\u5148\u307b\u3069\u306e\u30d6\u30ed\u30d6\u306e OID \u3092\u6307\u3059\u00a0README.md<\/code>\u00a0\u30a8\u30f3\u30c8\u30ea\u304c\u3042\u308b\u3053\u3068\u304c\u308f\u304b\u308a\u307e\u3059\u3002<\/p>\n
\n
$ git cat-file -p 75130889f941eceb57c6ceb95c6f28dfc83b609c |<\/span> grep README.md<\/span>\r\n100644 blob eb8115e6b04814f0c37146bbe3dbc35f3e8992e0    README.md<\/span><\/pre>\n<\/div>\n
\u30c4\u30ea\u30fc\u306f\u3001\u3053\u308c\u3089\u306e\u30d1\u30b9\u30a8\u30f3\u30c8\u30ea\u3092\u4f7f\u7528\u3057\u3066\u30d6\u30ed\u30d6\u3084\u4ed6\u306e\u30c4\u30ea\u30fc\u3092\u6307\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u3089\u306e\u95a2\u4fc2\u306f\u30d1\u30b9\u540d\u3068\u5bfe\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u304c\u3001\u56f3\u306b\u793a\u3059\u969b\u306f\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u30d1\u30b9\u540d\u3092\u7701\u7565\u3057\u307e\u3059\u3002<\/p>\n
\u30c4\u30ea\u30fc\u81ea\u4f53\u306f\u3001\u305d\u308c\u304c\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u3069\u3053\u306b\u5b58\u5728\u3059\u308b\u304b\u3092\u77e5\u308a\u307e\u305b\u3093\u3002\u305d\u306e\u5f79\u5272\u3092\u679c\u305f\u3059\u306e\u306f\u305d\u306e\u30c4\u30ea\u30fc\u3092\u53c2\u7167\u3057\u3066\u3044\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u3059\u3002\u00a0<ref>^{tree}<\/code>\u00a0\u3067\u53c2\u7167\u3055\u308c\u308b\u30c4\u30ea\u30fc\u306f\u3001\u7279\u5225\u306a\u30c4\u30ea\u30fc\u3001\u3064\u307e\u308a\u00a0\u30eb\u30fc\u30c8\u30c4\u30ea\u30fc<\/em>\u00a0\u3067\u3059\u3002\u3053\u306e\u6307\u5b9a\u65b9\u6cd5\u306f\uff08\u3053\u308c\u304b\u3089\u89e3\u8aac\u3059\u308b\uff09\u30b3\u30df\u30c3\u30c8\u304b\u3089\u306e\u7279\u5225\u306a\u30ea\u30f3\u30af\u306b\u57fa\u3065\u3044\u3066\u3044\u307e\u3059\u3002<\/p>\n
<\/a>\u30b3\u30df\u30c3\u30c8\u306f\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8<\/h3>\n
\u30b3\u30df\u30c3\u30c8<\/strong>\u00a0\u306f\u3042\u308b\u6642\u9593\u306b\u304a\u3051\u308b\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3067\u3059\u3002\u5404\u30b3\u30df\u30c3\u30c8\u306b\u306f\u3001\u305d\u306e\u6642\u70b9\u3067\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u72b6\u614b\u3092\u8868\u3059\u30eb\u30fc\u30c8\u30c4\u30ea\u30fc\u3078\u306e\u30dd\u30a4\u30f3\u30bf\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u306f\u3001\u4ee5\u524d\u306e\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306b\u5bfe\u5fdc\u3059\u308b\u89aa\u30b3\u30df\u30c3\u30c8\u306e\u30ea\u30b9\u30c8\u3092\u6301\u3061\u307e\u3059\u3002\u89aa\u306e\u306a\u3044\u30b3\u30df\u30c3\u30c8\u306f\u30eb\u30fc\u30c8\u30b3\u30df\u30c3\u30c8\u3067\u3042\u308a\u3001\u8907\u6570\u306e\u89aa\u3092\u6301\u3064\u30b3\u30df\u30c3\u30c8\u306f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3067\u3059\u3002\u30b3\u30df\u30c3\u30c8\u306b\u306f\u3001\u4f5c\u6210\u8005\u3084\u30b3\u30df\u30c3\u30bf\u30fc\uff08\u540d\u524d\u3001\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3001\u65e5\u4ed8\u3092\u542b\u3080\uff09\u3001\u304a\u3088\u3073\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u3044\u3063\u305f\u30e1\u30bf\u30c7\u30fc\u30bf\u3082\u542b\u307e\u308c\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306f\u3001\u30b3\u30df\u30c3\u30c8\u306e\u4f5c\u6210\u8005\u304c\u305d\u306e\u30b3\u30df\u30c3\u30c8\u306e\u76ee\u7684\u3092\u8aac\u660e\u3059\u308b\u305f\u3081\u306e\u3082\u306e\u3067\u3059\u3002<\/p>\n
\"\"<\/p>\n
\u305f\u3068\u3048\u3070\u3001Git \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u00a0v2.29.2<\/code>\u00a0\u3067\u306e\u30b3\u30df\u30c3\u30c8\u306f\u3001\u305d\u306e\u30ea\u30ea\u30fc\u30b9\u306b\u3064\u3044\u3066\u306e\u3082\u306e\u3067\u3001Git \u30e1\u30f3\u30c6\u30ca\u304c\u4f5c\u6210\u3057\u30b3\u30df\u30c3\u30c8\u3057\u305f\u3082\u306e\u3067\u3059\u3002<\/p>\n
\n
$ git rev-parse HEAD<\/span>\r\n898f80736c75878acc02dc55672317fcc0e0a5a6<\/span>\r\n\r\n\/c\/_git\/git ((v2.29.2))<\/span>\r\n$ git cat-file -p 898f80736c75878acc02dc55672317fcc0e0a5a6<\/span>\r\ntree 75130889f941eceb57c6ceb95c6f28dfc83b609c<\/span>\r\nparent a94bce62b99be35f2ee2b4c98f97c222e7dd9d82<\/span>\r\nauthor Junio C Hamano <gitster@pobox.com> 1604006649 -0700<\/span>\r\ncommitter Junio C Hamano <gitster@pobox.com> 1604006649 -0700<\/span>\r\n\r\nGit 2.29.2<\/span>\r\n\r\nSigned-off-by: Junio C Hamano <gitster@pobox.com><\/span><\/pre>\n<\/div>\n
git log<\/code>\u00a0\u306e\u5c65\u6b74\u3092\u3082\u3046\u5c11\u3057\u898b\u3066\u307f\u308b\u3068\u3001\u305d\u306e\u30b3\u30df\u30c3\u30c8\u3068\u305d\u306e\u89aa\u3068\u306e\u9593\u306e\u5909\u66f4\u306b\u3064\u3044\u3066\u3001\u3088\u308a\u8aac\u660e\u7684\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n
\n
$ git cat-file -p 16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef<\/span>\r\ntree d0e42501b1cf65395e91e22e74f75fc5caa0286e<\/span>\r\nparent 56706dba33f5d4457395c651cf1cd033c6c03c7a<\/span>\r\nauthor Jeff King &lt;peff@peff.net&gt; 1603436979 -0400<\/span>\r\ncommitter Junio C Hamano &lt;gitster@pobox.com&gt; 1603466719 -0700<\/span>\r\n\r\nam: fix broken email with --committer-date-is-author-date<\/span>\r\n\r\nCommit e8cbe2118a (am: stop exporting GIT_COMMITTER_DATE, 2020-08-17)<\/span>\r\nrewrote the code for setting the committer date to use fmt_ident(),<\/span>\r\nrather than setting an environment variable and letting commit_tree()<\/span>\r\nhandle it. But it introduced two bugs:<\/span>\r\n\r\n- we use the author email string instead of the committer email<\/span>\r\n\r\n- when parsing the committer ident, we used the wrong variable to<\/span>\r\ncompute the length of the email, resulting in it always being a<\/span>\r\nzero-length string<\/span>\r\n\r\nThis commit fixes both, which causes our test of this option via the<\/span>\r\nrebase \"apply\" backend to now succeed.<\/span>\r\n\r\nSigned-off-by: Jeff King &lt;peff@peff.net&gt; Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;<\/span><\/pre>\n<\/div>\n
\u79c1\u305f\u3061\u306e\u56f3\u3067\u306f\u3001\u30b3\u30df\u30c3\u30c8\u3092\u8868\u3059\u305f\u3081\u306b\u5186\u3092\u4f7f\u3044\u307e\u3059\u3002\u5fa9\u7fd2\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n