Re: Race condition with git-status and git-rebase
- From
Yiannis Marangos <yiannis.marangos@gmail.com>
- Date
- Apr 8, 2014, 19:20 UTC
- Message-ID
- <20140408191914.GA7630@abyss.hitronhub.home>
- In-Reply-To
- <20140408184421.GD5208@abyss.hitronhub.home>
Maybe you will find it useful: this is one way that I use to manually debug the race condition (and it works in Linux):
diff --git a/builtin/commit.c b/builtin/commit.c index d9550c5..c0511f6 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1283,6 +1283,8 @@ int cmd_status(int argc, const char **argv, const char *prefix) usage_with_options(builtin_status_usage, builtin_status_options); status_init_config(&s, git_status_config); + printf("read_cache() finished, press enter to continue.\n"); + getchar(); argc = parse_options(argc, argv, prefix, builtin_status_options, builtin_status_usage, 0); diff --git a/git-rebase--am.sh b/git-rebase--am.sh index df46f4c..6ffd986 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -61,8 +61,8 @@ else return $? fi - git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \ - ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches" + git am $git_am_opt -i --rebasing --resolvemsg="$resolvemsg" \ + ${gpg_sign_opt:+"$gpg_sign_opt"} "$GIT_DIR/rebased-patches" ret=$? rm -f "$GIT_DIR/rebased-patches" diff --git a/read-cache.c b/read-cache.c index ba13353..a6f73a7 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1778,6 +1778,8 @@ static int has_racy_timestamp(struct index_state *istate) */ void update_index_if_able(struct index_state *istate, struct lock_file *lockfile) { + printf("cache_changed: %d has_racy_timestamp: %d\n", + istate->cache_changed, has_racy_timestamp(istate)); if ((istate->cache_changed || has_racy_timestamp(istate)) && !write_index(istate, lockfile->fd)) commit_locked_index(lockfile);