Re: [PATCH 0/5] Revamping "git status"

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 5, 2009, 16:57 UTC
Message-ID: <7vbpmub3la.fsf@alter.siamese.dyndns.org>
In-Reply-To: <200908051149.40980.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

Show 11 quoted lines

> I also tried finding out which exact commit was causing this, but 4/5
> still segfaults and 1-3 don't even compile:
>
>   builtin-commit.c: In function ‘show_unmerged’:                                  
>   builtin-commit.c:827: error: dereferencing pointer to incomplete type           
>   builtin-commit.c: In function ‘show_status’:                                    
>   builtin-commit.c:854: error: dereferencing pointer to incomplete type
>   [etc]
>
> These are referring to use of a 'struct wt_status_change_data *', but
> the struct declaration is only in 4/5.  Am I missing something?

I suspect you have a botched patch application.

The result of applying up to [PATCH 3/5] does not even have show_unmerged/show_status in builtin-commit.c. These two functions are introduced by [PATCH 5/5] to implement shortstatus.

I've applied what came back on the list on top of 07a4a3b (Fix typos on pt_BR/gittutorial.txt translation, 2009-07-31) and all five states compile just fine.

    $ git rev-list 07a4a3b.. |
      while read sha1
      do
            git rev-parse $sha1^{tree}
      done
    86363b25b84041cf14110dcc3136f56915778f71
    4625f5bbc43e1158d00aca8b2356047606c0babd
    895698143b2c29af8bfe0cdf6c3f57de3bf080d8
    3c565041ba6e432ff9064a1d8302f49ef33c2605
    c0c2b9c2a55e3df9cce448d59e5d557d07d78a4b