git/git.c, branch v1.6.2

Merge branch 'jk/maint-cleanup-after-exec-failure'

2009-02-03T08:26:12Z

* jk/maint-cleanup-after-exec-failure: git: use run_command() to execute dashed externals run_command(): help callers distinguish errors run_command(): handle missing command errors more gracefully git: s/run_command/run_builtin/

git: use run_command() to execute dashed externals

2009-01-28T22:09:37Z

We used to simply try calling execvp(); if it succeeded, then we were done and the new program was running. If it didn't, then we knew that it wasn't a valid command. Unfortunately, this interacted badly with the new pager handling. Now that git remains the parent process and the pager is spawned, git has to hang around until the pager is finished. We install an atexit handler to do this, but that handler never gets called if we successfully run execvp. You could see this behavior by running any dashed external using a pager (e.g., "git -p stash list"). The command finishes running, but the pager is still going. In the case of less, it then gets an error reading from the terminal and exits, potentially leaving the terminal in a broken state (and not showing the output). This patch just uses run_command() to try running the dashed external. The parent git process then waits for the external process to complete and then handles the pager cleanup as it would for an internal command. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git: s/run_command/run_builtin/

2009-01-28T21:16:30Z

There is a static function called run_command which conflicts with the library function in run-command.c; this isn't a problem currently, but prevents including run-command.h in git.c. This patch just renames the static function to something more specific and non-conflicting. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git_extract_argv0_path(): Move check for valid argv0 from caller to callee

2009-01-26T08:26:05Z

This simplifies the calling code. Signed-off-by: Steffen Prohaska Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

Refactor git_set_argv0_path() to git_extract_argv0_path()

2009-01-26T08:26:05Z

This commit moves the code that computes the dirname of argv[0] from git.c's main() to git_set_argv0_path() and renames the function to git_extract_argv0_path(). This makes the code in git.c's main less cluttered, and we can use the dirname computation from other main() functions too. [ spr: - split Steve's original commit and wrote new commit message. - Integrated Johannes Schindelin's cca1704897e7fdb182f68d4c48a437c5d7bc5203 while rebasing onto master. ] Signed-off-by: Steve Haslam Signed-off-by: Steffen Prohaska Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'as/autocorrect-alias'

2009-01-18T07:05:34Z

* as/autocorrect-alias: git.c: make autocorrected aliases work

remove trailing LF in die() messages

2009-01-05T21:01:01Z

LF at the end of format strings given to die() is redundant because die already adds one on its own. Signed-off-by: Alexander Potashev Signed-off-by: Junio C Hamano

git.c: make autocorrected aliases work

2009-01-05T20:54:07Z

help_unknown_cmd() is able to autocorrect a command to an alias, and not only to internal or external commands. However, main() was not passing the autocorrected command through handle_alias(), hence it failed if it was an alias. This commit makes the autocorrected command go through handle_alias(), once handle_internal_command() and execv_dashed_external() have been tried. Since this is done twice in main() now, moved that logic to a new run_argv() function. Also, print the same "Expansion of alias 'x' failed" message when the alias was autocorrected, rather than a generic "Failed to run command 'x'". Signed-off-by: Adeodato Simó Signed-off-by: Junio C Hamano

git wrapper: Make while loop more reader-friendly

2009-01-02T21:19:40Z

It is not a good practice to prefer performance over readability in something as performance uncritical as finding the trailing slash of argv[0]. So avoid head-scratching by making the loop user-readable, and not hyper-performance-optimized. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Make chdir failures visible

2008-12-05T02:05:51Z

Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano