commit 1545c6153ed22df10b02f9353f2054f4c7cb9c53 from: Stefan Sperling date: Sun Feb 10 12:23:52 2019 UTC show commit id after update even if all files were missing commit - a378724ff7c52fed47ca10ec7bb827ad4955ce57 commit + 1545c6153ed22df10b02f9353f2054f4c7cb9c53 blob - 709848c071063737c6e2c461124cc38e2ec0eac9 blob + 755f467c2aa1a389cc6240409b367803b91565a5 --- got/got.c +++ got/got.c @@ -436,8 +436,7 @@ update_progress(void *arg, unsigned char status, const if (status == GOT_STATUS_EXISTS) return; - if (status != GOT_STATUS_MISSING) - *did_something = 1; + *did_something = 1; while (path[0] == '/') path++; printf("%c %s\n", status, path); blob - 3267b8ed203708fea01289cbeae3ed1131275e5e blob + 0a6f228431674f9b29a264acd2d4479c83b644cb --- regress/cmdline/update.sh +++ regress/cmdline/update.sh @@ -823,7 +823,9 @@ function test_update_restores_missing_file { rm $testroot/wt/alpha echo "! alpha" > $testroot/stdout.expected - echo "Already up-to-date" >> $testroot/stdout.expected + echo -n "Updated to commit " >> $testroot/stdout.expected + git_show_head $testroot/repo >> $testroot/stdout.expected + echo >> $testroot/stdout.expected (cd $testroot/wt && got update > $testroot/stdout) cmp $testroot/stdout.expected $testroot/stdout