diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 01:30:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 01:30:43 -0700 |
| commit | ced38ea252cb8b0315f4d2a54648b11c6c090657 (patch) | |
| tree | 0c398a6bf408bb47fafc65c918b24b1bafeed7b1 /builtin-branch.c | |
| parent | 77e6f5bc1009aa588a3b2235758bf5be13b23d85 (diff) | |
| parent | d79073922fcb8c8a0bd57112817a2154f1ed05c1 (diff) | |
| download | git-ced38ea252cb8b0315f4d2a54648b11c6c090657.tar.gz git-ced38ea252cb8b0315f4d2a54648b11c6c090657.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: tighten dependency for git.{html,txt}
Makefile: iconv() on Darwin has the old interface
t5300-pack-object.sh: portability issue using /usr/bin/stat
t3200-branch.sh: small language nit
usermanual.txt: some capitalization nits
Make builtin-branch.c handle the git config file
rename_ref(): only print a warning when config-file update fails
Distinguish branches by more than case in tests.
Avoid composing too long "References" header.
cvsimport: Improve formating consistency
cvsimport: Reorder options in documentation for better understanding
cvsimport: Improve usage error reporting
cvsimport: Improve documentation of CVSROOT and CVS module determination
cvsimport: sync usage lines with existing options
Conflicts:
Documentation/Makefile
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index a4494ee33..740828505 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -493,6 +493,7 @@ static void rename_branch(const char *oldname, const char *newname, int force) { char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100]; unsigned char sha1[20]; + char oldsection[PATH_MAX], newsection[PATH_MAX]; if (!oldname) die("cannot rename the current branch while not on any."); @@ -521,6 +522,11 @@ static void rename_branch(const char *oldname, const char *newname, int force) /* no need to pass logmsg here as HEAD didn't really move */ if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL)) die("Branch renamed to %s, but HEAD is not updated!", newname); + + snprintf(oldsection, sizeof(oldsection), "branch.%s", oldref + 11); + snprintf(newsection, sizeof(newsection), "branch.%s", newref + 11); + if (git_config_rename_section(oldsection, newsection) < 0) + die("Branch is renamed, but update of config-file failed"); } int cmd_branch(int argc, const char **argv, const char *prefix) |