Skip to content
/ git Public
forked from git/git

Commit

Permalink
Remove useless uses of cat, and replace with filename arguments
Browse files Browse the repository at this point in the history
Replace uses of cat that do nothing but writing the contents of
a single file to another command via pipe.

[jc: Original patch from Josh was somewhat buggy and rewrote
"cat $file | wc -l" to "wc -l $file", but this one should be Ok.]

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
joshtriplett authored and gitster committed Jul 14, 2007
1 parent bdecd9d commit 9d6f220
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion git-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ then
tree=$(GIT_INDEX_FILE="$TMP_INDEX" git write-tree) &&
rm -f "$TMP_INDEX"
fi &&
commit=$(cat "$GIT_DIR"/COMMIT_MSG | git commit-tree $tree $PARENTS) &&
commit=$(git commit-tree $tree $PARENTS <"$GIT_DIR/COMMIT_MSG") &&
rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
git update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" &&
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
Expand Down
4 changes: 2 additions & 2 deletions git-filter-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ case "$filter_subdir" in
git rev-list --reverse --topo-order --default HEAD \
--parents --full-history "$@" -- "$filter_subdir"
esac > ../revs
commits=$(cat ../revs | wc -l | tr -d " ")
commits=$(wc -l <../revs | tr -d " ")

test $commits -eq 0 && die "Found nothing to rewrite"

Expand Down Expand Up @@ -241,7 +241,7 @@ case "$target_head" in
;;
*)
git update-ref refs/heads/"$dstbranch" $target_head
if [ $(cat ../map/$src_head | wc -l) -gt 1 ]; then
if [ $(wc -l <../map/$src_head) -gt 1 ]; then
echo "WARNING: Your commit filter caused the head commit to expand to several rewritten commits. Only the first such commit was recorded as the current $dstbranch head but you will need to resolve the situation now (probably by manually merging the other commits). These are all the commits:" >&2
sed 's/^/ /' ../map/$src_head >&2
ret=1
Expand Down
2 changes: 1 addition & 1 deletion git-ls-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ rsync://* )
(cd $tmpdir && find refs -type f) |
while read path
do
cat "$tmpdir/$path" | tr -d '\012'
tr -d '\012' <"$tmpdir/$path"
echo " $path"
done &&
rm -fr $tmpdir
Expand Down
7 changes: 4 additions & 3 deletions git-quiltimport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ tmp_info="$tmp_dir/info"
commit=$(git rev-parse HEAD)

mkdir $tmp_dir || exit 2
for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do
echo $patch_name
(cat $QUILT_PATCHES/$patch_name | git mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3
test -s .dotest/patch || {
git mailinfo "$tmp_msg" "$tmp_patch" \
<"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
test -s "$tmp_patch" || {
echo "Patch is empty. Was it split wrong?"
exit 1
}
Expand Down

0 comments on commit 9d6f220

Please sign in to comment.