+test_expect_success 'Conflicting add/unknown file in subdir' '
+ stg status --reset &&
+ stg new foo -m foo &&
+ mkdir d &&
+ echo foo > d/test &&
+ git add d/test &&
+ stg refresh &&
+ stg pop &&
+ mkdir -p d &&
+ echo bar > d/test &&
+ command_error stg push foo &&
+ [ $(stg top) != "foo" ]
+'
+