Skip to content

Commit

Permalink
ls-files and read-tree need core.filemode
Browse files Browse the repository at this point in the history
ls-files.c and read-tree.c miss the default configuration, in
particular the filemode=false part.  The recent +x bit flip made me
notice that, because git-merge refused to merge anything saying that
git-pull.sh is not up to date.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
raalkml authored and Junio C Hamano committed Nov 8, 2005
1 parent 76bca9d commit 39b4ac9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions ls-files.c
Expand Up @@ -570,6 +570,7 @@ int main(int argc, const char **argv)
prefix = setup_git_directory();
if (prefix)
prefix_offset = strlen(prefix);
git_config(git_default_config);

for (i = 1; i < argc; i++) {
const char *arg = argv[i];
Expand Down
2 changes: 2 additions & 0 deletions read-tree.c
Expand Up @@ -633,6 +633,8 @@ int main(int argc, char **argv)
if (newfd < 0)
die("unable to create new cachefile");

git_config(git_default_config);

merge = 0;
reset = 0;
for (i = 1; i < argc; i++) {
Expand Down

0 comments on commit 39b4ac9

Please sign in to comment.