diff options
| author | Geert Bosch <bosch@gnat.com> | 2007-04-05 10:20:55 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 14:53:22 -0700 |
| commit | 01ebb9dc8846af729c13d5d8c9d939a6d1159240 (patch) | |
| tree | 9f845d14b1dae32599e4c03f96dc5d257a477c89 | |
| parent | 1e31fbe24fac983b0057af39824f73d65dba6502 (diff) | |
| download | git-01ebb9dc8846af729c13d5d8c9d939a6d1159240.tar.gz git-01ebb9dc8846af729c13d5d8c9d939a6d1159240.tar.xz | |
Fix renaming branch without config file
Make git_config_rename_section return success if no config file
exists. Otherwise, renaming a branch would abort, leaving the
repository in an inconsistent state.
[jc: test]
Signed-off-by: Geert Bosch <bosch@gnat.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | config.c | 5 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -916,8 +916,8 @@ int git_config_rename_section(const char *old_name, const char *new_name) } if (!(config_file = fopen(config_filename, "rb"))) { - ret = error("Could not open config file!"); - goto out; + /* no config file means nothing to rename, no error */ + goto unlock_and_out; } while (fgets(buf, sizeof(buf), config_file)) { @@ -951,6 +951,7 @@ int git_config_rename_section(const char *old_name, const char *new_name) } } fclose(config_file); + unlock_and_out: if (close(out_fd) || commit_lock_file(lock) < 0) ret = error("Cannot commit config file!"); out: diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 9558bdb63..ce2c5f41f 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -83,6 +83,15 @@ test_expect_failure \ git-branch r && git-branch -m q r/q' +mv .git/config .git/config-saved + +test_expect_success 'git branch -m q Q without config should succeed' ' + git-branch -m q Q && + git-branch -m Q q +' + +mv .git/config-saved .git/config + git-config branch.s/s.dummy Hello test_expect_success \ |