Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx>
---
Johannes Schindelin venit, vidit, dixit 20.03.2009 10:29:
>
> Often, it is quite interesting to inspect the branch tracked by a given
> branch. This patch introduces a nice notation to get at the tracked
> branch: 'BEL<branch>' can be used to access that tracked branch.
>
> A special shortcut 'BEL' refers to the branch tracked by the current branch.
>
> Suggested by Pasky and Shawn.
>
> This patch extends the function introduced to handle the nth-last branch
> (via the {-<n>} notation); therefore that function name was renamed to
> something more general.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
I guess you beat me to it then, which is fine.
But haven't you seen my note about the failing test either? The code below
tests with branches which track local branches. merge and remote is set
for the branch in question ("tracking"), it's just that remote is ".".
It seems that the remote.c code does not set up merge info for these
branches.
<Goes to figure out how to enter BEL...>
Documentation/git-rev-parse.txt | 3 ++
t/t1506-rev-parse-track.sh | 60 +++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 0 deletions(-)
create mode 100755 t/t1506-rev-parse-track.sh
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 5ed2bc8..dafcfe8 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -215,6 +215,9 @@ when you run 'git-merge'.
* The special construct '@\{-<n>\}' means the <n>th branch checked out
before the current one.
+* A prefix '%', optionally followed by a branchname '<branch>', means the
+ branch tracked by '<branch>'. '<branch>' defaults to the current branch.
+
* A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'rev{caret}'
diff --git a/t/t1506-rev-parse-track.sh b/t/t1506-rev-parse-track.sh
new file mode 100755
index 0000000..1ca1dd6
--- /dev/null
+++ b/t/t1506-rev-parse-track.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+test_description='test % syntax'
+
+. ./test-lib.sh
+
+
+make_commit () {
+ echo "$1" > "$1" &&
+ git add "$1" &&
+ git commit -m "$1"
+}
+
+
+test_expect_success 'setup' '
+
+ make_commit 1 &&
+ git branch tracked &&
+ make_commit 2 &&
+ git checkout tracked &&
+ make_commit 3 &&
+ git checkout --track -b tracking tracked
+ make_commit 4 &&
+ git checkout master
+
+'
+
+# tracking tracks tracked
+# master does not track anything
+# all three point at different commits
+
+test_rev_equivalent () {
+
+ git rev-parse "$1" > expect &&
+ git rev-parse "$2" > output &&
+ test_cmp expect output
+
+}
+
+test_expect_success '%trackingbranch works' '
+ test_rev_equivalent tracked %tracking
+'
+
+test_expect_success '% works in tracking branch' '
+ git checkout tracking &&
+ test_rev_equivalent tracked %
+'
+
+test_expect_success '%nontrackingbranch fails' '
+ test_must_fail git rev-parse %tracked
+'
+
+test_expect_success '% fails in non-tracking branch' '
+ git checkout tracked &&
+ test_must_fail git rev-parse %
+'
+
+test_done
+
+
--
1.6.2.149.g6462
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
