diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:11 -0700 |
| commit | 9abf65d23ce8700c290fa4f7d834a10ec5b3e327 (patch) | |
| tree | 8a378ca3c195c00c4f43a30ea89f3c12d844bf38 /builtin/gc.c | |
| parent | b2273d06033e5989ca30a72492ca894d0416354f (diff) | |
| parent | b549be0da7ff9075c0b3de14c1d5d03583ca8d2d (diff) | |
| download | git-9abf65d23ce8700c290fa4f7d834a10ec5b3e327.tar.gz | |
Merge branch 'bp/commit-p-editor'
When it is not necessary to edit a commit log message (e.g. "git
commit -m" is given a message without specifying "-e"), we used to
disable the spawning of the editor by overriding GIT_EDITOR, but
this means all the uses of the editor, other than to edit the
commit log message, are also affected.
* 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/gc.c')
| -rw-r--r-- | builtin/gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 63d400bcb2..11cf295515 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -184,7 +184,7 @@ static int need_to_gc(void) else if (!too_many_loose_objects()) return 0; - if (run_hook(NULL, "pre-auto-gc", NULL)) + if (run_hook_le(NULL, "pre-auto-gc", NULL)) return 0; return 1; } |