|
|
|
@ -223,12 +223,9 @@ cmd_add()
@@ -223,12 +223,9 @@ 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: |
|
|
|
|
eval_gettextln "The following path is ignored by one of your .gitignore files: |
|
|
|
|
\$path |
|
|
|
|
Use -f if you really want to add it." && |
|
|
|
|
echo |
|
|
|
|
) >&2 |
|
|
|
|
Use -f if you really want to add it." >&2 |
|
|
|
|
exit 1 |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
@ -237,7 +234,7 @@ Use -f if you really want to add it." &&
@@ -237,7 +234,7 @@ Use -f if you really want to add it." &&
|
|
|
|
|
then |
|
|
|
|
if test -d "$path"/.git -o -f "$path"/.git |
|
|
|
|
then |
|
|
|
|
eval_gettext "Adding existing repo at '\$path' to the index"; echo |
|
|
|
|
eval_gettextln "Adding existing repo at '\$path' to the index" |
|
|
|
|
else |
|
|
|
|
die "$(eval_gettext "'\$path' already exists and is not a valid git repo")" |
|
|
|
|
fi |
|
|
|
@ -696,10 +693,7 @@ cmd_summary() {
@@ -696,10 +693,7 @@ cmd_summary() {
|
|
|
|
|
;; # removed |
|
|
|
|
*) |
|
|
|
|
# unexpected type |
|
|
|
|
( |
|
|
|
|
eval_gettext "unexpected mode \$mod_dst" && |
|
|
|
|
echo |
|
|
|
|
) >&2 |
|
|
|
|
eval_gettextln "unexpected mode \$mod_dst" >&2 |
|
|
|
|
continue ;; |
|
|
|
|
esac |
|
|
|
|
fi |
|
|
|
@ -786,9 +780,9 @@ cmd_summary() {
@@ -786,9 +780,9 @@ cmd_summary() {
|
|
|
|
|
done | |
|
|
|
|
if test -n "$for_status"; then |
|
|
|
|
if [ -n "$files" ]; then |
|
|
|
|
gettext "# Submodules changed but not updated:"; echo |
|
|
|
|
gettextln "# Submodules changed but not updated:" |
|
|
|
|
else |
|
|
|
|
gettext "# Submodule changes to be committed:"; echo |
|
|
|
|
gettextln "# Submodule changes to be committed:" |
|
|
|
|
fi |
|
|
|
|
echo "#" |
|
|
|
|
sed -e 's|^|# |' -e 's|^# $|#|' |
|
|
|
|