diff options
Diffstat (limited to 'src/branch.h')
-rw-r--r-- | src/branch.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/branch.h b/src/branch.h index d0e5abc8b..d02f2af0d 100644 --- a/src/branch.h +++ b/src/branch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 the libgit2 contributors + * Copyright (C) the libgit2 contributors. All rights reserved. * * This file is part of libgit2, distributed under the GNU GPL v2 with * a Linking Exception. For full terms see the included COPYING file. @@ -7,11 +7,11 @@ #ifndef INCLUDE_branch_h__ #define INCLUDE_branch_h__ -#include "git2/branch.h" +#include "buffer.h" -struct git_branch { - char *remote; /* TODO: Make this a git_remote */ - char *merge; -}; +int git_branch_upstream__name( + git_buf *tracking_name, + git_repository *repo, + const char *canonical_branch_name); #endif |