diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-14 04:18:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-14 04:18:46 -0700 |
| commit | edb4fd79ec34254fc4a1c35e8834df4c92cb3bfd (patch) | |
| tree | 7a983deb4620bc3de0a26d091381b03b35ea8933 /git-quiltimport.sh | |
| parent | Merge branch 'jc/cherry' (diff) | |
| parent | git-quiltimport complaining yet still working (diff) | |
| download | tgif-edb4fd79ec34254fc4a1c35e8834df4c92cb3bfd.tar.xz | |
Merge branch 'maint'
* maint:
git-quiltimport complaining yet still working
config.txt: Fix grammatical error in description of http.noEPSV
config.txt: Change pserver to server in description of gitcvs.*
config.txt: Document core.autocrlf
config.txt: Document gitcvs.allbinary
Do not default to --no-index when given two directories.
Use rev-list --reverse in git-rebase.sh
Diffstat (limited to 'git-quiltimport.sh')
| -rwxr-xr-x | git-quiltimport.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh index edccd82755..018cc75bd0 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -73,9 +73,9 @@ mkdir $tmp_dir || exit 2 for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do echo $patch_name (cat $QUILT_PATCHES/$patch_name | git-mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3 - test -s $dotest/patch || { + test -s .dotest/patch || { echo "Patch is empty. Was is split wrong?" - stop_here $this + exit 1 } # Parse the author information |