git/sequencer.c, branch v2.15.2

Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint

2017-12-06T17:09:03Z

The sequencer machinery (used by "git cherry-pick A..B", and "git rebase -i", among other things) would have lost a commit if stopped due to an unlockable index file, which has been fixed. * pw/sequencer-recover-from-unlockable-index: sequencer: reschedule pick if index can't be locked

Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint

2017-11-21T05:05:33Z

Code cleanup. * rs/sequencer-rewrite-file-cleanup: sequencer.c: check return value of close() in rewrite_file() sequencer: use O_TRUNC to truncate files sequencer: factor out rewrite_file()

sequencer: reschedule pick if index can't be locked

2017-11-16T05:19:12Z

If the index cannot be locked in do_recursive_merge(), issue an error message and go on to the error recovery codepath, instead of dying. When the commit cannot be picked, it needs to be rescheduled when performing an interactive rebase, but just dying there won't allow that to happen, and when the user runs 'git rebase --continue' rather than 'git rebase --abort', the commit gets silently dropped. Signed-off-by: Phillip Wood

Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint

2017-11-15T03:04:56Z

A recent regression in "git rebase -i" that broke execution of git commands from subdirectories via "exec" insn has been fixed. * jk/rebase-i-exec-gitdir-fix: sequencer: pass absolute GIT_DIR to exec commands

sequencer.c: check return value of close() in rewrite_file()

2017-11-02T04:39:13Z

Not checking close(2) can hide errors as not all errors are reported during the write(2). Signed-off-by: Simon Ruderich Reviewed-by: René Scharfe Signed-off-by: Junio C Hamano

sequencer: pass absolute GIT_DIR to exec commands

2017-11-02T01:53:23Z

When we replaced the old shell script based interactive rebase in commmit 18633e1a22a6 ("rebase -i: use the rebase--helper builtin", 2017-02-09) we introduced a regression of functionality in that the GIT_DIR would be sent to the environment of the exec command as-is. This generally meant that it would be passed as "GIT_DIR=.git", which causes problems for any exec command that wants to run git commands in a subdirectory. This isn't a very large regression, since it is not that likely that the exec command will run a git command, and even less likely that it will need to do so in a subdir. This regression was discovered by a build system which uses git-describe to find the current version of the build system, and happened to do so from the src/ sub directory of the project. Fix this by passing in the absolute path of the git directory into the child environment. Signed-off-by: Jacob Keller Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

sequencer: use O_TRUNC to truncate files

2017-11-01T01:53:19Z

Cut off any previous content of the file to be rewritten by passing the flag O_TRUNC to open(2) instead of calling ftruncate(2) at the end. That's easier and shorter. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

sequencer: factor out rewrite_file()

2017-11-01T01:50:36Z

Reduce code duplication by extracting a function for rewriting an existing file. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'js/rebase-i-final'

2017-10-18T01:19:07Z

Error message fix. * js/rebase-i-final: sequencer.c: unify an error message

sequencer.c: unify an error message

2017-10-17T21:08:29Z

Change an error message in sequencer.c for the case that we could not write to a file to match other instances. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano