Skip to content

New Psuh command #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
/git-prune
/git-prune-packed
/git-pull
/git-psuh
/git-push
/git-quiltimport
/git-range-diff
Expand Down
28 changes: 28 additions & 0 deletions Documentation/git-psuh.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
git-psuh(1)
===========

NAME
----
git-psuh - Delight users' typo with a shy horse


SYNOPSIS
--------
[verse]
'git-psuh [<arg>...]'

DESCRIPTION
-----------
...

OPTIONS[[OPTIONS]]
------------------
...

OUTPUT
------
...

GIT
---
Part of the git[1] suite
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1108,6 +1108,7 @@ BUILTIN_OBJS += builtin/patch-id.o
BUILTIN_OBJS += builtin/prune-packed.o
BUILTIN_OBJS += builtin/prune.o
BUILTIN_OBJS += builtin/pull.o
BUILTIN_OBJS += builtin/psuh.o
BUILTIN_OBJS += builtin/push.o
BUILTIN_OBJS += builtin/range-diff.o
BUILTIN_OBJS += builtin/read-tree.o
Expand Down
1 change: 1 addition & 0 deletions builtin.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ int cmd_patch_id(int argc, const char **argv, const char *prefix);
int cmd_prune(int argc, const char **argv, const char *prefix);
int cmd_prune_packed(int argc, const char **argv, const char *prefix);
int cmd_pull(int argc, const char **argv, const char *prefix);
int cmd_psuh(int argc, const char **argv, const char *prefix);
int cmd_push(int argc, const char **argv, const char *prefix);
int cmd_range_diff(int argc, const char **argv, const char *prefix);
int cmd_read_tree(int argc, const char **argv, const char *prefix);
Expand Down
60 changes: 60 additions & 0 deletions builtin/psuh.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#include "builtin.h"
#include "config.h"
#include "wt-status.h"
#include "commit.h"
#include "pretty.h"
#include "parse-options.h"

int cmd_psuh(int argc, const char **argv, const char *prefix)
{

int i;
const char *cfg_name;
struct wt_status status;
struct commit *c = NULL;
struct strbuf commitline = STRBUF_INIT;

static const char * const psuh_usage[] = {
N_("git psuh [<arg>...]"),
NULL,
};

struct option options[] = {
OPT_END()
};

argc = parse_options(argc, argv, prefix, options, psuh_usage, 0);

printf(_("pedro eats an apple.\n"));

printf(Q_("Your args (there is %d):\n",
"Your args (there are %d):\n",
argc),
argc);
for (i = 0; i < argc; i++)
printf("%d: %s\n", i, argv[i]);

printf(_("Your current working directory:\n<top-level>%s%s\n"),
prefix ? "/" : "", prefix ? prefix : "");

git_config(git_default_config, NULL);

if (git_config_get_string_const("user.name", &cfg_name) > 0)
printf(_("No name is found in config\n"));
else
printf(_("Your name: %s\n"), cfg_name);

wt_status_prepare(the_repository, &status);
git_config(git_default_config, &status);
printf(_("Your current branch: %s\n"), status.branch);

c = lookup_commit_reference_by_name("origin/master");

if (c != NULL) {
pp_commit_easy(CMIT_FMT_ONELINE, c, &commitline);
printf(_("Current commit: %s\n"), commitline.buf);
}

return 0;
}

3 changes: 2 additions & 1 deletion git.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ static struct cmd_struct commands[] = {
{ "prune", cmd_prune, RUN_SETUP },
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
{ "push", cmd_push, RUN_SETUP },
{ "psuh", cmd_psuh, RUN_SETUP },
{ "push", cmd_push, RUN_SETUP },
{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
{ "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
Expand Down
14 changes: 14 additions & 0 deletions t/t9999-psuh-tutorial.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh

test_description='git-psuh test

This test runs git-psuh and makes sure it does not crash.'

. ./test-lib.sh

test_expect_success 'runs correctly with no args and good output' '
git psuh >actual &&
test_i18ngrep pedro actual
'

test_done