Git development
 help / color / mirror / Atom feed
From: Alex Riesen <raa.lkml@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>
Subject: make update-index --chmod work with multiple files and --stdin
Date: Sat, 22 Apr 2006 22:46:42 +0200	[thread overview]
Message-ID: <20060422204642.GA7676@steel.home> (raw)

I had a project where lots of files were "accidentally" marked +x, and
doing plain "git-update-index --chmod=-x" for each file was too slow.
Besides, it's somewhat inconsistent, that --chmod does work only for
one subsequent file.

---

Yes, windows again.

 update-index.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

5c7b9c2d187f36ba8b5632d2125f2bd19abb3564
diff --git a/update-index.c b/update-index.c
index 1efac27..c3c2000 100644
--- a/update-index.c
+++ b/update-index.c
@@ -350,6 +350,7 @@ static int chmod_path(int flip, const ch
 		return -1;
 	}
 	active_cache_changed = 1;
+	report("chmod %cx '%s'", flip, path);
 	return 0;
 }
 
@@ -478,6 +479,7 @@ int main(int argc, const char **argv)
 	int read_from_stdin = 0;
 	const char *prefix = setup_git_directory();
 	int prefix_length = prefix ? strlen(prefix) : 0;
+	char chmod_mode = 0;
 
 	git_config(git_default_config);
 
@@ -544,8 +546,7 @@ int main(int argc, const char **argv)
 			    !strcmp(path, "--chmod=+x")) {
 				if (argc <= i+1)
 					die("git-update-index: %s <path>", path);
-				if (chmod_path(path[8], argv[++i]))
-					die("git-update-index: %s cannot chmod %s", path, argv[i]);
+				chmod_mode = path[8];
 				continue;
 			}
 			if (!strcmp(path, "--assume-unchanged")) {
@@ -594,6 +595,11 @@ int main(int argc, const char **argv)
 			die("unknown option %s", path);
 		}
 		update_one(path, prefix, prefix_length);
+		if ( chmod_mode ) {
+			if (chmod_path(chmod_mode, path))
+				die("git-update-index: cannot chmod %cx %s",
+				    chmod_mode, path);
+		}
 	}
 	if (read_from_stdin) {
 		struct strbuf buf;
@@ -608,6 +614,12 @@ int main(int argc, const char **argv)
 			else
 				path_name = buf.buf;
 			update_one(path_name, prefix, prefix_length);
+			if ( chmod_mode ) {
+				const char *p = prefix_path(prefix, prefix_length, path_name);
+				if (chmod_path(chmod_mode, p))
+					die("git-update-index: cannot chmod %cx %s",
+					    chmod_mode, p);
+			}
 			if (path_name != buf.buf)
 				free(path_name);
 		}
-- 
1.3.0.gc2941

             reply	other threads:[~2006-04-22 20:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-22 20:46 Alex Riesen [this message]
2006-04-23  0:54 ` make update-index --chmod work with multiple files and --stdin Junio C Hamano
2006-04-23  7:01   ` Alex Riesen
2006-04-23  7:08   ` Alex Riesen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060422204642.GA7676@steel.home \
    --to=raa.lkml@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox