summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Jan Krüger <jk@jk.gs>2009-10-27 15:58:14 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-27 23:12:44 -0700
commitf1be316ada93158507c315ee7948bb9e6007eb91 (patch)
tree6b14f18ee0e6a9b0519db5e10493db3afc5509fa /t/t3030-merge-recursive.sh
parenthelp -i: properly error out if no info viewer can be found (diff)
downloadtgif-f1be316ada93158507c315ee7948bb9e6007eb91.tar.xz
rebase -i: more graceful handling of invalid commands
Currently, when there is an invalid command, the rest of the line is still treated as if the command had been valid, i.e. rebase -i attempts to produce a patch, using the next argument as a SHA1 name. If there is no next argument or an invalid one, very confusing error messages appear (the line was '.'; path to git-rebase-todo substituted): Unknown command: . fatal: ambiguous argument 'Please fix this in the file $somefile.': unknown revision or path not in the working tree. Use '--' to separate paths from revisions fatal: Not a valid object name Please fix this in the file $somefile. fatal: bad revision 'Please fix this in the file $somefile.' Instead, verify the validity of the remaining line and error out earlier if necessary. Signed-off-by: Jan Krüger <jk@jk.gs> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions