summaryrefslogtreecommitdiff
path: root/hash-object.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-26 08:30:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-29 07:13:02 (GMT)
commit706fe6ae03e2c1452d59892944701c56237b903f (patch)
tree70c4b4e2135bc45fae5793f86c4600bf5be140a3 /hash-object.c
parentc3e9a6534c88767e2ad9126ed45598157c28d1f4 (diff)
downloadgit-706fe6ae03e2c1452d59892944701c56237b903f.zip
git-706fe6ae03e2c1452d59892944701c56237b903f.tar.gz
git-706fe6ae03e2c1452d59892944701c56237b903f.tar.bz2
hash-object: work within subdirectory.
When -w is given, it needs to find out where the .git directory is, so run the setup_git_directory() when we see a -w. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'hash-object.c')
-rw-r--r--hash-object.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/hash-object.c b/hash-object.c
index c8c9adb..c3d05a8 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -29,6 +29,8 @@ int main(int argc, char **argv)
int i;
const char *type = "blob";
int write_object = 0;
+ const char *prefix;
+ int prefix_length = -1;
for (i = 1 ; i < argc; i++) {
if (!strcmp(argv[i], "-t")) {
@@ -36,10 +38,20 @@ int main(int argc, char **argv)
die(hash_object_usage);
type = argv[i];
}
- else if (!strcmp(argv[i], "-w"))
+ else if (!strcmp(argv[i], "-w")) {
+ if (prefix_length < 0) {
+ prefix = setup_git_directory();
+ prefix_length = prefix ? strlen(prefix) : 0;
+ }
write_object = 1;
- else
- hash_object(argv[i], type, write_object);
+ }
+ else {
+ char *arg = argv[i];
+ if (0 <= prefix_length)
+ arg = prefix_filename(prefix, prefix_length,
+ arg);
+ hash_object(arg, type, write_object);
+ }
}
return 0;
}