[PATCH 2/2] Allow aliases to expand to shell commands

Theodore Ts'o· Feb 11, 2007, 00:33 UTC · lore

[PATCH 0/2] Respun patches for git aliases enhancement

These patches have been respun to fix a spelling typo and in response to comments from Johannes.

						- Ted

Theodore Ts'o· Feb 11, 2007, 00:33 UTC · re: Theodore Ts'o · lore

[PATCH 1/2] Print a sane error message if an alias expands to an invalid git command

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 git.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

Show changes to git.c +8 −1

diff --git a/git.c b/git.c
index 82a8357..c43d4ff 100644
--- a/git.c
+++ b/git.c
@@ -387,8 +387,15 @@ int main(int argc, const char **argv, char **envp)
 		done_alias = 1;
 	}
 
-	if (errno == ENOENT)
+	if (errno == ENOENT) {
+		if (done_alias) {
+			fprintf(stderr, "Expansion of alias '%s' failed; "
+				"'%s' is not a git-command\n",
+				cmd, argv[0]);
+			exit(1);
+		}
 		help_unknown_cmd(cmd);
+	}
 
 	fprintf(stderr, "Failed to run command '%s': %s\n",
 		cmd, strerror(errno));

-- 
1.5.0.rc4.2.g4249

Theodore Ts'o· Feb 11, 2007, 00:33 UTC · re: Theodore Ts'o · lore

If the alias expansion is prefixed with an exclamation point, treat it as a shell command which is run using system(3).

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 Documentation/config.txt |    6 ++++++
 git.c                    |   10 ++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

Show changes to 2 files +16 −0

Documentation/config.txt, git.c

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4e650af..e6e9409 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -222,6 +222,12 @@ alias.*::
 	spaces, the usual shell quoting and escaping is supported.
 	quote pair and a backslash can be used to quote them.
 
+	If the alias expansion is prefixed with an exclamation point,
+	it will be treated as a shell command.  For example, defining
+	"alias.new = !gitk --all --not ORIG_HEAD", the invocation 
+	"git new" is equivalent to running the shell command 
+	"gitk --all --not ORIG_HEAD".
+
 apply.whitespace::
 	Tells `git-apply` how to handle whitespaces, in the same way
 	as the '--whitespace' option. See gitlink:git-apply[1].
diff --git a/git.c b/git.c
index c43d4ff..2f10d50 100644
--- a/git.c
+++ b/git.c
@@ -159,6 +159,16 @@ static int handle_alias(int *argcp, const char ***argv)
 	alias_command = (*argv)[0];
 	git_config(git_alias_config);
 	if (alias_string) {
+		if (alias_string[0] == '!') {
+			trace_printf("trace: alias to shell cmd: %s => %s\n",
+				     alias_command, alias_string + 1);
+			ret = system(alias_string + 1);
+			if (ret >= 0 && WIFEXITED(ret) && 
+			    WEXITSTATUS(ret) != 127)
+				exit(WEXITSTATUS(ret));
+			die("Failed to run '%s' when expanding alias '%s'\n", 
+			    alias_string + 1, alias_command);
+		}
 		count = split_cmdline(alias_string, &new_argv);
 		option_count = handle_options(&new_argv, &count);
 		memmove(new_argv - option_count, new_argv,

-- 
1.5.0.rc4.2.g4249

Johannes Schindelin· Feb 11, 2007, 16:32 UTC · re: Theodore Ts'o · lore

Re: [PATCH 0/2] Respun patches for git aliases enhancement

Hi,

On Sat, 10 Feb 2007, Theodore Ts'o wrote:

> These patches have been respun to fix a spelling typo and in response
> to comments from Johannes.

Sorry to have apply-checked only now: Ted, could you run the second commit through "git show --check"? It has 4 whitespaces at end. But I am sure that Junio can fix them.

Apart from that:
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Ciao, Dscho

patch, 2 partsAllow aliases to expand to shell commands