delta/git.git, branch cb/t3404-shellquote

t3404: fix quoting of redirect for some versions of bash

2015-12-04T22:05:18+00:00

As CodingGuidelines says, some versions of bash errors out when
$variable substitution is used as the target for redirection without
being quoted (even though POSIX may not require such a quote).

Signed-off-by: Charles Bailey 
Signed-off-by: Junio C Hamano

rebase-i: loosen over-eager check_bad_cmd check

2015-10-06T05:39:56+00:00

804098bb (git rebase -i: add static check for commands and SHA-1,
2015-06-29) tried to check all insns before running any in the todo
list, but it did so by implementing its own parser that is a lot
stricter than necessary.  We used to allow lines that are indented
(including comment lines), and we used to allow a whitespace between
the insn and the commit object name to be HT, among other things,
that are flagged as an invalid line by mistake.

Fix this by using the same tokenizer that is used to parse the todo
list file in the new check.

Whether it's a good thing to accept indented comments is
debatable (other commands like "git commit" do not accept them), but we
already accepted them in the past, and some people and scripts rely on
this behavior. Also, a line starting with space followed by a '#' cannot
have any meaning other than being a comment, hence it doesn't harm to
accept them as comments.

Largely based on patch by: Junio C Hamano 

[jc: updated test with quickfix from Torsten Bögershausen]

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

rebase-i: explicitly accept tab as separator in commands

2015-10-02T18:36:44+00:00

The git-rebase-todo is parsed several times with different parsers. In
principle, the user input is normalized by transform_todo_ids and
further parsing can be stricter.

In case the user wrote

pick deadbeefcommit message

the parser of transform_todo_ids was considering the sha1 to be
"deadbeefcommit", and was leaving the tab in the transformed sheet.
In practice, this went unnoticed since the actual command interpretation
was done later in do_next which did accept the tab as a separator.

Make it explicit in the code of transform_todo_ids that tabs are
accepted. This way, code that mimicks it will also accept tabs as
separator.

A similar construct appears in skip_unnecessary_picks, but this one
comes after transform_todo_ids, hence reads the normalized format, so it
needs not be changed.

Signed-off-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

git rebase -i: add static check for commands and SHA-1

2015-06-30T19:14:25+00:00

Check before the start of the rebasing if the commands exists, and for
the commands expecting a SHA-1, check if the SHA-1 is present and
corresponds to a commit. In case of error, print the error, stop git
rebase and prompt the user to fix with 'git rebase --edit-todo' or to
abort.

This allows to avoid doing half of a rebase before finding an error
and giving back what's left of the todo list to the user and prompt
him to fix when it might be too late for him to do so (he might have
to abort and restart the rebase).

Signed-off-by: Galan Rémi 
Signed-off-by: Junio C Hamano

git rebase -i: warn about removed commits

2015-06-30T19:14:25+00:00

Check if commits were removed (i.e. a line was deleted) and print
warnings or stop git rebase depending on the value of the
configuration variable rebase.missingCommitsCheck.

This patch gives the user the possibility to avoid silent loss of
information (losing a commit through deleting the line in this case)
if he wants.

Add the configuration variable rebase.missingCommitsCheck.
    - When unset or set to "ignore", no checking is done.
    - When set to "warn", the commits are checked, warnings are
      displayed but git rebase still proceeds.
    - When set to "error", the commits are checked, warnings are
      displayed and the rebase is stopped.
      (The user can then use 'git rebase --edit-todo' and
      'git rebase --continue', or 'git rebase --abort')

rebase.missingCommitsCheck defaults to "ignore".

Signed-off-by: Galan Rémi 
Signed-off-by: Junio C Hamano

git-rebase -i: add command "drop" to remove a commit

2015-06-30T19:14:25+00:00

Instead of removing a line to remove the commit, you can use the
command "drop" (just like "pick" or "edit"). It has the same effect as
deleting the line (removing the commit) except that you keep a visual
trace of your actions, allowing a better control and reducing the
possibility of removing a commit by mistake.

Signed-off-by: Galan Rémi 
Signed-off-by: Junio C Hamano

Merge branch 'nd/untracked-cache'

2015-05-27T20:14:38+00:00

* nd/untracked-cache:
  t7063: hide stderr from setup inside prereq

t7063: hide stderr from setup inside prereq

2015-05-27T20:14:29+00:00

When t7063 starts, it runs "update-index --untracked-cache"
to see if we support the untracked cache. Its output goes
straight to stderr, even if the test is not run with "-v".
Let's wrap it in a prereq that will hide the output by
default, but show it with "-v".

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Sync with 2.4.2

2015-05-26T20:50:51+00:00

Git 2.4.2

2015-05-26T20:49:59+00:00

Signed-off-by: Junio C Hamano