mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 07:26:17 -04:00
Merge 9320a55a39 into 4cf28ec559
This commit is contained in:
commit
df6d214520
1
Makefile
1
Makefile
|
|
@ -76,6 +76,7 @@ install: check
|
|||
cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
|
||||
fi; \
|
||||
)
|
||||
rm -f $(TEMPFILE)
|
||||
@if [ -z "$(wildcard man/git-*.1)" ]; then \
|
||||
echo "WARNING: man pages not created, use 'make docs' (which requires 'ronn' ruby lib)"; \
|
||||
else \
|
||||
|
|
|
|||
|
|
@ -116,4 +116,9 @@ do
|
|||
printf "\033[00m\n"
|
||||
done
|
||||
|
||||
test -n "$DEBUG" && sort -nr "$DEBUG"
|
||||
rm -f "$MERGED_LOG"
|
||||
|
||||
if [[ -n "$DEBUG" ]] ; then
|
||||
sort -nr "$DEBUG" &&
|
||||
rm -f "$DEBUG"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -90,7 +90,10 @@ case "$all" in
|
|||
esac
|
||||
|
||||
r=$(xargs -r false < /dev/null > /dev/null 2>&1 && echo r)
|
||||
need_bak=$(sed -i s/hello/world/ "$(git_extra_mktemp)" > /dev/null 2>&1 || echo true)
|
||||
|
||||
tmp="$(git_extra_mktemp)"
|
||||
need_bak=$(sed -i s/hello/world/ "$tmp" > /dev/null 2>&1 || echo true)
|
||||
rm "$tmp"
|
||||
|
||||
if [ "$need_bak" ]; then
|
||||
command="git grep -lz '$search' $pathspec | xargs -0$r sed -i '' 's$sep$search$sep$replacement$sep$flags'"
|
||||
|
|
|
|||
Loading…
Reference in a new issue