OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'maint-2.6' into maint-2.7
[git-core/git.git]
/
test-match-trees.c
diff --git
a/test-match-trees.c
b/test-match-trees.c
index
2ef725e
..
109f03e
100644
(file)
--- a/
test-match-trees.c
+++ b/
test-match-trees.c
@@
-17,7
+17,7
@@
int main(int ac, char **av)
if (!two)
die("not a tree-ish %s", av[2]);
- shift_tree(one->object.
sha1, two->object.sha1
, shifted, -1);
+ shift_tree(one->object.
oid.hash, two->object.oid.hash
, shifted, -1);
printf("shifted: %s\n", sha1_to_hex(shifted));
exit(0);