| commit | 4d9dc2c57a36027a619c3b846cce5f02206d9a06 | |
| author | Justin Donnelly <justinrdonnelly@gmail.com> | |
| Sun, 27 Feb 2022 19:57:09 +0000 (27 19:57 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Mar 2022 20:07:26 +0000 (23 13:07 -0700) | ||
| tree | e7991fc0d55ac63c0b3459710e0045380dda6f3b | treesnapshot (tar.gz zip) |
| parent | dab1b7905d0b295f1acef9785bb2b9cbb0fdec84 | commitdiff |
git-prompt: rename `upstream` to `upstream_type`
In `__git_ps1_show_upstream` rename the variable `upstream` to
`upstream_type`. This allows `__git_ps1_show_upstream` to reference a
variable named `upstream` that is declared `local` in `__git_ps1`, which
calls `__git_ps1_show_upstream`.
Signed-off-by: Justin Donnelly <justinrdonnelly@gmail.com>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In `__git_ps1_show_upstream` rename the variable `upstream` to
`upstream_type`. This allows `__git_ps1_show_upstream` to reference a
variable named `upstream` that is declared `local` in `__git_ps1`, which
calls `__git_ps1_show_upstream`.
Signed-off-by: Justin Donnelly <justinrdonnelly@gmail.com>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/completion/git-prompt.sh | diffblobblamehistory |