We're relying on get fetch failing and set -e, but that doesn't work
if we parse nothing: In that case git fetch just fetches upstream and
succeed. Dave stumbled over this by feeding a .mbox with dos linefeeds
into dim.
v2: Use -z and return 1.
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: Dave Airlie <airl...@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
---
dim | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dim b/dim
index ec51e36b1269..1d78ca275c5d 100755
--- a/dim
+++ b/dim
@@ -901,7 +901,12 @@ function dim_apply_pull
pull_branch=$(sed -e '0,/[gG]it repository at:$/d' $file | head -n 2 |
tail -n 1)
- echo $pull_branch
+ if [[ -z "$pull_branch" ]] ; then
+ echoerr "no pull request found"
+ return 1
+ fi
+
+ echo Pulling $pull_branch ...
git fetch $pull_branch
for sha1 in $(git rev-list "HEAD..FETCH_HEAD" --no-merges) ; do
--
2.17.0
_______________________________________________
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
