diff options
| author | Patrick Steinhardt <ps@pks.im> | 2016-02-22 11:23:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 18:23:30 (GMT) |
| commit | 27852b2c5347ecd815301e668e7415509f1dae07 (patch) | |
| tree | 0ccba4584f589e70bda8479189e83c64537f88d0 /branch.h | |
| parent | b4c8aba659cb3264bcce3110d54bfcaab485408b (diff) | |
| download | git-27852b2c5347ecd815301e668e7415509f1dae07.zip git-27852b2c5347ecd815301e668e7415509f1dae07.tar.gz git-27852b2c5347ecd815301e668e7415509f1dae07.tar.bz2 | |
branch: report errors in tracking branch setup
When setting up a new tracking branch fails due to issues with
the configuration file we do not report any errors to the user
and pretend setting the tracking branch succeeded.
Setting up the tracking branch is handled by the
`install_branch_config` function. We do not want to simply die
there as the function is not only invoked when explicitly setting
upstream information with `git branch --set-upstream-to=`, but
also by `git push --set-upstream` and `git clone`. While it is
reasonable to die in the explict first case, we would lose
information in the latter two cases, so we only print the error
message but continue the program as usual.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.h')
| -rw-r--r-- | branch.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -43,9 +43,10 @@ void remove_branch_state(void); /* * Configure local branch "local" as downstream to branch "remote" * from remote "origin". Used by git branch --set-upstream. + * Returns 0 on success. */ #define BRANCH_CONFIG_VERBOSE 01 -extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote); +extern int install_branch_config(int flag, const char *local, const char *origin, const char *remote); /* * Read branch description |