git/sequencer.c, branch v2.11.2

Revert "sequencer: remove useless get_dir() function"

2016-12-14T22:56:46Z

This reverts commit 39784cd3620cc47415c9010ec58a9616f040125c. The function had only one caller when the "remove useless" was written, but another topic will soon make heavy use of it and more importantly the function will return different paths depending on the value in opts.

sequencer: remove useless get_dir() function

2016-12-09T22:51:16Z

This function is used only once, for the removal of the directory. It is not used for the creation of the directory nor anywhere else. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano

sequencer: make sequencer abort safer

2016-12-09T22:50:45Z

In contrast to "git am --abort", a sequencer abort did not check whether the current HEAD is the one that is expected. This can lead to loss of work (when not spotted and resolved using reflog before the garbage collector chimes in). This behavior is now changed by mimicking "git am --abort". The abortion is done but HEAD is not changed when the current HEAD is not the expected HEAD. A new file "sequencer/abort-safety" is added to save the expected HEAD. The new behavior is only active when --abort is invoked on multiple picks. The problem does not occur for the single-pick case because it is handled differently. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano

Merge branch 'js/prepare-sequencer'

2016-11-22T22:15:38Z

Fix for an error message string. * js/prepare-sequencer: i18n: fix unmatched single quote in error message

i18n: fix unmatched single quote in error message

2016-11-21T17:30:50Z

Fixed unmatched single quote introduced by commit: * f56fffef9a sequencer: teach write_message() to append an optional LF Signed-off-by: Jiang Xin Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'js/prepare-sequencer'

2016-11-11T21:56:30Z

Silence a clang warning introduced by a recently graduated topic. * js/prepare-sequencer: sequencer: silence -Wtautological-constant-out-of-range-compare

sequencer: silence -Wtautological-constant-out-of-range-compare

2016-11-09T03:59:24Z

When clang compiles sequencer.c, it complains: sequencer.c:632:14: warning: comparison of constant 2 with expression of type 'const enum todo_command' is always true [-Wtautological-constant-out-of-range-compare] if (command < ARRAY_SIZE(todo_command_strings)) This is because "command" is an enum that may only have two values (0 and 1) and the array in question has two elements. As it turns out, clang is actually wrong here, at least according to its own bug tracker: https://llvm.org/bugs/show_bug.cgi?id=16154 But it's still worth working around this, as the warning is present with -Wall, meaning we fail compilation with "make DEVELOPER=1". Casting the enum to size_t sufficiently unconfuses clang. As a bonus, it also catches any possible out-of-bounds access if the enum takes on a negative value (which shouldn't happen either, but again, this is a defensive check). Signed-off-by: Jeff King

Merge branch 'nd/ita-empty-commit'

2016-10-27T21:58:50Z

When new paths were added by "git add -N" to the index, it was enough to circumvent the check by "git commit" to refrain from making an empty commit without "--allow-empty". The same logic prevented "git status" to show such a path as "new file" in the "Changes not staged for commit" section. * nd/ita-empty-commit: commit: don't be fooled by ita entries when creating initial commit commit: fix empty commit creation when there's no changes but ita entries diff: add --ita-[in]visible-in-index diff-lib: allow ita entries treated as "not yet exist in index"

commit: fix empty commit creation when there's no changes but ita entries

2016-10-24T17:48:23Z

If i-t-a entries are present and there is no change between the index and HEAD i-t-a entries, index_differs_from() still returns "dirty, new entries" (aka, the resulting commit is not empty), but cache-tree will skip i-t-a entries and produce the exact same tree of current commit. index_differs_from() is supposed to catch this so we can abort git-commit (unless --no-empty is specified). Update it to optionally ignore i-t-a entries when doing a diff between the index and HEAD so that it would return "no change" in this case and abort commit. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

sequencer: mark all error messages for translation

2016-10-21T16:32:35Z

There was actually only one error message that was not yet marked for translation. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano