diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2021-06-28 18:28:08 +0000 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2021-06-28 18:28:08 +0000 |
| commit | 682aabf9f692f310ad910910073d8f9d3839b716 (patch) | |
| tree | c66dd52b991a095156a1a9a07c6ecc09f28a3a6b | |
| parent | 658757abed7be283e06bae3b1722fc2703334d74 (diff) | |
| download | plan9front-682aabf9f692f310ad910910073d8f9d3839b716.tar.xz | |
git/branch: mark files we couldn't update as dirty
| -rwxr-xr-x | sys/src/cmd/git/branch | 6 | ||||
| -rw-r--r-- | sys/src/cmd/git/revert | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/src/cmd/git/branch b/sys/src/cmd/git/branch index bf2027cc7..6693d7c4f 100755 --- a/sys/src/cmd/git/branch +++ b/sys/src/cmd/git/branch @@ -100,8 +100,10 @@ for(m in $cleanpaths){ rm -rf .git/index9/tracked/$m } if(~ $b file){ - cp -x $basedir/tree/$m $m - walk -eq $m > .git/index9/tracked/$m + if(cp -x -- $basedir/tree/$m $m) + walk -eq $m > .git/index9/tracked/$m + if not + echo -n > .git/index9/tracked/$m } } diff --git a/sys/src/cmd/git/revert b/sys/src/cmd/git/revert index a516e3a9d..0f11d82a9 100644 --- a/sys/src/cmd/git/revert +++ b/sys/src/cmd/git/revert @@ -14,7 +14,9 @@ if(~ $#query 1) files=`$nl{cleanname -d $gitrel $*} for(f in `$nl{cd $commit/tree/ && walk -f $files}){ mkdir -p `{basename -d $f} - cp -x -- $commit/tree/$f $f - git/add $f + if(cp -x -- $commit/tree/$f $f) + walk -eq $m > .git/index9/tracked/$m + if not + echo -n > .git/index9/tracked/$m } exit '' |