Commit Briefs

b2409d5842 Stefan Sperling

more fine-tuning of fetch progress display




61cc1a7a7f Stefan Sperling

tweak progress display


668a20f6fe Stefan Sperling

rewritten got-index-pack; sorry about the monster commit


baa9fea074 Stefan Sperling

send indexing progress via an imsg


d2cdc63664 Stefan Sperling

send pack file download progress information over imsg



ceee4c0f4a Stefan Sperling

remove unused arguments from got_fetch_pack()


07e52fce86 Stefan Sperling

rename got_fetch() to got_fetch_pack()





09838ffc93 Stefan Sperling

make got_fetch() expect URI information in parsed form


84f2fa52a3 Stefan Sperling

rename got_clone() to got_fetch()


6f23baec62 Stefan Sperling

declare got_clone() in public API space



5b87815ed2 Stefan Sperling

prevent commits from being listed more than once in a histedit script

While merging a commit multiple times during a histedit operation could potentially make sense in some corner case, a commit appearing more than once in the script is more likely to happen accidentally. If desired, the same effect can still be achieved by running multiple histedit operations, or by using 'got cherrypick' while the histedit operation is paused for arbitrary editing.


4cb8f8f3e6 Stefan Sperling

fix wrong use of words in a histedit error message


4b6c9460c9 Stefan Sperling

be helpful when users try to check out work trees without a known branch

Provide a useful error message in such cases and explicitly document intentional restrictions in the got(1) man page. Prompted by a question from Adam Steen via bsd.network https://bsd.network/@adams/103768951483318235


a0ea4fc07b Stefan Sperling

show merged commit ID + logmsg upon merge conflict during rebase and histedit

This makes it more apparent which commit contained the conflicting change. The new output looks like this: C sys/dev/pci/if_iwm.c 8a98d848a1a5 -> merge conflict: properly modify station queues got: conflicts must be resolved before rebasing can continue


272a1371f1 Stefan Sperling

don't leak logmsg in show_rebase_progress()




da76fce2df Stefan Sperling

let 'got branch' switch and update the work tree

ok tracey