[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a8791a0c8c5c7e49f6e661a2889dffc544281293
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

a8791a0 by João Valverde (joao.valverde@xxxxxxxxxxxxxxxxxx):

    make-version: Don't emit one common warning to stderr
    
    git rev-parse @{upstream} will (obviously) fail if there is no
    upstream set for the current branch. This is fairly common and
    not problematic. Don't emit an error message to stderr when it
    fails.
    
    Change-Id: I4989fb19b25fefff83335061151e360c78652e88
    Reviewed-on: https://code.wireshark.org/review/14151
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: João Valverde <j@xxxxxx>
    (cherry picked from commit d679d1137d884e651b214d8b6e3fb8af2972ad46)
    Reviewed-on: https://code.wireshark.org/review/14959
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  2e7a59e   make-version: Silence one diagnostic message with a verbose option
    adds  a8791a0   make-version: Don't emit one common warning to stderr


Summary of changes:
 make-version.pl |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)