git/hash-object.c, branch v1.6.3

Merge branch 'en/maint-hash-object'

2009-03-05T23:58:42Z

* en/maint-hash-object: Ensure proper setup of git_dir for git-hash-object Conflicts: hash-object.c

Ensure proper setup of git_dir for git-hash-object

2009-02-28T22:09:46Z

Call setup_git_directory() before git_config() to make sure git_dir is set to the proper value. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

Add calls to git_extract_argv0_path() in programs that call git_config_*

2009-01-26T08:26:05Z

Programs that use git_config need to find the global configuration. When runtime prefix computation is enabled, this requires that git_extract_argv0_path() is called early in the program's main(). This commit adds the necessary calls. Signed-off-by: Steffen Prohaska Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

Fix non-literal format in printf-style calls

2008-11-11T22:50:02Z

These were found using gcc 4.3.2-1ubuntu11 with the warning: warning: format not a string literal and no format arguments Signed-off-by: Junio C Hamano

Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer

2008-10-12T19:36:19Z

Many call sites use strbuf_init(&foo, 0) to initialize local strbuf variable "foo" which has not been accessed since its declaration. These can be replaced with a static initialization using the STRBUF_INIT macro which is just as readable, saves a function call, and takes up fewer lines. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

add --no-filters option to git hash-object

2008-08-03T20:38:22Z

The new option allows the contents to be hashed as is, ignoring any input filter that would have been chosen by the attributes mechanism. This option is incompatible with --path and --stdin-paths options. Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

add --path option to git hash-object

2008-08-03T20:33:06Z

The --path option allows us to pretend as if the contents being hashed came from the specified path, and affects which input filter is used via the attributes mechanism. This is useful for hashing a temporary file whose name is different from the path that is meant to have the hashed contents. Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

use parse_options() in git hash-object

2008-08-03T20:23:54Z

Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

correct usage help string for git-hash-object

2008-08-03T20:23:15Z

The usage string is corrected to make it fit in 80 columns and to make it unequivocal about what options can be used with --stdin-paths. Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

teach index_fd to work with pipes

2008-08-03T20:14:35Z

index_fd can now work with file descriptors that are not normal files but any readable file. If the given file descriptor is a regular file then mmap() is used; for other files, strbuf_read is used. The path parameter, which has been used as hint for filters, can be NULL now to indicate that the file should be hashed literally without any filter. The index_pipe function is removed as redundant. Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano