diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 16:46:05 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-08 00:47:01 +0000 |
| commit | 8d7b6001bb62c823b814b91ee858ff1ee48bad99 (patch) | |
| tree | f66bc81e9285e8f87514216dc90ef6f88f197ee7 /make-version.pl | |
| parent | f966980937abd4899a9c43329041bb00798ab18e (diff) | |
"origin" appears to be a safer bet than "@{upstream}".
Change-Id: Icd00c62d9b908771bf2b73b8e5b49d519570ff8b
Reviewed-on: https://code.wireshark.org/review/142
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make-version.pl b/make-version.pl index 5060cd6ebc..a0c88d939c 100755 --- a/make-version.pl +++ b/make-version.pl @@ -141,7 +141,7 @@ sub read_repo_info { # A small ugly hash: git rev-parse --short HEAD # 1ddc838 # - # The upstream branch path: git rev-parse --abbrev-ref --symbolic-full-name @{upstream} + # The upstream branch path: git rev-parse --abbrev-ref --symbolic-full-name origin # origin/master-1.8 # # A version description: git describe --tags --dirty @@ -185,7 +185,7 @@ sub read_repo_info { } # Probably not quite what we're looking for - chomp($line = qx{git --git-dir=$srcdir/.git rev-parse --abbrev-ref --symbolic-full-name \@\{upstream\}}); + chomp($line = qx{git --git-dir=$srcdir/.git rev-parse --abbrev-ref --symbolic-full-name origin}); if ($? == 0 && length($line) > 1) { $repo_branch = basename($line); } |