commit - 772d6dc483c1c71e8fba223aca7d2c532a3b34746c218e2f3011f2c92dd1c58d
commit + 470daf1e6c462ed3f8e9136b2de69711e8b443f227a3a94f2cf1898fa909df0a
blob - cf4930b27fbd186a8a631788746260e8a0a2a3b2145628c1c778a2872c6c68fb
blob + 96e5ff394bf431dbe6c868958ebce6d62b3be579f1520e25f1384d97d4672723
--- lib/worktree.c
+++ lib/worktree.c
cc_arg.repo = repo;
cc_arg.have_staged_files = 0;
cc_arg.commit_conflicts = allow_conflict;
+ cc_arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
/*
* If possible get the status of individual files directly to
* avoid crawling the entire work tree once per rebased commit.
blob - f1a5f2bbf5f13754cb4db9ef1473f5d144fedf4075fc95f8fda58f1db13f88d8
blob + 58e4c5a5feb8efbbaf0a92292d16bebb8550a104c3684fdf0cb988193bc25100
--- regress/cmdline/histedit.sh
+++ regress/cmdline/histedit.sh
test_done "$testroot" 0
}
+test_histedit_preserve_bad_link() {
+ local testroot=`test_init histedit_preserve_bad_link`
+ local orig_commit=`git_show_head $testroot/repo`
+
+ got checkout $testroot/repo $testroot/wt > /dev/null
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got checkout failed unexpectedly"
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo "file outside worktree" > $testroot/external_file
+ ln -sf $testroot/external_file $testroot/wt/bad_link
+
+ (cd $testroot/wt && got add bad_link && \
+ got commit -S -m 'add bad link') >/dev/null 2>&1
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got commit failed unexpectedly" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+ local old_commit1=`git_show_head $testroot/repo`
+
+ (cd $testroot/wt && got update -c $orig_commit \
+ >/dev/null 2>&1)
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got update failed unexpectedly"
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ cat > $testroot/editor.sh <<EOF
+#!/bin/sh
+ed -s "\$1" <<-EOF
+ ,s/.*/add really bad link/
+ w
+ EOF
+EOF
+ chmod +x $testroot/editor.sh
+
+ (cd $testroot/wt && env EDITOR="$testroot/editor.sh" \
+ VISUAL="$testroot/editor.sh" \
+ got histedit -m > $testroot/stdout \
+ 2>$testroot/stderr)
+
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "histedit failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ local old_commit2=`git_show_head $testroot/repo`
+
+ local short_old_commit1=`trim_obj_id 12 $old_commit1`
+ local short_old_commit2=`trim_obj_id 12 $old_commit2`
+
+ echo "A bad_link" > $testroot/stdout.expected
+ echo "$short_old_commit1 -> $short_old_commit2: add really bad link" \
+ >> $testroot/stdout.expected
+ echo "Switching work tree to refs/heads/master" \
+ >> $testroot/stdout.expected
+
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stderr.expected $testroot/stderr
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ cmp -s $testroot/external_file $testroot/wt/bad_link
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "contents of linked file and external file do not match" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ bad_link_path=$(readlink $testroot/wt/bad_link)
+ if [ "$bad_link_path" != "$testroot/external_file" ]; then
+ echo "link was not preserved" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ test_done "$testroot" "$ret"
+}
+
test_parseargs "$@"
run_test test_histedit_no_op
run_test test_histedit_swap
run_test test_histedit_drop_only
run_test test_histedit_conflict_revert
run_test test_histedit_no_eof_newline
+run_test test_histedit_preserve_bad_link