delta/git.git, branch bp/commit-p-editor github.com: git/git.git run-command: mark run_hook_with_custom_index as deprecated 2014-03-18T18:26:12+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-18T10:00:56+00:00 b549be0da7ff9075c0b3de14c1d5d03583ca8d2d Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge hook tests: fix and update tests 2014-03-18T18:26:06+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-18T10:00:55+00:00 1fc4f97d570c97471202ff561c7e3697e2faee6a - update 'no editor' hook test and add 'editor' hook test - make sure the tree is reset to a clean state after running a test (using test_when_finished) so later tests are not impacted Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
- update 'no editor' hook test and add 'editor' hook test
- make sure the tree is reset to a clean state after running a test
  (using test_when_finished) so later tests are not impacted

Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge: fix GIT_EDITOR override for commit hook 2014-03-18T18:25:38+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-18T10:00:54+00:00 0a3beb0e2e29ca7a3c33a10112424650706edb5f Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the editor is going to be called (e.g. with "merge -e"). Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the
editor is going to be called (e.g. with "merge -e").

Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit: fix patch hunk editing with "commit -p -m" 2014-03-18T18:25:12+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-18T10:00:53+00:00 15048f8a9ace23df67161746ca76b4f46114deee Don't change git environment: move the GIT_EDITOR=":" override to the hook command subprocess, like it's already done for GIT_INDEX_FILE. Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Don't change git environment: move the GIT_EDITOR=":" override to the
hook command subprocess, like it's already done for GIT_INDEX_FILE.

Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
test patch hunk editing with "commit -p -m" 2014-03-18T18:24:39+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-18T10:00:52+00:00 91c9c8692056c0553c6ea9239ccd46f7f3dbd877 Add (failing) tests: with commit changing the environment to let hooks know that no editor will be used (by setting GIT_EDITOR to ":"), the "edit hunk" functionality does not work (no editor is launched and the whole hunk is committed). Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Add (failing) tests: with commit changing the environment to let hooks
know that no editor will be used (by setting GIT_EDITOR to ":"), the
"edit hunk" functionality does not work (no editor is launched and the
whole hunk is committed).

Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge hook tests: use 'test_must_fail' instead of '!' 2014-03-11T20:57:43+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-10T18:49:32+00:00 b7ae14148fc44223b4ffaff5ccbf3227a0af8f3c Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge hook tests: fix missing '&&' in test 2014-03-11T20:57:39+00:00 Benoit Pierre benoit.pierre@gmail.com 2014-03-10T18:49:31+00:00 3219bad94422084184987c9660361f3245d69f04 Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.9.0 2014-02-14T19:35:04+00:00 Junio C Hamano gitster@pobox.com 2014-02-14T19:35:04+00:00 5f95c9f850b19b368c43ae399cc831b17a26a5ac Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
release notes: typo fixes 2014-02-14T19:22:56+00:00 Michael J Gruber git@drmicha.warpmail.net 2014-02-13T10:35:08+00:00 9c8ce7397bac108f83d77dfd96786edb28937511 Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 1.8.5.5 2014-02-13T21:42:26+00:00 Junio C Hamano gitster@pobox.com 2014-02-13T21:42:26+00:00 475c52b7ac59bb5d2f955bd68c069622d9575d50 Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>