summaryrefslogtreecommitdiff
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-13 20:18:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-13 20:18:27 (GMT)
commit50b26f561298c58029d408f4b0c5bca20b7806a3 (patch)
tree9a5440e459fc8e88c75cf633c8150bd6c47704b1 /builtin/commit-tree.c
parent17130a704620c0e5455ef0f362f8d0f40758d1ea (diff)
parent6694856153f85cb552cc92d75ddeabf5bdec4f20 (diff)
downloadgit-50b26f561298c58029d408f4b0c5bca20b7806a3.zip
git-50b26f561298c58029d408f4b0c5bca20b7806a3.tar.gz
git-50b26f561298c58029d408f4b0c5bca20b7806a3.tar.bz2
Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
"git commit-tree" plumbing command required the user to always sign its result when the user sets the commit.gpgsign configuration variable, which was an ancient mistake. Rework "git rebase" that relied on this mistake so that it reads commit.gpgsign and pass (or not pass) the -S option to "git commit-tree" to keep the end-user expectation the same, while teaching "git commit-tree" to ignore the configuration variable. This will stop requiring the users to sign commit objects used internally as an implementation detail of "git stash". * jc/commit-tree-ignore-commit-gpgsign: commit-tree: do not pay attention to commit.gpgsign
Diffstat (limited to 'builtin/commit-tree.c')
-rw-r--r--builtin/commit-tree.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 3feeffe..8a674bc 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -33,10 +33,6 @@ static int commit_tree_config(const char *var, const char *value, void *cb)
int status = git_gpg_config(var, value, NULL);
if (status)
return status;
- if (!strcmp(var, "commit.gpgsign")) {
- sign_commit = git_config_bool(var, value) ? "" : NULL;
- return 0;
- }
return git_default_config(var, value, cb);
}