Commits
- Commit:
f4ae6ddb59a1edbd016ad7f0e27c2599f8966e19
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
9b4458b41088db703d890881c32dfd242efce4df
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
- Commit:
ef20f542049f5928fa256eb470801089d0b1048b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
build with -Wmissing-prototypes
ok stsp@
- Commit:
a6da5f6b0dd3ee6b20e16a313792d3618fa5839d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
revert "clear the rest of the pack_fds pointers"
There is no need to clear local variables before returning from a function.
ok tracey
- Commit:
df67eb78ca3c32640d852cacd2086d83713c97b2
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
clear the rest of the pack_fds pointers
- Commit:
7cd528337bab10d64ef73bb1a6e40c6203539e4d
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of got_repo_open. ok stsp@
thanks for all the help massaging this diff
- Commit:
3ff4cd3cb7275ff6501f11112459f19981554d1e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix error case handling in print_commit_oneline(); pointed out by op@
- Commit:
6a634b40ca714483871c4add8edac988c7fd89fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make got log -s show committer date
ok op@
- Commit:
a16a339c0ae008338af851da0e4ba10d0044e4c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make got log -s display local reference names
ok op@
- Commit:
4fe9456b4b22d120d0215786744a9f4c0762bf9a
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got log: sync match_commit from tog
So that 'got log -S' can match also the author and committer name, and
the commit ID too.
ok stsp@
- Commit:
1758cce7892c5bec4d4ccd3de91615c3c78b23cb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reuse a temporary file across commits during got log -p -S
suggested by + ok op@
- Commit:
6fdca49ec99627a96cda79e00f938049a317e6ef
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to match committed patches with got log -p -S pattern
ok op@
- Commit:
a7e64c3f827b181514c32ceccf0e78ac964508b4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug a memory leak in show_change(), line was leaked
- Commit:
2f7ada206148cc1a3218669652926de2bdd3c04b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add one-line output mode to got log with -s flag
-s for short. Moves log search to -S.
Patch by Evan Silberman
- Commit:
a0f32f336ed3ba83f8d1afc8165502d06c472866
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move creation of tempfiles outside of lib/diff.c
ok tracey
- Commit:
89fe1c42b34d471ab9756eb05231a5d72339e8c8
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: fix-up sha1.h include
-portable doesn't need this directly.
- Commit:
bfb5ee0b7372ae375143b9dee5552b8bec26cf05
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
open temporary files needed for delta application in got_repo_open()
This prepares for callers of got_repo_open() that cannot afford to
open files in /tmp, such as gotwebd. In a follow-up change, we could
ask such callers to pass in the required amount of open temporary files.
One consequence is that got_repo_open() now requires the "cpath" pledge
promise. Add the "cpath" promise to affected callers and remove it once
the repository has been opened.
ok tracey
- Commit:
9a267125aa0f9487f325eea3e3c551ad9a19ca51
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
82f9484cc55a71e0bce201220c989e5058da6b9d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: include sha1.h portably
Don't directly include sha1.h as this isn't always in the same location
across systems.
- Commit:
c17f3d0c7b2d780dbb8117b66d797c92c1f4add3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
eaef698f325c42c0fd48c56b391b56ce1695b9e7
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: allow to reverse a patch
add a flag to got_patch to reverse a patch before applying and the -R
flag for `got patch'.
ok stsp@
- Commit:
fa0353ccb26c39527ba783821f3e0251f2b19d4e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
mention -p in usage_patch
- Commit:
b0e25f642db7b3e726f2827eb39b61bfea3e9c50
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: freebsd: portably include sha1
The SHA implementation is found portably across systems, so don't
include sha1.h directly.
- Commit:
ec242592d329728975bf10a1196907167de7fed0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
inline struct got_object_id in struct got_object_qid
Saves us from doing a malloc/free call for every item on the list.
ok op@
- Commit:
a77eefc7ca20d88114f90a1ce8209051633444ed
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
simplify apply_unveil in cmd_patch: the worktree is not optional