Invoking from newly created subdirectory fails

[uu1101]

The following test case shows the issue. Note that the commit_file function has been updated to be able to create files in a directory.

commit_file() {
    local filename="$1"
    local dirname="$(dirname $filename)"
    test -d $dirname || mkdir -p $dirname
    echo "$2" > $filename &&
    git add -f $filename &&
    git commit -q -m "commit $filename"
}

write_script .git/EDITOR <<\EOF &&
#!/bin/sh
cat > "$1" <<EOM
base master
merge branch1
merge branch2
merge branch3
merge branch4
EOM
EOF

test_expect_success 'invoking from new subfolder should not fail' '
    git checkout -b branch4 master &&
    commit_file dir4/branch4 branch4 &&
    GIT_EDITOR=.git/EDITOR git reintegrate --edit pu &&
    git reintegrate --rebuild pu &&
    git checkout branch4 &&
    cd dir4 &&
    git reintegrate --rebuild pu
'

What should the solution look like? Should

• git-reintegrate cds into the working dir's root before integrating. But, should it try to return to the directory it was in? What happens when it does not exist in the integrated commit?
• git- reintegrate should not proceed unless invoked from the working dir's root.

[felipec]

I'm not entirely sure. I think the second option is bet: run on the top level directory.

[uu1101]

Hello,

Glad to see you back. Yes, what about the following?

diff --git i/git-reintegrate w/git-reintegrate
index 44bf054..39121f7 100755
--- i/git-reintegrate
+++ w/git-reintegrate
@@ -687,6 +687,9 @@ $autocontinue = true

 opts.parse

+$git_cdup = %x[git rev-parse --show-cdup].chomp
+die "You need to run this command from the toplevel of the working tree." unless $git_cdup.empty?
+
 $git_dir = %x[git rev-parse --git-dir].chomp

 $state_dir = "#{$git_dir}/integration"
diff --git i/test/reintegrate.t w/test/reintegrate.t
index 41dddd0..b260dbd 100755
--- i/test/reintegrate.t
+++ w/test/reintegrate.t
@@ -206,14 +206,14 @@ merge branch4
 EOM
 EOF

-test_expect_success 'invoking from new subfolder should not fail' '
+test_expect_success 'invoking from subfolder should fail' '
    git checkout -b branch4 master &&
    commit_file dir4/branch4 branch4 &&
    GIT_EDITOR=.git/EDITOR git reintegrate --edit pu &&
    git reintegrate --rebuild pu &&
    git checkout branch4 &&
    cd dir4 &&
-   git reintegrate --rebuild pu
+   test_must_fail git reintegrate --rebuild pu
 '

 test_done

[felipec]

Done. I didn't add the test, but I checked it. Fixed in 094ddf9.