[PATCH] status: display the SHA1 of the commit being currently processed

2013-06-17 Thread Mathieu Lienard--Mayor
like: $ git status HEAD detached from 33e516f Editing c346c87 while rebasing branch 'rebase_i_edit' on 'f90e540'. Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- -changes in the tests to match the new statu

[PATCH v5 1/2] rm: better error message on failure for multiple files

2013-06-12 Thread Mathieu Lienard--Mayor
(use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v4: -removal of useless blanks after variable declarations -use of string_lis

[PATCH 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-12 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- No changes since v4 Documentation/config.txt

[PATCH v4 1/2] rm: better error message on failure for multiple files

2013-06-11 Thread Mathieu Lienard--Mayor
(use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v3: - rename function print_error_files() - use of strbuf_release to avoid leaking - change of

[PATCH v4 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-11 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v3: - removal of spaces after redirection <<

[PATCH v3 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-10 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Documentation/config.txt |3 +++ advice.c

[PATCH v3 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Lienard--Mayor
(use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v2: -couple typo in commit message and in code -rename and redefinition of the intermediate function -move

[PATCH v3 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Lienard--Mayor
(use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v2: -couple typo in commit message and in code -rename and redefinition of the intermediate function -move

[PATCH v3 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-10 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Documentation/config.txt |3 +++ advice.c

[PATCH v2 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Lienard--Mayor
(use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v1: -introduction of print_error_files() to avoid repetitions -implementation with string_list instead of strbuf

[PATCH v2 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-10 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v1: -corrected the commit message where "rmHi

[PATCH 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-10 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Changes since v1: -corrected the commit message where "rmHi

[PATCH 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-10 Thread Mathieu Lienard--Mayor
ce removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- Documentation/config.txt |3 ++ advice.c

[PATCH 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Lienard--Mayor
(use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- builtin/rm.c | 93 +- 1 files changed, 79 insertions(+),

[PATCH 1/2] rm: better error message on failure for multiple files

2013-06-08 Thread Mathieu Lienard--Mayor
oo.txt bar.txt (use --cached to keep the file, or -f to force removal) Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Matthieu Moy --- builtin/rm.c | 54 ++

[PATCH 2/2] rm: introduce advice.rmHints to shorten messages

2013-06-08 Thread Mathieu Lienard--Mayor
: error: 'foo.txt' has changes staged in the index (use --cached to keep the file, or -f to force removal) would look like, with advice.rmHints=true: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Jorg