git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/4] git status: refresh the index

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 2, 2010, 18:56 UTC
Message-ID
<7v6349bs52.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1270211241-10795-5-git-send-email-markus.heidelberg@web.de>
Markus Heidelberg <markus.heidelberg@web.de> writes:
Show 31 quoted lines
> This was already the case before commit 9e4b7ab6 (git status: not
> "commit --dry-run" anymore, 2009-08-15) and got lost during the
> conversion, which was meant to only change behaviour when invoked with
> arguments.
>
> Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
> ---
>  builtin/commit.c  |    5 +++++
>  t/t7508-status.sh |    2 +-
>  2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index c5ab683..2262734 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1017,6 +1017,7 @@ static int git_status_config(const char *k, const char *v, void *cb)
>  int cmd_status(int argc, const char **argv, const char *prefix)
>  {
>  	struct wt_status s;
> +	int fd;
>  	unsigned char sha1[20];
>  	static struct option builtin_status_options[] = {
>  		OPT__VERBOSE(&verbose),
> @@ -1050,6 +1051,10 @@ int cmd_status(int argc, const char **argv, const char *prefix)
>  
>  	read_cache_preload(s.pathspec);
>  	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
> +	fd = hold_locked_index(&index_lock, 1);
> +	if (write_cache(fd, active_cache, active_nr) ||
> +	    commit_locked_index(&index_lock))
> +		die("unable to write new_index file");
This is a regression, I think.

The first two patches are trivially correct and I'll queue them to 'master'.

Thanks.
Previous: Jeff KingNext: Markus Heidelberg
Message 9 of 15 in “fix regression that "git status" doesn't refresh the index”
  1. 0/4 fix regression that "git status" doesn't refresh the indexMarkus Heidelberg, Apr 2, 2010
  2. 1/4 builtin/commit: fix duplicated sentence in a commentMarkus Heidelberg, Apr 2, 2010
  3. 2/4 builtin/commit: remove unnecessary variable definitionMarkus Heidelberg, Apr 2, 2010
  4. 3/4 t7508: add test for "git status" refreshing the indexMarkus Heidelberg, Apr 2, 2010
  5. 4/4 git status: refresh the indexMarkus Heidelberg, Apr 2, 2010
  6. Jeff KingApr 2, 2010
  7. Markus HeidelbergApr 2, 2010
  8. Jeff KingApr 2, 2010
  9. Junio C HamanoApr 2, 2010
  10. Markus HeidelbergApr 2, 2010
  11. 4/4 git status: refresh the index if possibleMarkus Heidelberg, Apr 2, 2010
  12. Junio C HamanoApr 3, 2010
  13. t7508: add a test for "git status" in a read-only repositoryMarkus Heidelberg, Apr 3, 2010
  14. Junio C HamanoApr 6, 2010
  15. Markus HeidelbergApr 3, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.