diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-05-14 13:10:33 -0400 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-17 12:27:15 +0300 |
commit | a0e829ceae208d82e990f6ce8303011ed3550dd9 (patch) | |
tree | 1211eee55dd8314e41da287430be32dccf7e06d7 | |
parent | e64a5d121051844bfd744ad19f450a3945405630 (diff) |
dim: Fix create-branch dry run
Using --dry-run for git push on a non-existant branch (since the command
above doesn't actually create the branch) fails with:
error: src refspec topic/dim_test does not match any.
error: failed to push some refs to <remote>
So instead of using --dry-run for git push, just echo the command.
Changes in v2:
- Added comment (Daniel)
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rwxr-xr-x | dim | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1281,7 +1281,10 @@ function dim_create_branch fi $DRY git branch $branch $start - git push $DRY_RUN $remote +$branch --set-upstream + + # git push gives confusing error messages for non-existing branches, + # even with --dry-run, hence the even quieter $DRY + $DRY git push $remote +$branch --set-upstream cd $DIM_PREFIX/drm-rerere $DRY sed -i "s/^\() # DO NOT CHANGE THIS LINE\)$/\t\"$repo\t\t${branch//\//\\\/}\"\n\1/" $dim_integration_config |