Build log (including GIT_TEST_OPTS="--verbose --debug"): *** t3701-add-interactive.sh *** * expecting success: echo content >file && git add file && echo more >>file && echo lines >>file * ok 1: setup (initial) * expecting success: git add -i </dev/null >output && grep "+1/-0 *+2/-0 file" output error: unknown switch `i' usage: git-add [options] [--] <filepattern>... -n, --dry-run dry run -v, --verbose be verbose -f allow adding otherwise ignored files -u update tracked files --refresh don't add, only refresh the index * FAIL 2: status works (initial) git add -i </dev/null >output && grep "+1/-0 *+2/-0 file" output * expecting success: (echo d; echo 1) | git add -i >output && sed -ne "/new file/,/content/p" <output >diff && test_cmp expected diff error: unknown switch `i' usage: git-add [options] [--] <filepattern>... -n, --dry-run dry run -v, --verbose be verbose -f allow adding otherwise ignored files -u update tracked files --refresh don't add, only refresh the index * FAIL 3: diff works (initial) (echo d; echo 1) | git add -i >output && sed -ne "/new file/,/content/p" <output >diff && test_cmp expected diff * expecting success: git add file && (echo r; echo 1) | git add -i && git ls-files >output && ! grep . output error: unknown switch `i' usage: git-add [options] [--] <filepattern>... -n, --dry-run dry run -v, --verbose be verbose -f allow adding otherwise ignored files -u update tracked files --refresh don't add, only refresh the index * FAIL 4: revert works (initial) git add file && (echo r; echo 1) | git add -i && git ls-files >output && ! grep . output * expecting success: echo baseline >file && git add file && git commit -m commit && echo content >>file && git add file && echo more >>file && echo lines >>file Created initial commit 7081d9f: commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 file * ok 5: setup (commit) * expecting success: git add -i </dev/null >output && grep "+1/-0 *+2/-0 file" output error: unknown switch `i' usage: git-add [options] [--] <filepattern>... -n, --dry-run dry run -v, --verbose be verbose -f allow adding otherwise ignored files -u update tracked files --refresh don't add, only refresh the index * FAIL 6: status works (commit) git add -i </dev/null >output && grep "+1/-0 *+2/-0 file" output * expecting success: (echo d; echo 1) | git add -i >output && sed -ne "/^index/,/content/p" <output >diff && test_cmp expected diff error: unknown switch `i' usage: git-add [options] [--] <filepattern>... -n, --dry-run dry run -v, --verbose be verbose -f allow adding otherwise ignored files -u update tracked files --refresh don't add, only refresh the index * FAIL 7: diff works (commit) (echo d; echo 1) | git add -i >output && sed -ne "/^index/,/content/p" <output >diff && test_cmp expected diff * expecting success: git add file && (echo r; echo 1) | git add -i && git add -i </dev/null >output && grep "unchanged *+3/-0 file" output error: unknown switch `i' usage: git-add [options] [--] <filepattern>... -n, --dry-run dry run -v, --verbose be verbose -f allow adding otherwise ignored files -u update tracked files --refresh don't add, only refresh the index * FAIL 8: revert works (commit) git add file && (echo r; echo 1) | git add -i && git add -i </dev/null >output && grep "unchanged *+3/-0 file" output * failed 6 among 8 test(s) make[1]: *** [t3701-add-interactive.sh] Error 1 make[1]: Leaving directory `/var/tmp/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t' make: *** [test] Error 2
Created attachment 151429 [details] build log Portage 2.1.5_rc6 (default-linux/amd64/2007.0, gcc-4.3.0, glibc-2.7-r2, 2.6.24-gentoo-r2 x86_64) ================================================================= System uname: 2.6.24-gentoo-r2 x86_64 Intel(R) Core(TM)2 CPU 6300 @ 1.86GHz Timestamp of tree: Sun, 27 Apr 2008 11:15:01 +0000 app-shells/bash: 3.2_p33 dev-java/java-config: 1.3.7, 2.1.5 dev-lang/python: 2.5.2-r2 sys-apps/baselayout: 2.0.0 sys-apps/openrc: 0.2.2 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.13, 2.62 sys-devel/automake: 1.5, 1.7.9-r1, 1.9.6-r2, 1.10.1 sys-devel/binutils: 2.18-r1 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.25-r1 ACCEPT_KEYWORDS="amd64 ~amd64" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=core2 -O2 -pipe -ggdb" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/config /var/lib/hsqldb" CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/splash /etc/terminfo /etc/texmf/web2c /etc/udev/rules.d" CXXFLAGS="-march=core2 -O2 -pipe -ggdb" DISTDIR="/usr/portage.distfiles" FEATURES="distlocks fixpackages parallel-fetch sandbox sfperms splitdebug strict test unmerge-orphans userfetch userpriv usersandbox" GENTOO_MIRRORS="http://gentoo.prz.rzeszow.pl ftp://gentoo.po.opole.pl ftp://pandemonium.tiscali.de/pub/gentoo/ ftp://ftp.tu-clausthal.de/pub/linux/gentoo/" LANG="pl_PL.UTF-8" LC_ALL="pl_PL.UTF-8" LDFLAGS="" LINGUAS="pl" MAKEOPTS="-j3" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/portage/local/layman/sunrise /usr/portage/local/layman/custom-kernels /usr/local/portage" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" USE="X aac alsa amd64 apache2 bash-completion berkdb cairo cdr cli cracklib crypt cups dbus dri dvd dvdr dvdread encode flac gdbm gif gnutls gpm gstreamer gtk hal iconv java jpeg kdeenablefinal kdehiddenvisibility lcms lm_sensors logrotate mad midi mmx mp3 mpeg mudflap musepack mysql ncurses nls nptl nptlonly nsplugin ogg opengl openmp oss pam pcre pdf perl php png postgres python quicktime readline sasl sdl session slang spell spl sse sse2 ssl svg tcpd threads truetype unicode vim-syntax vorbis xcomposite xml xorg xvid zlib" ALSA_CARDS="hda-intel" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic auth_digest authn_anon authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock dbd deflate dir disk_cache env expires ext_filter file_cache filter headers ident imagemap include info log_config logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite setenvif so speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="pl" USERLAND="GNU" VIDEO_CARDS="i810 i830 i915 vesa" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Please retest on 1.5.5.3
*** t3701-add-interactive.sh *** * ok 1: setup (initial) * ok 2: status works (initial) * ok 3: diff works (initial) * ok 4: revert works (initial) * ok 5: setup (commit) * ok 6: status works (commit) * ok 7: diff works (commit) * ok 8: revert works (commit) Works fine on git-1.5.5.3.
closing then since it works at 1.5.5.3
