diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:07:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:07:06 -0700 |
| commit | 86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9 (patch) | |
| tree | e3d0929979a9874bc9864e9d48bd6daec4abc110 /builtin/clone.c | |
| parent | 2f91649a9ba7c590be4f1ce66521b21e305fb7bc (diff) | |
| parent | b549be0da7ff9075c0b3de14c1d5d03583ca8d2d (diff) | |
| download | git-86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9.tar.gz git-86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9.tar.xz | |
Merge branch 'bp/commit-p-editor' into maint
* bp/commit-p-editor:
run-command: mark run_hook_with_custom_index as deprecated
merge hook tests: fix and update tests
merge: fix GIT_EDITOR override for commit hook
commit: fix patch hunk editing with "commit -p -m"
test patch hunk editing with "commit -p -m"
merge hook tests: use 'test_must_fail' instead of '!'
merge hook tests: fix missing '&&' in test
Diffstat (limited to 'builtin/clone.c')
| -rw-r--r-- | builtin/clone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 43e772ccd..9b3c04d91 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -660,8 +660,8 @@ static int checkout(void) commit_locked_index(lock_file)) die(_("unable to write new index file")); - err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1), - sha1_to_hex(sha1), "1", NULL); + err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), + sha1_to_hex(sha1), "1", NULL); if (!err && option_recursive) err = run_command_v_opt(argv_submodule, RUN_GIT_CMD); |