[PATCH 1/6 RESEND] cogito: remove use of xargs -r, a non-portable GNU extension
From: Bryan Larsen <hidden>
Date: 2016-06-15 22:42:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Remove usage of xargs -r, a non-portable gnu extension. Resent with nasty bug fixed. Signed-off-by: Bryan Larsen <redacted> --- cg-add | 6 +++--- cg-init | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cg-add b/cg-add
--- a/cg-add
+++ b/cg-add@@ -25,8 +25,6 @@ USAGE="cg-add [-N] FILE..." . ${COGITO_LIB}cg-Xlib -[ "$1" ] || usage - infoonly= while optparse; do if optparse -N; then
@@ -36,6 +34,8 @@ while optparse; do fi done +[ "$ARGS" ] || usage + TMPFILE=$(mktemp -t gitadd.XXXXXX) || exit 1 find "${ARGS[@]}" -type f -print0 > $TMPFILE || { die "not all files exist, nothing added"
@@ -43,6 +43,6 @@ find "${ARGS[@]}" -type f -print0 > $TMP } cat $TMPFILE | tr '\0' '\n' | sed 's/^/Adding file /' -cat $TMPFILE | xargs -0r git-update-cache --add ${infoonly} -- +cat $TMPFILE | xargs -0 git-update-cache --add ${infoonly} -- rm $TMPFILE
diff --git a/cg-init b/cg-init
--- a/cg-init
+++ b/cg-init@@ -55,7 +55,7 @@ if [ "$uri" ]; then echo "Cloned (origin $uri available as branch \"origin\")" else git-read-tree # Seed the dircache - find * \( -type f -o -type l \) -print0 | xargs -0r cg-add ${infoonly} + [ "`ls`" ] && find * \( -type f -o -type l \) -print0 | xargs -0 cg-add ${infoonly} cg-commit -C -m"Initial commit" -E ${infoonly} fi