Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Eric Sunshine
On Tue, Feb 13, 2018 at 2:27 AM, Johannes Sixt wrote: > Am 12.02.2018 um 04:15 schrieb Eric Sunshine: >> + echo $_z40 $(git rev-parse HEAD) 1 && >> + echo $(pwd)/gumby > > $(pwd) is here and in the other tests correct. $PWD would be wrong on > Windows.

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Johannes Sixt
Am 12.02.2018 um 04:15 schrieb Eric Sunshine: --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -454,20 +454,29 @@ post_checkout_hook () { test_when_finished "rm -f .git/hooks/post-checkout" && mkdir -p .git/hooks && write_script .git/hooks/post-checkout

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Eric Sunshine
On Mon, Feb 12, 2018 at 11:42 PM, Eric Sunshine wrote: > So, either approach works: removing GIT_DIR or using "worktree add"'s > existing GIT_DIR and GIT_WORK_TREE. I favor the latter since it is > consistent with how "worktree add" invokes other command already and, >

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Eric Sunshine
On Mon, Feb 12, 2018 at 3:01 PM, Lars Schneider wrote: >> On 12 Feb 2018, at 04:15, Eric Sunshine wrote: >> Fix this by changing to the new worktree's directory before running >> the hook, and adjust the tests to verify that the hook is indeed

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Eric Sunshine
On Mon, Feb 12, 2018 at 2:37 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> Fix this by changing to the new worktree's directory before running >> the hook, and adjust the tests to verify that the hook is indeed run >> within the correct

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Lars Schneider
> On 12 Feb 2018, at 04:15, Eric Sunshine wrote: > > Although "git worktree add" learned to run the 'post-checkout' hook in > ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it > neglects to change to the directory of the newly-created worktree > before

Re: [PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-12 Thread Junio C Hamano
Eric Sunshine writes: > Although "git worktree add" learned to run the 'post-checkout' hook in > ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it > neglects to change to the directory of the newly-created worktree > before running the hook. Instead, the

[PATCH 2/2] worktree: add: change to new worktree directory before running hook

2018-02-11 Thread Eric Sunshine
Although "git worktree add" learned to run the 'post-checkout' hook in ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it neglects to change to the directory of the newly-created worktree before running the hook. Instead, the hook is run within the directory from which the "git