Bah, this broke a test (I must have missed that fact somehow). I'll see if it can be fixed. -John On Sat, Jul 23, 2011 at 7:17 AM, John Szakmeister <john@xxxxxxxxxxxxxxx> wrote: > git-submodule.sh was incorrectly assuming that the only reason > 'git add --dry-run' would fail was due to ignored paths. However, > when trying add a submodule inside of another, the original error > message was being lost, and leaves a user confused. Simply > re-run 'git add --dry-run' and allow the error message emitted. > > Signed-off-by: John Szakmeister <john@xxxxxxxxxxxxxxx> > --- > git-submodule.sh | 7 +------ > 1 files changed, 1 insertions(+), 6 deletions(-) > > diff --git a/git-submodule.sh b/git-submodule.sh > index bc1d3fa..056abd4 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -223,12 +223,7 @@ cmd_add() > > if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1 > then > - ( > - eval_gettext "The following path is ignored by one of your .gitignore files: > -\$path > -Use -f if you really want to add it." && > - echo > - ) >&2 > + git add --dry-run --ignore-missing "$path" > exit 1 > fi > > -- > 1.7.6.134.gcf13f6.dirty > > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html