git/git-quiltimport.sh, branch jch

git-quiltimport: avoid an unnecessary subshell

2024-03-16T18:08:57Z

Use braces for the compound command. Signed-off-by: Beat Bolli Acked-by: Taylor Blau Signed-off-by: Junio C Hamano

git-quiltimport: add --keep-non-patch option

2019-01-07T23:29:34Z

git-am has the --keep-non-patch option to pass -b to git-mailinfo for keeping subject prefixes intact. Allow this option to be used with quiltimport as well. Signed-off-by: Laura Abbott Signed-off-by: Junio C Hamano

git-quiltimport: add commandline option --series

2015-09-01T18:10:07Z

The quilt series file doesn't have to be located in the same directory with the patches and can be named differently than 'series' as well. This patch adds a commandline option to allow for a non-standard series filename and location. Signed-off-by: Juerg Haefliger Signed-off-by: Junio C Hamano

git-sh-setup.sh: add variable to use the stuck-long mode

2014-02-03T20:11:10Z

If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse option parsing is done in --stuck-long mode. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Correct common spelling mistakes in comments and tests

2013-04-12T20:38:40Z

Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano

git-quiltimport: preserve standard input to be able to read user input

2009-02-25T08:49:13Z

When run without --author and it fails to determine an author, git quiltimport tries `read patch_author` to get user input, but standard input has been redirected to the patch series file. This commit lets quiltimport read the series file through file descriptor 3 so that the standard input is preserved. Reported by Uwe Kleine-König through http://bugs.debian.org/515910 Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano

Rename .git/rebase to .git/rebase-apply

2008-07-22T01:51:47Z

With git-am, it sounds awkward to have the patches in ".git/rebase/", but for technical reasons, we have to keep the same directory name for git-am and git-rebase. ".git/rebase-apply" seems to be a good compromise. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'sb/dashless'

2008-07-17T00:22:50Z

* sb/dashless: Make usage strings dash-less t/: Use "test_must_fail git" instead of "! git" t/test-lib.sh: exit with small negagive int is ok with test_must_fail Conflicts: builtin-blame.c builtin-mailinfo.c builtin-mailsplit.c builtin-shortlog.c git-am.sh t/t4150-am.sh t/t4200-rerere.sh

Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

2008-07-16T01:49:28Z

Since the files generated and used during a rebase are never to be tracked, they should live in $GIT_DIR. While at it, avoid the rather meaningless term "dotest" to "rebase", and unhide ".dotest-merge". This was wished for on the mailing list, but so far unimplemented. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Make usage strings dash-less

2008-07-13T21:12:48Z

When you misuse a git command, you are shown the usage string. But this is currently shown in the dashed form. So if you just copy what you see, it will not work, when the dashed form is no longer supported. This patch makes git commands show the dash-less version. For shell scripts that do not specify OPTIONS_SPEC, git-sh-setup.sh generates a dash-less usage string now. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano