archive-tar: unindent write_tar_entry by one level

It's used to be

if (!sha1) {
...
} else if (!path) {
...
} else {
...
}

Now that the first two blocks are no-op. We can remove the if/else
skeleton and put the else block back by one indent level.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index 1727ab90ae1e9fd9584681de956038e34715b135..6c8a0bd3bf524a962d18395e710a67e0358451b2 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -170,40 +170,34 @@ static int write_tar_entry(struct archiver_args *args,
 
        memset(&header, 0, sizeof(header));
 
 
        memset(&header, 0, sizeof(header));
 

-       if (!sha1) {
-               die("BUG: sha1 == NULL is not supported");
-       } else if (!path) {
-               die("BUG: path == NULL is not supported");
+       if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
+               *header.typeflag = TYPEFLAG_DIR;
+               mode = (mode | 0777) & ~tar_umask;
+       } else if (S_ISLNK(mode)) {
+               *header.typeflag = TYPEFLAG_LNK;
+               mode |= 0777;
+       } else if (S_ISREG(mode)) {
+               *header.typeflag = TYPEFLAG_REG;
+               mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;

        } else {
        } else {

-               if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
-                       *header.typeflag = TYPEFLAG_DIR;
-                       mode = (mode | 0777) & ~tar_umask;
-               } else if (S_ISLNK(mode)) {
-                       *header.typeflag = TYPEFLAG_LNK;
-                       mode |= 0777;
-               } else if (S_ISREG(mode)) {
-                       *header.typeflag = TYPEFLAG_REG;
-                       mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
+               return error("unsupported file mode: 0%o (SHA1: %s)",
+                            mode, sha1_to_hex(sha1));
+       }
+       if (pathlen > sizeof(header.name)) {
+               size_t plen = get_path_prefix(path, pathlen,
+                                             sizeof(header.prefix));
+               size_t rest = pathlen - plen - 1;
+               if (plen > 0 && rest <= sizeof(header.name)) {
+                       memcpy(header.prefix, path, plen);
+                               memcpy(header.name, path + plen + 1, rest);

                } else {
                } else {

-                       return error("unsupported file mode: 0%o (SHA1: %s)",
-                                       mode, sha1_to_hex(sha1));
+                       sprintf(header.name, "%s.data",
+                               sha1_to_hex(sha1));
+                       strbuf_append_ext_header(&ext_header, "path",
+                                                path, pathlen);

                }
                }

-               if (pathlen > sizeof(header.name)) {
-                       size_t plen = get_path_prefix(path, pathlen,
-                                       sizeof(header.prefix));
-                       size_t rest = pathlen - plen - 1;
-                       if (plen > 0 && rest <= sizeof(header.name)) {
-                               memcpy(header.prefix, path, plen);
-                               memcpy(header.name, path + plen + 1, rest);
-                       } else {
-                               sprintf(header.name, "%s.data",
-                                       sha1_to_hex(sha1));
-                               strbuf_append_ext_header(&ext_header, "path",
-                                               path, pathlen);
-                       }
-               } else
-                       memcpy(header.name, path, pathlen);
-       }
+       } else
+               memcpy(header.name, path, pathlen);

 
        if (S_ISLNK(mode) && buffer) {
                if (size > sizeof(header.linkname)) {
 
        if (S_ISLNK(mode) && buffer) {
                if (size > sizeof(header.linkname)) {