Skip to content

Commit 5ecdbfa

Browse files
committed
Merge branch 'ps/my-first-contribution-alphasort'
Docfix. * ps/my-first-contribution-alphasort: doc: MyFirstContribution: fix cmd placement instructions
2 parents eb35c18 + 24c6817 commit 5ecdbfa

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Documentation/MyFirstContribution.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ int cmd_psuh(int argc, const char **argv, const char *prefix)
9797
----
9898

9999
We'll also need to add the declaration of psuh; open up `builtin.h`, find the
100-
declaration for `cmd_push`, and add a new line for `psuh` immediately before it,
101-
in order to keep the declarations sorted:
100+
declaration for `cmd_pull`, and add a new line for `psuh` immediately before it,
101+
in order to keep the declarations alphabetically sorted:
102102

103103
----
104104
int cmd_psuh(int argc, const char **argv, const char *prefix);
@@ -123,7 +123,7 @@ int cmd_psuh(int argc, const char **argv, const char *prefix)
123123
}
124124
----
125125

126-
Let's try to build it. Open `Makefile`, find where `builtin/push.o` is added
126+
Let's try to build it. Open `Makefile`, find where `builtin/pull.o` is added
127127
to `BUILTIN_OBJS`, and add `builtin/psuh.o` in the same way next to it in
128128
alphabetical order. Once you've done so, move to the top-level directory and
129129
build simply with `make`. Also add the `DEVELOPER=1` variable to turn on
@@ -149,7 +149,7 @@ a `cmd_struct` to the `commands[]` array. `struct cmd_struct` takes a string
149149
with the command name, a function pointer to the command implementation, and a
150150
setup option flag. For now, let's keep mimicking `push`. Find the line where
151151
`cmd_push` is registered, copy it, and modify it for `cmd_psuh`, placing the new
152-
line in alphabetical order.
152+
line in alphabetical order (immediately before `cmd_pull`).
153153

154154
The options are documented in `builtin.h` under "Adding a new built-in." Since
155155
we hope to print some data about the user's current workspace context later,
@@ -167,7 +167,7 @@ Check it out! You've got a command! Nice work! Let's commit this.
167167

168168
`git status` reveals modified `Makefile`, `builtin.h`, and `git.c` as well as
169169
untracked `builtin/psuh.c` and `git-psuh`. First, let's take care of the binary,
170-
which should be ignored. Open `.gitignore` in your editor, find `/git-push`, and
170+
which should be ignored. Open `.gitignore` in your editor, find `/git-pull`, and
171171
add an entry for your new command in alphabetical order:
172172

173173
----

0 commit comments

Comments
 (0)