Ville Skyttä <ville.skytta@xxxxxx> writes: > On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > [...] >> There are two "commited" you seem to have missed, though, >> >> t/t3420-rebase-autostash.sh: echo uncommited-content >file0 && >> t/t3420-rebase-autostash.sh: echo uncommited-content >expected && >> >> which I'll queue on top of this patch to be later squashed (i.e. no >> need to resend the whole thing only to add these two). > > Thanks. https://github.com/client9/misspell/pull/61 :) > > Also, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in > transport-helper.c, maybe you can squash that one in as well if you > think it's fine? One comment that refers to that token spells it correctly, which is funny ;-) Here is a squashable change I've collected so far. Subject: [PATCH] SQUASH??? <BAD> <CORRECTED> indegee indegree transfering transferring uncommited uncommitted --- commit-slab.h | 2 +- t/t3420-rebase-autostash.sh | 4 ++-- transport-helper.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commit-slab.h b/commit-slab.h index f84b449..be16da7 100644 --- a/commit-slab.h +++ b/commit-slab.h @@ -8,7 +8,7 @@ * * After including this header file, using: * - * define_commit_slab(indegee, int); + * define_commit_slab(indegree, int); * * will let you call the following functions: * diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 532ff5c..ab8a63e 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge test_expect_success 'abort rebase -i with --autostash' ' test_when_finished "git reset --hard" && - echo uncommited-content >file0 && + echo uncommitted-content >file0 && ( write_script abort-editor.sh <<-\EOF && echo >"$1" @@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' ' test_must_fail git rebase -i --autostash HEAD^ && rm -f abort-editor.sh ) && - echo uncommited-content >expected && + echo uncommitted-content >expected && test_cmp expected file0 ' diff --git a/transport-helper.c b/transport-helper.c index 4208743..db2f930 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...) } /* Stream state: More data may be coming in this direction. */ -#define SSTATE_TRANSFERING 0 +#define SSTATE_TRANSFERRING 0 /* * Stream state: No more data coming in this direction, flushing rest of * data. @@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...) /* Stream state: Transfer in this direction finished. */ #define SSTATE_FINISHED 2 -#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING) +#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING) #define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING) #define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING) @@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output) state.ptg.dest = 1; state.ptg.src_is_sock = (input == output); state.ptg.dest_is_sock = 0; - state.ptg.state = SSTATE_TRANSFERING; + state.ptg.state = SSTATE_TRANSFERRING; state.ptg.bufuse = 0; state.ptg.src_name = "remote input"; state.ptg.dest_name = "stdout"; @@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output) state.gtp.dest = output; state.gtp.src_is_sock = 0; state.gtp.dest_is_sock = (input == output); - state.gtp.state = SSTATE_TRANSFERING; + state.gtp.state = SSTATE_TRANSFERRING; state.gtp.bufuse = 0; state.gtp.src_name = "stdin"; state.gtp.dest_name = "remote output"; -- 2.9.2-831-g532adb1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html