git, branch v1.7.8-rc4

Git 1.7.8-rc4

2011-11-28T22:07:22Z

Signed-off-by: Junio C Hamano

builtin-reset: Documentation update

2011-11-23T21:24:54Z

The second mode of 'git reset' is defined by the --patch option, while the third mode is defined by the option. Hence, these options are mandatory in the description of the individual modes. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano

builtin-branch: Fix crash on invalid use of --force

2011-11-23T21:23:33Z

The option --force should not put us in 'create branch' mode. The fact that this option is only valid in 'create branch' mode is already caught by the the next 'if' in which we assure that we are in the correct mode. Without this patch, "git branch -f" without any other argument ends up calling create_branch without any branch name. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano

revert --abort: do not leave behind useless sequencer-old directory

2011-11-23T18:56:29Z

The "git cherry-pick --abort" command currently renames the .git/sequencer directory to .git/sequencer-old instead of removing it on success due to an accident. cherry-pick --abort is designed to work in three steps: 1) find which commit to roll back to 2) call "git reset --merge " to move to that commit 3) remove the .git/sequencer directory But the careless author forgot step 3 entirely. The only reason the command worked anyway is that "git reset --merge " renames the .git/sequencer directory as a secondary effect --- after moving to , or so the logic goes, it is unlikely but possible that the caller of git reset wants to continue the series of cherry-picks that was in progress, so git renames the sequencer state to .git/sequencer-old to be helpful while allowing the cherry-pick to be resumed if the caller did not want to end the sequence after all. By running "git cherry-pick --abort", the operator has clearly indicated that she is not planning to continue cherry-picking. Remove the (renamed) .git/sequencer directory as intended all along. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Fix revert --abort on Windows

2011-11-23T18:54:57Z

On Windows, it is not possible to rename or remove a directory that has open files. 'revert --abort' renamed .git/sequencer when it still had .git/sequencer/head open. Close the file as early as possible to allow the rename operation on Windows. Signed-off-by: Johannes Sixt Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano

revert: do not pass non-literal string as format to git_path()

2011-11-23T17:29:53Z

This fixes the following warning. CC builtin/revert.o builtin/revert.c: In function ‘write_cherry_pick_head’: builtin/revert.c:311: warning: format not a string literal and no format arguments Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Update 1.7.8 draft release notes in preparation for rc4

2011-11-23T02:23:36Z

Signed-off-by: Junio C Hamano

Merge branch 'jn/revert-quit'

2011-11-23T02:22:08Z

* jn/revert-quit: revert: remove --reset compatibility option revert: introduce --abort to cancel a failed cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: improve error message for cherry-pick during cherry-pick revert: rearrange pick_revisions() for clarity revert: rename --reset option to --quit

revert: remove --reset compatibility option

2011-11-23T02:18:02Z

Remove the "git cherry-pick --reset" option, which has a different preferred spelling nowadays ("--quit"). Luckily the old --reset name was not around long enough for anyone to get used to it. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

revert: introduce --abort to cancel a failed cherry-pick

2011-11-23T02:16:59Z

After running some ill-advised command like "git cherry-pick HEAD..linux-next", the bewildered novice may want to return to more familiar territory. Introduce a "git cherry-pick --abort" command that rolls back the entire cherry-pick sequence and places the repository back on solid ground. Just like "git merge --abort", this internally uses "git reset --merge", so local changes not involved in the conflict resolution are preserved. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano