user/sven/git.git/git-add--interactive.perl, branch v1.6.4.5

Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3

2009-08-26T18:22:00Z

* tr/maint-1.6.3-add-p-modeonly-fix: add -p: do not attempt to coalesce mode changes git add -p: demonstrate failure when staging both mode and hunk

add -p: do not attempt to coalesce mode changes

2009-08-15T17:36:59Z

In 0392513 (add-interactive: refactor mode hunk handling, 2009-04-16), we merged the interaction loops for mode changes and hunk staging. This was fine at the time, because 0beee4c (git-add--interactive: remove hunk coalescing, 2008-07-02) removed hunk coalescing. However, in 7a26e65 (Revert "git-add--interactive: remove hunk coalescing", 2009-05-16), we resurrected it. Since then, the code would attempt in vain to merge mode changes with diff hunks, corrupting both in the process. We add a check to the coalescing loop to ensure it only looks at diff hunks, thus skipping mode changes. Noticed-by: Kirill Smelkov Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

add -i: do not dump patch during application

2009-06-03T07:11:15Z

Remove a debugging print that snuck in at 7a26e65 (Revert "git-add--interactive: remove hunk coalescing", 2009-05-16). Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Revert "git-add--interactive: remove hunk coalescing"

2009-05-17T01:52:12Z

This reverts commit 0beee4c6dec15292415e3d56075c16a76a22af54 but with a bit of twist, as we have added "edit hunk manually" hack and we cannot rely on the original line numbers of the hunks that were manually edited. Signed-off-by: Junio C Hamano

Merge branch 'mm/maint-add-p-quit'

2009-04-20T10:39:38Z

* mm/maint-add-p-quit: git add -p: add missing "q" to patch prompt

git add -p: add missing "q" to patch prompt

2009-04-20T10:38:44Z

Commit cbd3a01 added a new "q" subcommand to the "git add -p" command loop, but forgot to add it to the prompt. Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano

add-interactive: refactor mode hunk handling

2009-04-19T19:35:38Z

The original implementation considered the mode separately from the rest of the hunks, asking about it outside the main hunk-selection loop. This patch instead places a mode change as the first hunk in the loop. This has two advantages: 1. less duplicated code (since we use the main selection loop). This also cleans up an inconsistency, which is that the main selection loop separates options with a comma, whereas the mode prompt used slashes. 2. users can now skip the mode change and come back to it, search for it (via "/mode"), etc, as they can with other hunks. To facilitate this, each hunk is now marked with a "type". Mode hunks are not considered for splitting (which would make no sense, and also confuses the split_hunk function), nor are they editable. In theory, one could edit the mode lines and change to a new mode. In practice, there are only two modes that git cares about (0644 and 0755), so either you want to move from one to the other or not (and you can do that by staging or not staging). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git add -p: new "quit" command at the prompt.

2009-04-19T19:35:37Z

There's already 'd' to stop staging hunks in a file, but no explicit command to stop the interactive staging (for the current files and the remaining ones). Of course you can do 'd' and then ^C, but it would be more intuitive to allow 'quit' action. Signed-off-by: Junio C Hamano

add-interactive: refactor mode hunk handling

2009-04-16T08:06:52Z

git add -p: new "quit" command at the prompt.

2009-04-16T02:41:35Z