Commit Diff

Commit:
aaffadfc4d5bebb9a32f26329336903d62aef712
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
write directory tree entry mode bits in the same way as Git does
Actions:
Patch | Tree
commit - ac5f2b268fa7b1547b452a2d2234c03a33a1edf6
commit + aaffadfc4d5bebb9a32f26329336903d62aef712
blob - de279d7ac5f87f20be6173c3f7932fb898e2254d
blob + 515477b2d9c25ebe5208ca3566e02cd34c00219d
--- lib/object_create.c
+++ lib/object_create.c
@@ -212,14 +212,14 @@ te_mode2str(char *buf, size_t len, mode_t te_mode)
 	 * For best compatibility we normalize the file/directory mode here.
 	 * Note that we do not support committing symlinks or submodules.
 	 */
-	if (S_ISREG(te_mode))
+	if (S_ISREG(te_mode)) {
 		mode = GOT_DEFAULT_FILE_MODE;
-	else if (S_ISDIR(te_mode))
-		mode = GOT_DEFAULT_DIR_MODE;
+		if (te_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
+			mode |= S_IXUSR | S_IXGRP | S_IXOTH;
+	} else if (S_ISDIR(te_mode))
+		mode = S_IFDIR; /* Git leaves all the other bits unset. */
 	else
 		return got_error(GOT_ERR_BAD_FILETYPE);
-	if (te_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
-		mode |= S_IXUSR | S_IXGRP | S_IXOTH;
 
 	ret = snprintf(buf, len, "%o ", mode);
 	if (ret == -1 || ret >= len)