diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 15:31:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 16:20:47 (GMT) |
| commit | 13931236b9ee2895a98ffdbdacbd0f895956d8a8 (patch) | |
| tree | 88613be74b32ddbc8c42f4b0eec10d616ff846e2 /t/t3409-rebase-preserve-merges.sh | |
| parent | 29b9a66f285f602ad67362ccbe2c6bfaac769f54 (diff) | |
| download | git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.zip git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.gz git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.bz2 | |
Change incorrect "remote branch" to "remote tracking branch" in C code
(Just like we did for documentation already)
In the process, we change "non-remote branch" to "branch outside the
refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch".
The new formulation actually corresponds to how the code detects this
case (i.e. prefixcmp(refname, "refs/remotes")).
Also, we use 'remote-tracking branch' in generated merge messages (by
merge an fmt-merge-msg).
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 74161a4..19341e5 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -72,7 +72,7 @@ test_expect_success 'rebase -p fakes interactive rebase' ' git fetch && git rebase -p origin/topic && test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) && - test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote branch " | wc -l) + test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote-tracking branch " | wc -l) ) ' |