Commits
- Commit:
2c8899b952f67f90ab3a26b4331491832fe93c8a
- From:
- Omar Polo <op@omarpolo.com>
- Date:
drop (needless?) sleep(1) in status.sh
ok stsp
- Commit:
38d61ead4d6e9ff3f44b8d6e0e7ff3d02ffcec26
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix `got patch -R' when using diff3 merge
`got patch -R' fails spectacularly when applied on a diff that contains
the info of the original blob for the diff3 merge machinery since it
tries to apply the reverse of the patch to the old blob.
change it to run the patch (_not_ reversed) on the old blob and then
swap the arguments to got_diff3_merge which gives us the correct reverse
merge of the diff. while here add a test case too.
reported by naddy, discussed with and ok stsp@
- Commit:
65858f9a993c163be8f4af482e7b400535d61d17
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make mandoc -T lint got.1 happier; pointed out by Mark Jamsek
- Commit:
7f5531cddb475a234ab659960efcb4f1aee3fb8d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
document use of GOT_AUTHOR by 'got rebase' and 'got histedit'
- Commit:
543bec4ff9437a6e01b7e86770938007190e52df
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got histedit' fetch author info from Git configuration as a fallback
- Commit:
50e7a649ac62e04706162f1e9b7b37e7485fc7ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not require local author info during 'got rebase'
My commit to reset committer info during rebase was too strict
in some use cases. Even when simply forwarding a branch the rebase
operation could now fail if GOT_AUTHOR is not set.
To fix this, fall back on existing commiter information if no author
is configured. And try to obtain author info from Git config in case
GOT_AUTHOR is not set.
Problems reported by Mikhail.
- Commit:
0f91044a8e1edfa553268e8437f58c21e1e4ac39
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix name clash in gotwebd
Rename GOT_PACK_NUM_TEMPFILES in gotwebd, since it clashes with
a name already used in lib/repository.c.
ok tracey
- Commit:
5e98fb339b4588f8e07c12b9f9ace9dbdcc47592
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: uppercase alpha key maps that open new views
ok stsp@
- Commit:
01a7bcaf15198d23a77acc28899c3c206cdc5001
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: reset view->offset when clearing log view state
Don't move the selection cursor due to a bogus offset after closing child views
following use of 'B', C-l, and backspace log view key maps.
ok stsp@
- Commit:
6fe51fee00c219cf4a74684211a620b3ff9f02ef
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: use view->resize idiom to ensure log is populated
Replace view->mode == TOG_VIEW_LOG checks for requesting commits to populate
the log view with calls to view->resize().
ok stsp@
- Commit:
598eac4331d322ab9e91ee6864c54845e3a6e86c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
f8399b8f3e641c8eb8f0a50bc42f648efeb7eacc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
call time(3) just once in commit_worktree(), not twice
- Commit:
dff918251f8c81f6d1a277cf8e9f4f348ebee837
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
tog: populate new child view log lines when switching split
When switching a child log view from a h- to a v-split, new log lines are
empty. Rather than (mis)trace height and (not) call request_log_commits(), let
resize_log_view() do the math and request commits if needed to draw new lines.
ok op@
- Commit:
f26cc5f2126442207cd94f69d093f159445e8e20
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not forget to free(cwd) at the end of cmd_rebase() and cmd_histedit()
- Commit:
c8283a6b5ca94901ddccbd5043a68eb09420e1cc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix wrong error return in cmd_commit()