mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 09:13:37 +02:00
pgit.sh: Beautify logging
Log to stderr and add some ASCII-art around the output. Also, add a --porcelain option to allow more stable output parsing. Subsequently, use that option in make targets parsing the output, notably make diff and make git-show-xxx. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
0ca51e16ee
commit
27bf98f747
2 changed files with 46 additions and 10 deletions
|
|
@ -305,7 +305,7 @@ pull-all: purge git-get git-pull-all
|
|||
touch pull.done
|
||||
|
||||
diff-all diff: $(SSH_WRAPPER_SH)
|
||||
$(PGIT_SH) diff
|
||||
$(PGIT_SH) --porcelain diff
|
||||
|
||||
get-official: git-get-official
|
||||
get-maintainer: git-get-maintainer
|
||||
|
|
@ -321,10 +321,10 @@ git-push-all: $(SSH_WRAPPER_SH)
|
|||
$(PGIT_SH) push $(PGIT_SH_OPTS_NETWORK) --all --recurse-submodules=on-demand
|
||||
|
||||
git-diff: $(SSH_WRAPPER_SH)
|
||||
$(PGIT_SH) diff
|
||||
$(PGIT_SH) --porcelain diff
|
||||
|
||||
git-short-diff: $(SSH_WRAPPER_SH)
|
||||
$(PGIT_SH) diff --shortstat
|
||||
$(PGIT_SH) --porcelain diff --shortstat
|
||||
|
||||
git-status:
|
||||
$(PGIT_SH) status -uno
|
||||
|
|
@ -349,7 +349,7 @@ git-get-%: $(SSH_WRAPPER_SH)
|
|||
$(PGIT_SH_GET) $(PGIT_SH_OPTS_NETWORK) --refspec "$*:master:current-branch"
|
||||
|
||||
git-show-non-master-branches:
|
||||
$(Q)$(PGIT_SH) branch 2>&1 | \
|
||||
$(Q)$(PGIT_SH) --porcelain branch 2>&1 | \
|
||||
sed '/^#\|^*/!d; s/.*git -C //; s/ *branch *//; s/ *\* *//' | \
|
||||
while read p; do \
|
||||
read b ;\
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue